From 9a5d8ddc1007b17b7e356f1422af10368fbc00a6 Mon Sep 17 00:00:00 2001 From: "Jorge C. Leitao" Date: Fri, 17 Jun 2022 03:37:13 +0000 Subject: [PATCH] Improved performance of make_mut of sliced --- src/bitmap/immutable.rs | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bitmap/immutable.rs b/src/bitmap/immutable.rs index b63310b07cb..c9514e30b83 100644 --- a/src/bitmap/immutable.rs +++ b/src/bitmap/immutable.rs @@ -5,6 +5,7 @@ use std::sync::Arc; use crate::{buffer::bytes::Bytes, error::Error, trusted_len::TrustedLen}; use super::{ + chunk_iter_to_vec, utils::{count_zeros, fmt, get_bit, get_bit_unchecked, BitChunk, BitChunks, BitmapIter}, MutableBitmap, }; @@ -240,8 +241,11 @@ impl Bitmap { match self.into_mut() { Either::Left(data) => { if data.offset > 0 { - // we have to recreate the bytes because a MutableBitmap does not have an `offset`. - data.iter().collect() + // re-align the bits (remove the offset) + let chunks = data.chunks::(); + let remainder = chunks.remainder(); + let vec = chunk_iter_to_vec(chunks.chain(std::iter::once(remainder))); + MutableBitmap::from_vec(vec, data.length) } else { MutableBitmap::from_vec(data.bytes.as_ref().to_vec(), data.length) }