Skip to content

Commit

Permalink
Merge branch 'apache:main' into apache_main
Browse files Browse the repository at this point in the history
  • Loading branch information
mertak-synnada authored Dec 26, 2024
2 parents 50acc71 + 30660e0 commit 81798d7
Show file tree
Hide file tree
Showing 53 changed files with 2,028 additions and 257 deletions.
52 changes: 26 additions & 26 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ license = "Apache-2.0"
readme = "README.md"
repository = "https://github.com/apache/datafusion"
rust-version = "1.80.1"
version = "43.0.0"
version = "44.0.0"

[workspace.dependencies]
# We turn off default-features for some dependencies here so the workspaces which inherit them can
Expand Down Expand Up @@ -98,31 +98,31 @@ bytes = "1.4"
chrono = { version = "0.4.38", default-features = false }
ctor = "0.2.0"
dashmap = "6.0.1"
datafusion = { path = "datafusion/core", version = "43.0.0", default-features = false }
datafusion-catalog = { path = "datafusion/catalog", version = "43.0.0" }
datafusion-common = { path = "datafusion/common", version = "43.0.0", default-features = false }
datafusion-common-runtime = { path = "datafusion/common-runtime", version = "43.0.0" }
datafusion-doc = { path = "datafusion/doc", version = "43.0.0" }
datafusion-execution = { path = "datafusion/execution", version = "43.0.0" }
datafusion-expr = { path = "datafusion/expr", version = "43.0.0" }
datafusion-expr-common = { path = "datafusion/expr-common", version = "43.0.0" }
datafusion-ffi = { path = "datafusion/ffi", version = "43.0.0" }
datafusion-functions = { path = "datafusion/functions", version = "43.0.0" }
datafusion-functions-aggregate = { path = "datafusion/functions-aggregate", version = "43.0.0" }
datafusion-functions-aggregate-common = { path = "datafusion/functions-aggregate-common", version = "43.0.0" }
datafusion-functions-nested = { path = "datafusion/functions-nested", version = "43.0.0" }
datafusion-functions-table = { path = "datafusion/functions-table", version = "43.0.0" }
datafusion-functions-window = { path = "datafusion/functions-window", version = "43.0.0" }
datafusion-functions-window-common = { path = "datafusion/functions-window-common", version = "43.0.0" }
datafusion-macros = { path = "datafusion/macros", version = "43.0.0" }
datafusion-optimizer = { path = "datafusion/optimizer", version = "43.0.0", default-features = false }
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "43.0.0", default-features = false }
datafusion-physical-expr-common = { path = "datafusion/physical-expr-common", version = "43.0.0", default-features = false }
datafusion-physical-optimizer = { path = "datafusion/physical-optimizer", version = "43.0.0" }
datafusion-physical-plan = { path = "datafusion/physical-plan", version = "43.0.0" }
datafusion-proto = { path = "datafusion/proto", version = "43.0.0" }
datafusion-proto-common = { path = "datafusion/proto-common", version = "43.0.0" }
datafusion-sql = { path = "datafusion/sql", version = "43.0.0" }
datafusion = { path = "datafusion/core", version = "44.0.0", default-features = false }
datafusion-catalog = { path = "datafusion/catalog", version = "44.0.0" }
datafusion-common = { path = "datafusion/common", version = "44.0.0", default-features = false }
datafusion-common-runtime = { path = "datafusion/common-runtime", version = "44.0.0" }
datafusion-doc = { path = "datafusion/doc", version = "44.0.0" }
datafusion-execution = { path = "datafusion/execution", version = "44.0.0" }
datafusion-expr = { path = "datafusion/expr", version = "44.0.0" }
datafusion-expr-common = { path = "datafusion/expr-common", version = "44.0.0" }
datafusion-ffi = { path = "datafusion/ffi", version = "44.0.0" }
datafusion-functions = { path = "datafusion/functions", version = "44.0.0" }
datafusion-functions-aggregate = { path = "datafusion/functions-aggregate", version = "44.0.0" }
datafusion-functions-aggregate-common = { path = "datafusion/functions-aggregate-common", version = "44.0.0" }
datafusion-functions-nested = { path = "datafusion/functions-nested", version = "44.0.0" }
datafusion-functions-table = { path = "datafusion/functions-table", version = "44.0.0" }
datafusion-functions-window = { path = "datafusion/functions-window", version = "44.0.0" }
datafusion-functions-window-common = { path = "datafusion/functions-window-common", version = "44.0.0" }
datafusion-macros = { path = "datafusion/macros", version = "44.0.0" }
datafusion-optimizer = { path = "datafusion/optimizer", version = "44.0.0", default-features = false }
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "44.0.0", default-features = false }
datafusion-physical-expr-common = { path = "datafusion/physical-expr-common", version = "44.0.0", default-features = false }
datafusion-physical-optimizer = { path = "datafusion/physical-optimizer", version = "44.0.0" }
datafusion-physical-plan = { path = "datafusion/physical-plan", version = "44.0.0" }
datafusion-proto = { path = "datafusion/proto", version = "44.0.0" }
datafusion-proto-common = { path = "datafusion/proto-common", version = "44.0.0" }
datafusion-sql = { path = "datafusion/sql", version = "44.0.0" }
doc-comment = "0.3"
env_logger = "0.11"
futures = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ Default features:
- `regex_expressions`: regular expression functions, such as `regexp_match`
- `unicode_expressions`: Include unicode aware functions such as `character_length`
- `unparser`: enables support to reverse LogicalPlans back into SQL
- `recursive-protection`: uses [recursive](https://docs.rs/recursive/latest/recursive/) for stack overflow protection.
- `recursive_protection`: uses [recursive](https://docs.rs/recursive/latest/recursive/) for stack overflow protection.

Optional features:

Expand Down
4 changes: 2 additions & 2 deletions benchmarks/bench.sh
Original file line number Diff line number Diff line change
Expand Up @@ -456,11 +456,11 @@ run_clickbench_extended() {
}

# Downloads the csv.gz files IMDB datasets from Peter Boncz's homepage(one of the JOB paper authors)
# http://homepages.cwi.nl/~boncz/job/imdb.tgz
# https://event.cwi.nl/da/job/imdb.tgz
data_imdb() {
local imdb_dir="${DATA_DIR}/imdb"
local imdb_temp_gz="${imdb_dir}/imdb.tgz"
local imdb_url="https://homepages.cwi.nl/~boncz/job/imdb.tgz"
local imdb_url="https://event.cwi.nl/da/job/imdb.tgz"

# imdb has 21 files, we just separate them into 3 groups for better readability
local first_required_files=(
Expand Down
49 changes: 25 additions & 24 deletions datafusion-cli/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 4 additions & 3 deletions datafusion-cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[package]
name = "datafusion-cli"
description = "Command Line Client for DataFusion query engine."
version = "43.0.0"
version = "44.0.0"
authors = ["Apache DataFusion <[email protected]>"]
edition = "2021"
keywords = ["arrow", "datafusion", "query", "sql"]
Expand All @@ -39,17 +39,18 @@ aws-sdk-sts = "1.43.0"
# end pin aws-sdk crates
aws-credential-types = "1.2.0"
clap = { version = "4.5.16", features = ["derive", "cargo"] }
datafusion = { path = "../datafusion/core", version = "43.0.0", features = [
datafusion = { path = "../datafusion/core", version = "44.0.0", features = [
"avro",
"crypto_expressions",
"datetime_expressions",
"encoding_expressions",
"parquet",
"recursive_protection",
"regex_expressions",
"unicode_expressions",
"compression",
] }
datafusion-catalog = { path = "../datafusion/catalog", version = "43.0.0" }
datafusion-catalog = { path = "../datafusion/catalog", version = "44.0.0" }
dirs = "5.0.1"
env_logger = "0.11"
futures = "0.3"
Expand Down
Loading

0 comments on commit 81798d7

Please sign in to comment.