fix

Signed-off-by: coldWater <[email protected]>
databendlabs · Oct 10, 2024 · 52a6386 · 52a6386
1 parent 1efe3f7
commit 52a6386
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 9 deletions.
diff --git a/src/common/base/src/base/dma.rs b/src/common/base/src/base/dma.rs
@@ -356,8 +356,8 @@ impl Write for DmaWriteBuf {
         while !buf.is_empty() {
             let (dst, remain) = match self.data.last_mut() {
                 Some(dst) if dst.len() < dst.capacity() => {
-                    let remian = dst.capacity() - dst.len();
-                    (dst, remian)
+                    let remain = dst.capacity() - dst.len();
+                    (dst, remain)
                 }
                 _ => {
                     self.data

diff --git a/src/query/service/src/spillers/spiller.rs b/src/query/service/src/spillers/spiller.rs
@@ -433,18 +433,17 @@ impl BlocksEncoder {
     }
 
     fn add_block(&mut self, block: DataBlock) {
-        let start = self.size();
-        let columns_layout = block
-            .columns()
-            .iter()
-            .map(|entry| {
+        let columns_layout = std::iter::once(self.size())
+            .chain(block.columns().iter().map(|entry| {
                 let column = entry
                     .value
                     .convert_to_full_column(&entry.data_type, block.num_rows());
                 serialize_column_in(&column, &mut self.buf).unwrap();
-                self.size() - start
-            })
+                self.size()
+            }))
+            .map_windows(|x: &[_; 2]| x[1] - x[0])
             .collect();
+
         self.columns_layout.push(columns_layout);
         self.offsets.push(self.size())
     }