Skip to content

Commit 6587964

Browse files
andygrovedharanad
authored andcommitted
chore: Move string kernels and expressions to spark-expr crate (apache#1164)
* Move string kernels and expressions to spark-expr crate * remove unused hash kernel * remove unused dependencies
1 parent ef1131d commit 6587964

File tree

12 files changed

+13
-373
lines changed

12 files changed

+13
-373
lines changed

native/Cargo.lock

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

native/core/Cargo.toml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ arrow-buffer = { workspace = true }
4141
arrow-data = { workspace = true }
4242
arrow-schema = { workspace = true }
4343
parquet = { workspace = true, default-features = false, features = ["experimental"] }
44-
half = { version = "2.4.1", default-features = false }
4544
futures = { workspace = true }
4645
mimalloc = { version = "*", default-features = false, optional = true }
4746
tokio = { version = "1", features = ["rt-multi-thread"] }
@@ -62,7 +61,6 @@ rand = { workspace = true}
6261
num = { workspace = true }
6362
bytes = "1.5.0"
6463
tempfile = "3.8.0"
65-
ahash = { version = "0.8", default-features = false }
6664
itertools = "0.11.0"
6765
paste = "1.0.14"
6866
datafusion-common = { workspace = true }
@@ -102,10 +100,6 @@ harness = false
102100
name = "bit_util"
103101
harness = false
104102

105-
[[bench]]
106-
name = "hash"
107-
harness = false
108-
109103
[[bench]]
110104
name = "row_columnar"
111105
harness = false

native/core/benches/hash.rs

Lines changed: 0 additions & 137 deletions
This file was deleted.

native/core/src/execution/datafusion/expressions/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ use crate::errors::CometError;
2323
pub mod bloom_filter_agg;
2424
pub mod bloom_filter_might_contain;
2525
pub mod negative;
26-
pub mod strings;
2726
pub mod subquery;
2827
pub mod unbound;
2928

native/core/src/execution/datafusion/planner.rs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,8 @@ use crate::{
2525
datafusion::{
2626
expressions::{
2727
bloom_filter_agg::BloomFilterAgg,
28-
bloom_filter_might_contain::BloomFilterMightContain,
29-
checkoverflow::CheckOverflow,
30-
negative,
31-
strings::{Contains, EndsWith, Like, StartsWith, StringSpaceExpr, SubstringExpr},
32-
subquery::Subquery,
33-
unbound::UnboundColumn,
28+
bloom_filter_might_contain::BloomFilterMightContain, checkoverflow::CheckOverflow,
29+
negative, subquery::Subquery, unbound::UnboundColumn,
3430
},
3531
operators::expand::CometExpandExec,
3632
shuffle_writer::ShuffleWriterExec,
@@ -90,9 +86,10 @@ use datafusion_comet_proto::{
9086
spark_partitioning::{partitioning::PartitioningStruct, Partitioning as SparkPartitioning},
9187
};
9288
use datafusion_comet_spark_expr::{
93-
ArrayInsert, Avg, AvgDecimal, BitwiseNotExpr, Cast, Correlation, Covariance, CreateNamedStruct,
94-
DateTruncExpr, GetArrayStructFields, GetStructField, HourExpr, IfExpr, ListExtract, MinuteExpr,
95-
NormalizeNaNAndZero, RLike, SecondExpr, SparkCastOptions, Stddev, SumDecimal,
89+
ArrayInsert, Avg, AvgDecimal, BitwiseNotExpr, Cast, Contains, Correlation, Covariance,
90+
CreateNamedStruct, DateTruncExpr, EndsWith, GetArrayStructFields, GetStructField, HourExpr,
91+
IfExpr, Like, ListExtract, MinuteExpr, NormalizeNaNAndZero, RLike, SecondExpr,
92+
SparkCastOptions, StartsWith, Stddev, StringSpaceExpr, SubstringExpr, SumDecimal,
9693
TimestampTruncExpr, ToJson, Variance,
9794
};
9895
use datafusion_common::scalar::ScalarStructBuilder;

0 commit comments

Comments
 (0)