From 5aae868636fac3a58fa3e2e20f22afbadb59b2e0 Mon Sep 17 00:00:00 2001 From: jonahgao Date: Tue, 8 Oct 2024 17:03:46 +0800 Subject: [PATCH 1/3] Remove unused dependencies and features --- datafusion/core/Cargo.toml | 2 -- datafusion/optimizer/Cargo.toml | 4 ---- datafusion/physical-expr/Cargo.toml | 10 ---------- datafusion/physical-plan/Cargo.toml | 2 +- 4 files changed, 1 insertion(+), 17 deletions(-) diff --git a/datafusion/core/Cargo.toml b/datafusion/core/Cargo.toml index 01ba90ee5de8..28d0d136bd05 100644 --- a/datafusion/core/Cargo.toml +++ b/datafusion/core/Cargo.toml @@ -67,8 +67,6 @@ math_expressions = ["datafusion-functions/math_expressions"] parquet = ["datafusion-common/parquet", "dep:parquet"] pyarrow = ["datafusion-common/pyarrow", "parquet"] regex_expressions = [ - "datafusion-physical-expr/regex_expressions", - "datafusion-optimizer/regex_expressions", "datafusion-functions/regex_expressions", ] serde = ["arrow-schema/serde"] diff --git a/datafusion/optimizer/Cargo.toml b/datafusion/optimizer/Cargo.toml index 337a24ffae20..79a5bb24e918 100644 --- a/datafusion/optimizer/Cargo.toml +++ b/datafusion/optimizer/Cargo.toml @@ -35,10 +35,6 @@ workspace = true name = "datafusion_optimizer" path = "src/lib.rs" -[features] -default = ["regex_expressions"] -regex_expressions = ["datafusion-physical-expr/regex_expressions"] - [dependencies] arrow = { workspace = true } async-trait = { workspace = true } diff --git a/datafusion/physical-expr/Cargo.toml b/datafusion/physical-expr/Cargo.toml index c53f7a6c4771..f9fb6f2f77b4 100644 --- a/datafusion/physical-expr/Cargo.toml +++ b/datafusion/physical-expr/Cargo.toml @@ -35,14 +35,6 @@ workspace = true name = "datafusion_physical_expr" path = "src/lib.rs" -[features] -default = [ - "regex_expressions", - "encoding_expressions", -] -encoding_expressions = ["base64", "hex"] -regex_expressions = ["regex"] - [dependencies] ahash = { workspace = true } arrow = { workspace = true } @@ -54,14 +46,12 @@ arrow-string = { workspace = true } base64 = { version = "0.22", optional = true } chrono = { workspace = true } datafusion-common = { workspace = true, default-features = true } -datafusion-execution = { workspace = true } datafusion-expr = { workspace = true } datafusion-expr-common = { workspace = true } datafusion-functions-aggregate-common = { workspace = true } datafusion-physical-expr-common = { workspace = true } half = { workspace = true } hashbrown = { workspace = true } -hex = { version = "0.4", optional = true } indexmap = { workspace = true } itertools = { workspace = true, features = ["use_std"] } log = { workspace = true } diff --git a/datafusion/physical-plan/Cargo.toml b/datafusion/physical-plan/Cargo.toml index c3f1b7eb0e95..7fcd719539ec 100644 --- a/datafusion/physical-plan/Cargo.toml +++ b/datafusion/physical-plan/Cargo.toml @@ -51,7 +51,6 @@ datafusion-common = { workspace = true, default-features = true } datafusion-common-runtime = { workspace = true, default-features = true } datafusion-execution = { workspace = true } datafusion-expr = { workspace = true } -datafusion-functions-aggregate = { workspace = true } datafusion-functions-aggregate-common = { workspace = true } datafusion-functions-window-common = { workspace = true } datafusion-physical-expr = { workspace = true, default-features = true } @@ -69,6 +68,7 @@ rand = { workspace = true } tokio = { workspace = true } [dev-dependencies] +datafusion-functions-aggregate = { workspace = true } rstest = { workspace = true } rstest_reuse = "0.7.0" tokio = { workspace = true, features = [ From bcfb0bc966afb1fbb814f7bc21e4a2083783edce Mon Sep 17 00:00:00 2001 From: jonahgao Date: Tue, 8 Oct 2024 17:15:12 +0800 Subject: [PATCH 2/3] Update Cargo.lock --- datafusion-cli/Cargo.lock | 5 ----- 1 file changed, 5 deletions(-) diff --git a/datafusion-cli/Cargo.lock b/datafusion-cli/Cargo.lock index 8a6ccacbb380..85113e84678e 100644 --- a/datafusion-cli/Cargo.lock +++ b/datafusion-cli/Cargo.lock @@ -1486,23 +1486,19 @@ dependencies = [ "arrow-ord", "arrow-schema", "arrow-string", - "base64 0.22.1", "chrono", "datafusion-common", - "datafusion-execution", "datafusion-expr", "datafusion-expr-common", "datafusion-functions-aggregate-common", "datafusion-physical-expr-common", "half", "hashbrown 0.14.5", - "hex", "indexmap", "itertools", "log", "paste", "petgraph", - "regex", ] [[package]] @@ -1545,7 +1541,6 @@ dependencies = [ "datafusion-common-runtime", "datafusion-execution", "datafusion-expr", - "datafusion-functions-aggregate", "datafusion-functions-aggregate-common", "datafusion-functions-window-common", "datafusion-physical-expr", From 63c7ce1f081966b03ceb499e5ddba942348a0a92 Mon Sep 17 00:00:00 2001 From: jonahgao Date: Tue, 8 Oct 2024 17:25:29 +0800 Subject: [PATCH 3/3] Remove regex and base64 --- datafusion/physical-expr/Cargo.toml | 2 -- 1 file changed, 2 deletions(-) diff --git a/datafusion/physical-expr/Cargo.toml b/datafusion/physical-expr/Cargo.toml index f9fb6f2f77b4..4195e684381f 100644 --- a/datafusion/physical-expr/Cargo.toml +++ b/datafusion/physical-expr/Cargo.toml @@ -43,7 +43,6 @@ arrow-buffer = { workspace = true } arrow-ord = { workspace = true } arrow-schema = { workspace = true } arrow-string = { workspace = true } -base64 = { version = "0.22", optional = true } chrono = { workspace = true } datafusion-common = { workspace = true, default-features = true } datafusion-expr = { workspace = true } @@ -57,7 +56,6 @@ itertools = { workspace = true, features = ["use_std"] } log = { workspace = true } paste = "^1.0" petgraph = "0.6.2" -regex = { workspace = true, optional = true } [dev-dependencies] arrow = { workspace = true, features = ["test_utils"] }