Merge remote-tracking branch 'upstream/main' into configuration

.github/workflows/rust.yml

@@ -322,7 +322,7 @@ jobs:
         with:
           submodules: true
       - name: Setup Rust toolchain
-        uses: ./.github/actions/setup-macos-builder
+        uses: ./.github/actions/setup-macos-aarch64-builder
       - name: Run tests (excluding doctests)
         shell: bash
         run: |
@@ -480,16 +480,11 @@ jobs:
         uses: ./.github/actions/setup-builder
         with:
           rust-version: stable
-      - name: Install cargo-tomlfmt
-        run: which cargo-tomlfmt || cargo install cargo-tomlfmt
-
+      - name: Install taplo
+        run: cargo +stable install taplo-cli --version ^0.9 --locked
+      # if you encounter an error, try running 'taplo format' to fix the formatting automatically.
       - name: Check Cargo.toml formatting
-        run: |
-          # if you encounter an error, try running 'cargo tomlfmt -p path/to/Cargo.toml' to fix the formatting automatically.
-          # If the error still persists, you need to manually edit the Cargo.toml file, which introduces formatting violation.
-          #
-          # ignore ./Cargo.toml because putting workspaces in multi-line lists make it easy to read
-          ci/scripts/rust_toml_fmt.sh
+        run: taplo format --check
 
   config-docs-check:
     name: check configs.md is up-to-date

.gitignore

@@ -107,3 +107,7 @@ datafusion/sqllogictests/test_files/tpch/data/*
 
 # Scratch temp dir for sqllogictests
 datafusion/sqllogictest/test_files/scratch*
+
+# rat
+filtered_rat.txt
+rat.txt

Cargo.toml

@@ -17,7 +17,26 @@
 
 [workspace]
 exclude = ["datafusion-cli"]
-members = ["datafusion/common", "datafusion/core", "datafusion/expr", "datafusion/execution", "datafusion/functions", "datafusion/functions-array",  "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",
+members = [
+    "datafusion/common",
+    "datafusion/core",
+    "datafusion/expr",
+    "datafusion/execution",
+    "datafusion/functions",
+    "datafusion/functions-array",
+    "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",
 ]
 resolver = "2"
 
@@ -29,7 +48,7 @@ license = "Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/apache/arrow-datafusion"
 rust-version = "1.72"
-version = "35.0.0"
+version = "36.0.0"
 
 [workspace.dependencies]
 arrow = { version = "50.0.0", features = ["prettyprint"] }
@@ -46,19 +65,19 @@ bytes = "1.4"
 chrono = { version = "0.4.34", default-features = false }
 ctor = "0.2.0"
 dashmap = "5.4.0"
-datafusion = { path = "datafusion/core", version = "35.0.0" }
-datafusion-common = { path = "datafusion/common", version = "35.0.0" }
-datafusion-execution = { path = "datafusion/execution", version = "35.0.0" }
-datafusion-expr = { path = "datafusion/expr", version = "35.0.0" }
-datafusion-functions = { path = "datafusion/functions", version = "35.0.0" }
-datafusion-functions-array = { path = "datafusion/functions-array", version = "35.0.0" }
-datafusion-optimizer = { path = "datafusion/optimizer", version = "35.0.0" }
-datafusion-physical-expr = { path = "datafusion/physical-expr", version = "35.0.0" }
-datafusion-physical-plan = { path = "datafusion/physical-plan", version = "35.0.0" }
-datafusion-proto = { path = "datafusion/proto", version = "35.0.0" }
-datafusion-sql = { path = "datafusion/sql", version = "35.0.0" }
-datafusion-sqllogictest = { path = "datafusion/sqllogictest", version = "35.0.0" }
-datafusion-substrait = { path = "datafusion/substrait", version = "35.0.0" }
+datafusion = { path = "datafusion/core", version = "36.0.0" }
+datafusion-common = { path = "datafusion/common", 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" }
+datafusion-physical-expr = { path = "datafusion/physical-expr", version = "36.0.0" }
+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" }
 doc-comment = "0.3"
 env_logger = "0.11"
 futures = "0.3"

benchmarks/Cargo.toml

@@ -18,7 +18,7 @@
 [package]
 name = "datafusion-benchmarks"
 description = "DataFusion Benchmarks"
-version = "35.0.0"
+version = "36.0.0"
 edition = { workspace = true }
 authors = ["Apache Arrow <[email protected]>"]
 homepage = "https://github.com/apache/arrow-datafusion"
@@ -33,8 +33,8 @@ snmalloc = ["snmalloc-rs"]
 
 [dependencies]
 arrow = { workspace = true }
-datafusion = { path = "../datafusion/core", version = "35.0.0" }
-datafusion-common = { path = "../datafusion/common", version = "35.0.0" }
+datafusion = { path = "../datafusion/core", version = "36.0.0" }
+datafusion-common = { path = "../datafusion/common", version = "36.0.0" }
 env_logger = { workspace = true }
 futures = { workspace = true }
 log = { workspace = true }
@@ -49,4 +49,4 @@ test-utils = { path = "../test-utils/", version = "0.1.0" }
 tokio = { workspace = true, features = ["rt-multi-thread", "parking_lot"] }
 
 [dev-dependencies]
-datafusion-proto = { path = "../datafusion/proto", version = "35.0.0" }
+datafusion-proto = { path = "../datafusion/proto", version = "36.0.0" }

ci/scripts/rust_toml_fmt.sh

@@ -17,11 +17,8 @@
 # specific language governing permissions and limitations
 # under the License.
 
-# Run cargo-tomlfmt with flag `-d` in dry run to check formatting
+# Run `taplo format` with flag `--check` in dry run to check formatting
 # without overwritng the file. If any error occur, you may want to
-# rerun 'cargo tomlfmt -p path/to/Cargo.toml' without '-d' to fix
-# the formatting automatically.
+# rerun `taplo format` to fix the formatting automatically.
 set -ex
-for toml in $(find . -mindepth 2 -name 'Cargo.toml'); do
-	cargo tomlfmt -d -p $toml
-done
+taplo format --check