refactor(query): simplify expression kernel (#16482)

* chore(query): simplify expression kernel * chore(query): simplify expression kernel * chore(query): make split agg last
datafuselabs · Sep 20, 2024 · a831c4b · a831c4b
1 parent af6c418
commit a831c4b
Show file tree

Hide file tree

Showing 11 changed files with 850 additions and 1,158 deletions.
diff --git a/src/query/expression/src/block.rs b/src/query/expression/src/block.rs
@@ -133,9 +133,10 @@ impl DataBlock {
                 c.check_valid()?;
                 if c.len() != num_rows {
                     return Err(ErrorCode::Internal(format!(
-                        "DataBlock corrupted, column length mismatch, col: {}, num_rows: {}",
+                        "DataBlock corrupted, column length mismatch, col rows: {}, num_rows: {}, datatype: {}",
                         c.len(),
-                        num_rows
+                        num_rows,
+                        c.data_type()
                     )));
                 }
             }

diff --git a/src/query/expression/src/kernels/concat.rs b/src/query/expression/src/kernels/concat.rs
@@ -21,6 +21,7 @@ use databend_common_exception::ErrorCode;
 use databend_common_exception::Result;
 use itertools::Itertools;
 
+use crate::copy_continuous_bits;
 use crate::kernels::take::BIT_MASK;
 use crate::kernels::utils::copy_advance_aligned;
 use crate::kernels::utils::set_vec_len_by_ptr;
@@ -462,7 +463,7 @@ impl Column {
                 }
                 let remaining = len - idx;
                 if remaining > 0 {
-                    let (cur_buf, cur_unset_bits) = Self::copy_continuous_bits(
+                    let (cur_buf, cur_unset_bits) = copy_continuous_bits(
                         &mut builder_ptr,
                         bitmap_slice,
                         builder_idx,