Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into hash_join_state
Browse files Browse the repository at this point in the history
  • Loading branch information
korowa committed Dec 16, 2023
2 parents 560b68b + 0fcd077 commit f2b72f2
Show file tree
Hide file tree
Showing 87 changed files with 2,282 additions and 871 deletions.
3 changes: 3 additions & 0 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ jobs:
- name: Check workspace without default features
run: cargo check --no-default-features -p datafusion

- name: Check datafusion-common without default features
run: cargo check --tests --no-default-features -p datafusion-common

- name: Check workspace in debug mode
run: cargo check

Expand Down
24 changes: 12 additions & 12 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ license = "Apache-2.0"
readme = "README.md"
repository = "https://github.com/apache/arrow-datafusion"
rust-version = "1.70"
version = "33.0.0"
version = "34.0.0"

[workspace.dependencies]
arrow = { version = "49.0.0", features = ["prettyprint"] }
Expand All @@ -59,17 +59,17 @@ async-trait = "0.1.73"
bigdecimal = "0.4.1"
bytes = "1.4"
ctor = "0.2.0"
datafusion = { path = "datafusion/core", version = "33.0.0" }
datafusion-common = { path = "datafusion/common", version = "33.0.0" }
datafusion-expr = { path = "datafusion/expr", version = "33.0.0" }
datafusion-sql = { path = "datafusion/sql", version = "33.0.0" }
datafusion-optimizer = { path = "datafusion/optimizer", version = "33.0.0" }
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "33.0.0" }
datafusion-physical-plan = { path = "datafusion/physical-plan", version = "33.0.0" }
datafusion-execution = { path = "datafusion/execution", version = "33.0.0" }
datafusion-proto = { path = "datafusion/proto", version = "33.0.0" }
datafusion-sqllogictest = { path = "datafusion/sqllogictest", version = "33.0.0" }
datafusion-substrait = { path = "datafusion/substrait", version = "33.0.0" }
datafusion = { path = "datafusion/core", version = "34.0.0" }
datafusion-common = { path = "datafusion/common", version = "34.0.0" }
datafusion-expr = { path = "datafusion/expr", version = "34.0.0" }
datafusion-sql = { path = "datafusion/sql", version = "34.0.0" }
datafusion-optimizer = { path = "datafusion/optimizer", version = "34.0.0" }
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "34.0.0" }
datafusion-physical-plan = { path = "datafusion/physical-plan", version = "34.0.0" }
datafusion-execution = { path = "datafusion/execution", version = "34.0.0" }
datafusion-proto = { path = "datafusion/proto", version = "34.0.0" }
datafusion-sqllogictest = { path = "datafusion/sqllogictest", version = "34.0.0" }
datafusion-substrait = { path = "datafusion/substrait", version = "34.0.0" }
dashmap = "5.4.0"
doc-comment = "0.3"
env_logger = "0.10"
Expand Down
8 changes: 4 additions & 4 deletions benchmarks/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
[package]
name = "datafusion-benchmarks"
description = "DataFusion Benchmarks"
version = "33.0.0"
version = "34.0.0"
edition = { workspace = true }
authors = ["Apache Arrow <dev@arrow.apache.org>"]
homepage = "https://github.com/apache/arrow-datafusion"
Expand All @@ -34,8 +34,8 @@ snmalloc = ["snmalloc-rs"]

[dependencies]
arrow = { workspace = true }
datafusion = { path = "../datafusion/core", version = "33.0.0" }
datafusion-common = { path = "../datafusion/common", version = "33.0.0" }
datafusion = { path = "../datafusion/core", version = "34.0.0" }
datafusion-common = { path = "../datafusion/common", version = "34.0.0" }
env_logger = { workspace = true }
futures = { workspace = true }
log = { workspace = true }
Expand All @@ -50,4 +50,4 @@ test-utils = { path = "../test-utils/", version = "0.1.0" }
tokio = { version = "^1.0", features = ["macros", "rt", "rt-multi-thread", "parking_lot"] }

[dev-dependencies]
datafusion-proto = { path = "../datafusion/proto", version = "33.0.0" }
datafusion-proto = { path = "../datafusion/proto", version = "34.0.0" }
Loading

0 comments on commit f2b72f2

Please sign in to comment.