Skip to content

Commit ebda09c

Browse files
committed
Merge remote-tracking branch 'upstream/main' into rewrite-field
2 parents ab2622d + 7219744 commit ebda09c

File tree

126 files changed

+3918
-2688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+3918
-2688
lines changed

Cargo.toml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@ members = [
4444
resolver = "2"
4545

4646
[workspace.package]
47-
authors = ["Apache Arrow <dev@arrow.apache.org>"]
47+
authors = ["Apache DataFusion <dev@datafusion.apache.org>"]
4848
edition = "2021"
49-
homepage = "https://github.com/apache/datafusion"
49+
homepage = "https://datafusion.apache.org"
5050
license = "Apache-2.0"
5151
readme = "README.md"
5252
repository = "https://github.com/apache/datafusion"
5353
rust-version = "1.73"
54-
version = "37.1.0"
54+
version = "38.0.0"
5555

5656
[workspace.dependencies]
5757
# We turn off default-features for some dependencies here so the workspaces which inherit them can
@@ -73,22 +73,22 @@ bytes = "1.4"
7373
chrono = { version = "0.4.34", default-features = false }
7474
ctor = "0.2.0"
7575
dashmap = "5.4.0"
76-
datafusion = { path = "datafusion/core", version = "37.1.0", default-features = false }
77-
datafusion-common = { path = "datafusion/common", version = "37.1.0", default-features = false }
78-
datafusion-common-runtime = { path = "datafusion/common-runtime", version = "37.1.0" }
79-
datafusion-execution = { path = "datafusion/execution", version = "37.1.0" }
80-
datafusion-expr = { path = "datafusion/expr", version = "37.1.0" }
81-
datafusion-functions = { path = "datafusion/functions", version = "37.1.0" }
82-
datafusion-functions-aggregate = { path = "datafusion/functions-aggregate", version = "37.1.0" }
83-
datafusion-functions-array = { path = "datafusion/functions-array", version = "37.1.0" }
84-
datafusion-optimizer = { path = "datafusion/optimizer", version = "37.1.0", default-features = false }
85-
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "37.1.0", default-features = false }
86-
datafusion-physical-expr-common = { path = "datafusion/physical-expr-common", version = "37.1.0", default-features = false }
87-
datafusion-physical-plan = { path = "datafusion/physical-plan", version = "37.1.0" }
88-
datafusion-proto = { path = "datafusion/proto", version = "37.1.0" }
89-
datafusion-sql = { path = "datafusion/sql", version = "37.1.0" }
90-
datafusion-sqllogictest = { path = "datafusion/sqllogictest", version = "37.1.0" }
91-
datafusion-substrait = { path = "datafusion/substrait", version = "37.1.0" }
76+
datafusion = { path = "datafusion/core", version = "38.0.0", default-features = false }
77+
datafusion-common = { path = "datafusion/common", version = "38.0.0", default-features = false }
78+
datafusion-common-runtime = { path = "datafusion/common-runtime", version = "38.0.0" }
79+
datafusion-execution = { path = "datafusion/execution", version = "38.0.0" }
80+
datafusion-expr = { path = "datafusion/expr", version = "38.0.0" }
81+
datafusion-functions = { path = "datafusion/functions", version = "38.0.0" }
82+
datafusion-functions-aggregate = { path = "datafusion/functions-aggregate", version = "38.0.0" }
83+
datafusion-functions-array = { path = "datafusion/functions-array", version = "38.0.0" }
84+
datafusion-optimizer = { path = "datafusion/optimizer", version = "38.0.0", default-features = false }
85+
datafusion-physical-expr = { path = "datafusion/physical-expr", version = "38.0.0", default-features = false }
86+
datafusion-physical-expr-common = { path = "datafusion/physical-expr-common", version = "38.0.0", default-features = false }
87+
datafusion-physical-plan = { path = "datafusion/physical-plan", version = "38.0.0" }
88+
datafusion-proto = { path = "datafusion/proto", version = "38.0.0" }
89+
datafusion-sql = { path = "datafusion/sql", version = "38.0.0" }
90+
datafusion-sqllogictest = { path = "datafusion/sqllogictest", version = "38.0.0" }
91+
datafusion-substrait = { path = "datafusion/substrait", version = "38.0.0" }
9292
doc-comment = "0.3"
9393
env_logger = "0.11"
9494
futures = "0.3"

benchmarks/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ Benchmark tpch_mem.json
150150
└──────────────┴──────────────┴──────────────┴───────────────┘
151151
```
152152

153-
Note that you can also execute an automatic comparison of the changes in a given PR against the base
153+
Note that you can also execute an automatic comparison of the changes in a given PR against the base
154154
just by including the trigger `/benchmark` in any comment.
155155

156156
### Running Benchmarks Manually

0 commit comments

Comments
 (0)