Use a comparable row format.

datafuselabs · Nov 1, 2022 · 97701e8 · 97701e8
1 parent 866f2dc
commit 97701e8
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 152 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/common/arrow/Cargo.toml b/src/common/arrow/Cargo.toml
@@ -34,7 +34,7 @@ simd = ["arrow/simd"]
 # Workspace dependencies
 
 # Crates.io dependencies
-arrow = { package = "arrow2", version = "0.14.0", default-features = false, features = [
+arrow = { package = "arrow2", git = "https://github.com/RinChanNOWWW/arrow2", rev = "78c61d5", default-features = false, features = [
     "io_parquet",
     "io_parquet_compression",
 ] }

diff --git a/src/query/datablocks/src/kernels/data_block_sort.rs b/src/query/datablocks/src/kernels/data_block_sort.rs
@@ -205,28 +205,8 @@ impl DataBlock {
             }
         }
     }
-
-    pub fn build_compare(
-        left: &DataBlock,
-        right: &DataBlock,
-        sort_column_descriptions: &[SortColumnDescription],
-    ) -> Result<ColumnsDynComparator> {
-        let mut res = Vec::with_capacity(sort_column_descriptions.len());
-        for SortColumnDescription { column_name, .. } in sort_column_descriptions {
-            let l = left.try_column_by_name(column_name)?;
-            let l = l.as_arrow_array(l.data_type());
-
-            let r = right.try_column_by_name(column_name)?;
-            let r = r.as_arrow_array(r.data_type());
-            let cmp = build_compare(&*l, &*r)?;
-            res.push(cmp);
-        }
-        Ok(res)
-    }
 }
 
-pub type ColumnsDynComparator = Vec<DynComparator>;
-
 fn compare_variant(left: &dyn Array, right: &dyn Array) -> ArrowResult<DynComparator> {
     let left = VariantColumn::from_arrow_array(left);
     let right = VariantColumn::from_arrow_array(right);

diff --git a/src/query/datablocks/src/kernels/mod.rs b/src/query/datablocks/src/kernels/mod.rs
@@ -23,5 +23,4 @@ mod data_block_sort;
 mod data_block_take;
 
 pub use data_block_group_by_hash::*;
-pub use data_block_sort::ColumnsDynComparator;
 pub use data_block_sort::SortColumnDescription;
diff --git a/src/query/pipeline/transforms/Cargo.toml b/src/query/pipeline/transforms/Cargo.toml
@@ -9,8 +9,9 @@ doctest = false
 test = false
 
 [dependencies]
-common-catalog = { path = "../../catalog" }
+common-arrow = { path = "../../../common/arrow" }
 common-datablocks = { path = "../../datablocks" }
+common-datavalues = { path = "../../datavalues" }
 common-exception = { path = "../../../common/exception" }
 common-pipeline-core = { path = "../core" }