Skip to content

Commit 0a6f6d3

Browse files
authored
Merge branch 'main' into optimize-primitive-multi-group-by-to-use-simd
2 parents d5b5caa + 969fc13 commit 0a6f6d3

File tree

652 files changed

+41955
-15124
lines changed

Some content is hidden

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

652 files changed

+41955
-15124
lines changed

.asf.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@ github:
4141
- sql
4242
enabled_merge_buttons:
4343
squash: true
44+
squash_commit_message: PR_TITLE_AND_DESC
4445
merge: false
4546
rebase: false
4647
features:

.github/workflows/audit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
4444
- name: Install cargo-audit
45-
uses: taiki-e/install-action@eba4035583f0f9b001a27be2cce0a136d05d05e3 # v2.62.23
45+
uses: taiki-e/install-action@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
4646
with:
4747
tool: cargo-audit
4848
- name: Run audit check

.github/workflows/dependencies.yml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,3 +56,14 @@ jobs:
5656
run: |
5757
cd dev/depcheck
5858
cargo run
59+
60+
detect-unused-dependencies:
61+
runs-on: ubuntu-latest
62+
container:
63+
image: amd64/rust
64+
steps:
65+
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
66+
- name: Install cargo-machete
67+
run: cargo install cargo-machete --version ^0.9 --locked
68+
- name: Detect unused dependencies
69+
run: cargo machete --with-metadata

.github/workflows/dev.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
runs-on: ubuntu-latest
4444
steps:
4545
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
46-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
46+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
4747
with:
4848
node-version: "20"
4949
- name: Prettier check

.github/workflows/extended.yml

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,15 @@ on:
3636
# it is not expected to have many changes in these branches,
3737
# so running extended tests is not a burden
3838
- 'branch-*'
39+
# Also run for changes to some critical areas that are most likely
40+
# to trigger errors in extended tests
41+
pull_request:
42+
branches: [ '**' ]
43+
paths:
44+
- 'datafusion/physical*/**/*.rs'
45+
- 'datafusion/expr*/**/*.rs'
46+
- 'datafusion/optimizer/**/*.rs'
47+
- 'datafusion-testing'
3948
workflow_dispatch:
4049
inputs:
4150
pr_number:
@@ -115,7 +124,7 @@ jobs:
115124
--lib \
116125
--tests \
117126
--bins \
118-
--features avro,json,backtrace,extended_tests,recursive_protection
127+
--features avro,json,backtrace,extended_tests,recursive_protection,parquet_encryption
119128
- name: Verify Working Directory Clean
120129
run: git diff --exit-code
121130
- name: Cleanup
@@ -160,7 +169,7 @@ jobs:
160169
rust-version: stable
161170
- name: Run sqllogictest
162171
run: |
163-
cargo test --features backtrace --profile release-nonlto --test sqllogictests -- --include-sqlite
172+
cargo test --features backtrace,parquet_encryption --profile release-nonlto --test sqllogictests -- --include-sqlite
164173
cargo clean
165174
166175

.github/workflows/labeler/labeler-config.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ execution:
5858

5959
datasource:
6060
- changed-files:
61-
- any-glob-to-any-file: ['datafusion/datasource/**/*', 'datafusion/datasource-avro/**/*', 'datafusion/datasource-csv/**/*', 'datafusion/datasource-json/**/*', 'datafusion/datasource-parquet/**/*']
61+
- any-glob-to-any-file: ['datafusion/datasource/**/*', 'datafusion/datasource-avro/**/*', 'datafusion/datasource-arrow/**/*', 'datafusion/datasource-csv/**/*', 'datafusion/datasource-json/**/*', 'datafusion/datasource-parquet/**/*']
6262

6363
functions:
6464
- changed-files:

.github/workflows/rust.yml

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -302,6 +302,15 @@ jobs:
302302
--features serde,avro,json,backtrace,integration-tests,parquet_encryption
303303
- name: Verify Working Directory Clean
304304
run: git diff --exit-code
305+
# Check no temporary directories created during test.
306+
# `false/` folder is excuded for rust cache.
307+
- name: Verify Working Directory Clean (No Untracked Files)
308+
run: |
309+
STATUS="$(git status --porcelain | sed -e '/^?? false\/$/d' -e '/^?? false$/d')"
310+
if [ -n "$STATUS" ]; then
311+
echo "$STATUS"
312+
exit 1
313+
fi
305314
306315
# datafusion-cli tests
307316
linux-test-datafusion-cli:
@@ -353,6 +362,19 @@ jobs:
353362
with:
354363
save-if: ${{ github.ref_name == 'main' }}
355364
shared-key: "amd-ci-linux-test-example"
365+
- name: Remove unnecessary preinstalled software
366+
run: |
367+
echo "Disk space before cleanup:"
368+
df -h
369+
apt-get clean
370+
rm -rf /__t/CodeQL
371+
rm -rf /__t/PyPy
372+
rm -rf /__t/Java_Temurin-Hotspot_jdk
373+
rm -rf /__t/Python
374+
rm -rf /__t/go
375+
rm -rf /__t/Ruby
376+
echo "Disk space after cleanup:"
377+
df -h
356378
- name: Run examples
357379
run: |
358380
# test datafusion-sql examples
@@ -412,7 +434,7 @@ jobs:
412434
sudo apt-get update -qq
413435
sudo apt-get install -y -qq clang
414436
- name: Setup wasm-pack
415-
uses: taiki-e/install-action@eba4035583f0f9b001a27be2cce0a136d05d05e3 # v2.62.23
437+
uses: taiki-e/install-action@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
416438
with:
417439
tool: wasm-pack
418440
- name: Run tests with headless mode
@@ -453,7 +475,7 @@ jobs:
453475
export RUST_MIN_STACK=20971520
454476
export TPCH_DATA=`realpath datafusion/sqllogictest/test_files/tpch/data`
455477
cargo test plan_q --package datafusion-benchmarks --profile ci --features=ci -- --test-threads=1
456-
INCLUDE_TPCH=true cargo test --features backtrace --profile ci --package datafusion-sqllogictest --test sqllogictests
478+
INCLUDE_TPCH=true cargo test --features backtrace,parquet_encryption --profile ci --package datafusion-sqllogictest --test sqllogictests
457479
- name: Verify Working Directory Clean
458480
run: git diff --exit-code
459481

@@ -710,7 +732,7 @@ jobs:
710732
uses: ./.github/actions/setup-builder
711733
with:
712734
rust-version: stable
713-
- uses: actions/setup-node@a0853c24544627f65ddf259abe73b1d18a591444 # v5.0.0
735+
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
714736
with:
715737
node-version: "20"
716738
- name: Check if configs.md has been modified
@@ -739,7 +761,7 @@ jobs:
739761
- name: Setup Rust toolchain
740762
uses: ./.github/actions/setup-builder
741763
- name: Install cargo-msrv
742-
uses: taiki-e/install-action@eba4035583f0f9b001a27be2cce0a136d05d05e3 # v2.62.23
764+
uses: taiki-e/install-action@f535147c22906d77695e11cb199e764aa610a4fc # v2.62.46
743765
with:
744766
tool: cargo-msrv
745767

@@ -784,4 +806,4 @@ jobs:
784806
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
785807
with:
786808
persist-credentials: false
787-
- uses: crate-ci/typos@80c8a4945eec0f6d464eaf9e65ed98ef085283d1 # v1.38.1
809+
- uses: crate-ci/typos@07d900b8fa1097806b8adb6391b0d3e0ac2fdea7 # v1.39.0

0 commit comments

Comments
 (0)