diff --git a/datafusion/physical-plan/src/aggregates/row_hash.rs b/datafusion/physical-plan/src/aggregates/row_hash.rs
index e5f0e616a91da..e3e1b68bc7ed2 100644
--- a/datafusion/physical-plan/src/aggregates/row_hash.rs
+++ b/datafusion/physical-plan/src/aggregates/row_hash.rs
@@ -947,7 +947,12 @@ impl GroupedHashAggregateStream {
             let batch_size = group_cols.first().unwrap().len();
             self.group_indices_buffer.clear();
             self.group_indices_buffer.resize(batch_size, 0);
-            for (&row_idx, &group_idx) in self.current_row_indices.iter().flatten().zip(self.current_group_indices.iter().flatten()) {
+            for (&row_idx, &group_idx) in self
+                .current_row_indices
+                .iter()
+                .flatten()
+                .zip(self.current_group_indices.iter().flatten())
+            {
                 self.group_indices_buffer[row_idx] = group_idx;
             }
 
@@ -955,9 +960,7 @@ impl GroupedHashAggregateStream {
             //  - Reorder the arrays to make them sorted by partitions
             //  - Collect the `offsets`, and we can get arrays in partition through `slice`
             // Update the accumulators of each partition
-            let iter = self
-                .current_row_indices
-                .iter();
+            let iter = self.current_row_indices.iter();
             for (part_idx, row_indices) in iter.enumerate() {
                 // Gather the inputs to call the actual accumulator
                 let iter = self.accumulators[part_idx]
@@ -1454,7 +1457,9 @@ impl PartitionFilterBuffer {
         let sliced_values_buf = values_buf.sliced();
         drop(values_buf);
         let sliced_values_buf = sliced_values_buf.into_mutable().unwrap();
-        let sliced_values_buf = sliced_values_buf.with_bitset(values_len, false);
+        let sliced_values_buf_len = sliced_values_buf.len();
+        let sliced_values_buf =
+            sliced_values_buf.with_bitset(sliced_values_buf_len, false);
         let mut values_buf_builder =
             BooleanBufferBuilder::new_from_buffer(sliced_values_buf, values_len);
         if values_len < batch_size {
@@ -1468,7 +1473,9 @@ impl PartitionFilterBuffer {
                 let sliced_nulls_buf = nulls_inner.sliced();
                 drop(nulls);
                 let sliced_nulls_buf = sliced_nulls_buf.into_mutable().unwrap();
-                let sliced_nulls_buf = sliced_nulls_buf.with_bitset(nulls_len, true);
+                let sliced_nulls_buf_len = sliced_nulls_buf.len();
+                let sliced_nulls_buf =
+                    sliced_nulls_buf.with_bitset(sliced_nulls_buf_len, true);
                 let mut nulls_buf_builder =
                     BooleanBufferBuilder::new_from_buffer(sliced_nulls_buf, nulls_len);
                 if nulls_len < batch_size {