Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into feature/9842
Browse files Browse the repository at this point in the history
# Conflicts:
#	datafusion/expr/src/built_in_function.rs
#	datafusion/expr/src/expr_fn.rs
#	datafusion/functions/src/unicode/left.rs
#	datafusion/functions/src/unicode/lpad.rs
#	datafusion/functions/src/unicode/mod.rs
#	datafusion/functions/src/unicode/reverse.rs
#	datafusion/functions/src/unicode/right.rs
#	datafusion/functions/src/unicode/rpad.rs
#	datafusion/functions/src/unicode/substr.rs
#	datafusion/physical-expr/src/functions.rs
#	datafusion/physical-expr/src/unicode_expressions.rs
#	datafusion/proto/src/generated/pbjson.rs
#	datafusion/proto/src/generated/prost.rs
#	datafusion/proto/src/logical_plan/from_proto.rs
#	datafusion/proto/src/logical_plan/to_proto.rs
  • Loading branch information
Omega359 committed Mar 29, 2024
2 parents 3fa6281 + c2879f5 commit 92d8e57
Show file tree
Hide file tree
Showing 39 changed files with 1,456 additions and 873 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
.github/ export-ignore
datafusion/proto/src/generated/prost.rs linguist-generated
datafusion/proto/src/generated/pbjson.rs linguist-generated
2 changes: 0 additions & 2 deletions .github/workflows/pr_benchmarks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@ jobs:
./bench.sh run tpch
./bench.sh run tpch_mem
./bench.sh run tpch10
./bench.sh run tpch_mem10
# For some reason this step doesn't seem to propagate the env var down into the script
if [ -d "results/HEAD" ]; then
Expand All @@ -70,7 +69,6 @@ jobs:
./bench.sh run tpch
./bench.sh run tpch_mem
./bench.sh run tpch10
./bench.sh run tpch_mem10
echo ${{ github.event.issue.number }} > pr
Expand Down
30 changes: 15 additions & 15 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ license = "Apache-2.0"
readme = "README.md"
repository = "https://github.com/apache/arrow-datafusion"
rust-version = "1.72"
version = "36.0.0"
version = "37.0.0"

[workspace.dependencies]
# We turn off default-features for some dependencies here so the workspaces which inherit them can
Expand All @@ -71,20 +71,20 @@ bytes = "1.4"
chrono = { version = "0.4.34", default-features = false }
ctor = "0.2.0"
dashmap = "5.4.0"
datafusion = { path = "datafusion/core", version = "36.0.0", default-features = false }
datafusion-common = { path = "datafusion/common", version = "36.0.0", default-features = false }
datafusion-common-runtime = { path = "datafusion/common-runtime", version = "36.0.0" }
datafusion-execution = { path = "datafusion/execution", version = "36.0.0" }
datafusion-expr = { path = "datafusion/expr", version = "36.0.0" }
datafusion-functions = { path = "datafusion/functions", version = "36.0.0" }
datafusion-functions-array = { path = "datafusion/functions-array", version = "36.0.0" }
datafusion-optimizer = { path = "datafusion/optimizer", version = "36.0.0", default-features = false }
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "36.0.0", default-features = false }
datafusion-physical-plan = { path = "datafusion/physical-plan", version = "36.0.0" }
datafusion-proto = { path = "datafusion/proto", version = "36.0.0" }
datafusion-sql = { path = "datafusion/sql", version = "36.0.0" }
datafusion-sqllogictest = { path = "datafusion/sqllogictest", version = "36.0.0" }
datafusion-substrait = { path = "datafusion/substrait", version = "36.0.0" }
datafusion = { path = "datafusion/core", version = "37.0.0", default-features = false }
datafusion-common = { path = "datafusion/common", version = "37.0.0", default-features = false }
datafusion-common-runtime = { path = "datafusion/common-runtime", version = "37.0.0" }
datafusion-execution = { path = "datafusion/execution", version = "37.0.0" }
datafusion-expr = { path = "datafusion/expr", version = "37.0.0" }
datafusion-functions = { path = "datafusion/functions", version = "37.0.0" }
datafusion-functions-array = { path = "datafusion/functions-array", version = "37.0.0" }
datafusion-optimizer = { path = "datafusion/optimizer", version = "37.0.0", default-features = false }
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "37.0.0", default-features = false }
datafusion-physical-plan = { path = "datafusion/physical-plan", version = "37.0.0" }
datafusion-proto = { path = "datafusion/proto", version = "37.0.0" }
datafusion-sql = { path = "datafusion/sql", version = "37.0.0" }
datafusion-sqllogictest = { path = "datafusion/sqllogictest", version = "37.0.0" }
datafusion-substrait = { path = "datafusion/substrait", version = "37.0.0" }
doc-comment = "0.3"
env_logger = "0.11"
futures = "0.3"
Expand Down
2 changes: 0 additions & 2 deletions conbench/.flake8

This file was deleted.

130 changes: 0 additions & 130 deletions conbench/.gitignore

This file was deleted.

2 changes: 0 additions & 2 deletions conbench/.isort.cfg

This file was deleted.

Loading

0 comments on commit 92d8e57

Please sign in to comment.