Skip to content

Commit 7f860dc

Browse files
committed
Extract encode and decode to datafusion-functions crate
1 parent c1fe3dd commit 7f860dc

25 files changed

Lines changed: 607 additions & 203 deletions

File tree

Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
[workspace]
1919
exclude = ["datafusion-cli"]
20-
members = ["datafusion/common", "datafusion/core", "datafusion/expr", "datafusion/execution", "datafusion/optimizer", "datafusion/physical-expr", "datafusion/physical-plan", "datafusion/proto", "datafusion/proto/gen", "datafusion/sql", "datafusion/sqllogictest", "datafusion/substrait", "datafusion/wasmtest", "datafusion-examples", "docs", "test-utils", "benchmarks",
20+
members = ["datafusion/common", "datafusion/core", "datafusion/expr", "datafusion/execution", "datafusion/functions", "datafusion/optimizer", "datafusion/physical-expr", "datafusion/physical-plan", "datafusion/proto", "datafusion/proto/gen", "datafusion/sql", "datafusion/sqllogictest", "datafusion/substrait", "datafusion/wasmtest", "datafusion-examples", "docs", "test-utils", "benchmarks",
2121
]
2222
resolver = "2"
2323

@@ -49,6 +49,7 @@ datafusion = { path = "datafusion/core", version = "34.0.0" }
4949
datafusion-common = { path = "datafusion/common", version = "34.0.0" }
5050
datafusion-execution = { path = "datafusion/execution", version = "34.0.0" }
5151
datafusion-expr = { path = "datafusion/expr", version = "34.0.0" }
52+
datafusion-functions = { path = "datafusion/functions", version = "34.0.0" }
5253
datafusion-optimizer = { path = "datafusion/optimizer", version = "34.0.0" }
5354
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "34.0.0" }
5455
datafusion-physical-plan = { path = "datafusion/physical-plan", version = "34.0.0" }

datafusion-cli/Cargo.lock

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

datafusion/core/Cargo.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ backtrace = ["datafusion-common/backtrace"]
4040
compression = ["xz2", "bzip2", "flate2", "zstd", "async-compression"]
4141
crypto_expressions = ["datafusion-physical-expr/crypto_expressions", "datafusion-optimizer/crypto_expressions"]
4242
default = ["crypto_expressions", "encoding_expressions", "regex_expressions", "unicode_expressions", "compression", "parquet"]
43-
encoding_expressions = ["datafusion-physical-expr/encoding_expressions"]
43+
encoding_expressions = ["datafusion-functions/encoding_expressions"]
4444
# Used for testing ONLY: causes all values to hash to the same value (test for collisions)
4545
force_hash_collisions = []
4646
parquet = ["datafusion-common/parquet", "dep:parquet"]
@@ -66,6 +66,7 @@ dashmap = { workspace = true }
6666
datafusion-common = { path = "../common", version = "34.0.0", features = ["object_store"], default-features = false }
6767
datafusion-execution = { workspace = true }
6868
datafusion-expr = { workspace = true }
69+
datafusion-functions = { path = "../functions", version = "34.0.0"}
6970
datafusion-optimizer = { path = "../optimizer", version = "34.0.0", default-features = false }
7071
datafusion-physical-expr = { path = "../physical-expr", version = "34.0.0", default-features = false }
7172
datafusion-physical-plan = { workspace = true }

datafusion/core/src/dataframe/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ use crate::physical_plan::{
4040
collect, collect_partitioned, execute_stream, execute_stream_partitioned,
4141
ExecutionPlan, SendableRecordBatchStream,
4242
};
43-
use crate::prelude::SessionContext;
4443

4544
use arrow::array::{Array, ArrayRef, Int64Array, StringArray};
4645
use arrow::compute::{cast, concat};
@@ -59,6 +58,7 @@ use datafusion_expr::{
5958
TableProviderFilterPushDown, UNNAMED_TABLE,
6059
};
6160

61+
use crate::prelude::SessionContext;
6262
use async_trait::async_trait;
6363

6464
/// Contains options that control how data is

0 commit comments

Comments
 (0)