Skip to content

Commit 2347a72

Browse files
committed
Merge remote-tracking branch 'upstream/main' into na-multikey-right-anti
# Conflicts: # datafusion/physical-plan/src/joins/hash_join/stream.rs
2 parents fa12ec3 + a9129e7 commit 2347a72

464 files changed

Lines changed: 25982 additions & 5715 deletions

File tree

Some content is hidden

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

‎.asf.yaml‎

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,6 +112,43 @@ github:
112112
branch-55:
113113
required_pull_request_reviews:
114114
required_approving_review_count: 1
115+
116+
# GitHub merge queue settings for `main`.
117+
#
118+
# The merge queue is managed through rulesets
119+
# https://github.com/apache/infrastructure-asfyaml#rulesets
120+
#
121+
# Merge queue rules do not support wildcard ref patterns, so only the default
122+
# branch is covered; release branches keep plain branch protection above.
123+
rulesets:
124+
- name: Merge Queue
125+
target: branch
126+
enforcement: active
127+
conditions:
128+
ref_name:
129+
include:
130+
- "~DEFAULT_BRANCH"
131+
exclude: []
132+
rules:
133+
- type: merge_queue
134+
parameters:
135+
# Matches enabled_merge_buttons above.
136+
merge_method: SQUASH
137+
# Every entry's own build must be green, not only the head of the
138+
# group.
139+
grouping_strategy: ALLGREEN
140+
# How many queue entries are built and tested concurrently.
141+
max_entries_to_build: 5
142+
# How many green entries may land in one merge operation (note this
143+
# does not combine CI builds)
144+
max_entries_to_merge: 1
145+
min_entries_to_merge: 1
146+
min_entries_to_merge_wait_minutes: 5
147+
# How long the queue waits for a required check to report before
148+
# treating it as failed and evicting the entry. Set to 6h to handle
149+
# periods of high runner queue times. See
150+
# https://github.com/apache/datafusion/issues/26292
151+
check_response_timeout_minutes: 360
115152
pull_requests:
116153
# enable updating head branches of pull requests
117154
allow_update_branch: true

‎.github/workflows/audit.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ jobs:
4545
steps:
4646
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4747
- name: Install cargo-audit
48-
uses: taiki-e/install-action@861a07ce7084f55488e375df125cdc99bba60eb7 # v2.87.23
48+
uses: taiki-e/install-action@ab6895351a88b908e96a4697860d4ffea5e57dbe # v2.87.27
4949
with:
5050
tool: cargo-audit
5151
- name: Run audit check

‎.github/workflows/breaking_changes_detector.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ jobs:
8989
9090
- name: Install cargo-semver-checks
9191
if: steps.changed_crates.outputs.packages != ''
92-
uses: taiki-e/install-action@861a07ce7084f55488e375df125cdc99bba60eb7 # v2.87.23
92+
uses: taiki-e/install-action@ab6895351a88b908e96a4697860d4ffea5e57dbe # v2.87.27
9393
with:
9494
tool: cargo-semver-checks
9595

@@ -137,7 +137,7 @@ jobs:
137137
138138
- name: Upload artifact
139139
if: always()
140-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
140+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
141141
with:
142142
name: semver-check-result
143143
path: semver-artifact/

‎.github/workflows/breaking_changes_detector_comment.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ jobs:
6868
pull-requests: write
6969
steps:
7070
- name: Download semver-check artifact
71-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
71+
uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
7272
with:
7373
name: semver-check-result
7474
run-id: ${{ github.event.workflow_run.id }}

‎.github/workflows/codeql.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ jobs:
4545
persist-credentials: false
4646

4747
- name: Initialize CodeQL
48-
uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4
48+
uses: github/codeql-action/init@24c54180a607b1449ed407dd24f251e4e9147c8d # v4
4949
with:
5050
languages: actions
5151

5252
- name: Perform CodeQL Analysis
53-
uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4
53+
uses: github/codeql-action/analyze@24c54180a607b1449ed407dd24f251e4e9147c8d # v4
5454
with:
5555
category: "/language:actions"

‎.github/workflows/dependencies.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
. ci/scripts/utils/tool_versions.sh
7070
echo "CARGO_MACHETE_VERSION=${CARGO_MACHETE_VERSION}" >> "$GITHUB_ENV"
7171
- name: Install cargo-machete
72-
uses: taiki-e/install-action@861a07ce7084f55488e375df125cdc99bba60eb7 # v2.87.23
72+
uses: taiki-e/install-action@ab6895351a88b908e96a4697860d4ffea5e57dbe # v2.87.27
7373
with:
7474
tool: cargo-machete@${{ env.CARGO_MACHETE_VERSION }}
7575
- name: Detect unused dependencies

‎.github/workflows/dev.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
4444
- name: Install HawkEye
45-
uses: taiki-e/install-action@861a07ce7084f55488e375df125cdc99bba60eb7 # v2.87.23
45+
uses: taiki-e/install-action@ab6895351a88b908e96a4697860d4ffea5e57dbe # v2.87.27
4646
with:
4747
4848
- name: Run license header check
@@ -53,7 +53,7 @@ jobs:
5353
runs-on: ubuntu-slim
5454
steps:
5555
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
56-
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
56+
- uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
5757
with:
5858
node-version: "20"
5959
- name: Prettier check
@@ -70,7 +70,7 @@ jobs:
7070
source ci/scripts/utils/tool_versions.sh
7171
echo "LYCHEE_VERSION=${LYCHEE_VERSION}" >> "$GITHUB_ENV"
7272
- name: Install lychee
73-
uses: taiki-e/install-action@861a07ce7084f55488e375df125cdc99bba60eb7 # v2.87.23
73+
uses: taiki-e/install-action@ab6895351a88b908e96a4697860d4ffea5e57dbe # v2.87.27
7474
with:
7575
tool: lychee@${{ env.LYCHEE_VERSION }}
7676
- name: Run markdown link check
@@ -95,7 +95,7 @@ jobs:
9595
# it may cause checks to fail more often.
9696
# We can upgrade it manually once a while.
9797
- name: Install typos
98-
uses: taiki-e/install-action@861a07ce7084f55488e375df125cdc99bba60eb7 # v2.87.23
98+
uses: taiki-e/install-action@ab6895351a88b908e96a4697860d4ffea5e57dbe # v2.87.27
9999
with:
100100
101101
- name: Run typos check

‎.github/workflows/docs.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
path: asf-site
4444

4545
- name: Setup uv
46-
uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
46+
uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
4747

4848
- name: Install dependencies
4949
run: uv sync --package datafusion-docs
@@ -53,7 +53,7 @@ jobs:
5353
sudo apt-get update
5454
sudo apt-get install -y graphviz
5555
- name: Install cargo-depgraph
56-
uses: taiki-e/install-action@861a07ce7084f55488e375df125cdc99bba60eb7 # v2.87.23
56+
uses: taiki-e/install-action@ab6895351a88b908e96a4697860d4ffea5e57dbe # v2.87.27
5757
with:
5858
5959

‎.github/workflows/docs_pr.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
submodules: true
5353
fetch-depth: 1
5454
- name: Setup uv
55-
uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.0
55+
uses: astral-sh/setup-uv@1c37ad07a6a961277cf70c0d37d6f313000f5884 # v10.3.0
5656
- name: Install doc dependencies
5757
run: uv sync --package datafusion-docs
5858
- name: Install Graphviz
@@ -61,7 +61,7 @@ jobs:
6161
sudo apt-get update
6262
sudo apt-get install -y graphviz
6363
- name: Install cargo-depgraph
64-
uses: taiki-e/install-action@861a07ce7084f55488e375df125cdc99bba60eb7 # v2.87.23
64+
uses: taiki-e/install-action@ab6895351a88b908e96a4697860d4ffea5e57dbe # v2.87.27
6565
with:
6666
6767
- name: Build docs html and check for warnings

‎.github/workflows/rust.yml‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ jobs:
105105
- name: Upload Cargo check artifacts
106106
if: ${{ steps.archive-check.outcome == 'success' && !(github.event_name == 'push' && github.ref == 'refs/heads/main' && github.repository == 'apache/datafusion') }}
107107
continue-on-error: true
108-
uses: actions/upload-artifact@043fb46d1a93c77aae656e7c1c64a875d1fc6a0a # v7.0.1
108+
uses: actions/upload-artifact@cf430e030ddbb5b0abf93d22962f4752f3646cd9 # v7.0.2
109109
with:
110110
name: cargo-check
111111
path: ${{ runner.temp }}/cargo-check/
@@ -159,6 +159,7 @@ jobs:
159159
container:
160160
image: amd64/rust
161161
steps:
162+
- uses: runs-on/action@efac073ea2507ec18797de3a81704201ade11d9d # v2.3.1
162163
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
163164
- name: Setup Rust toolchain
164165
uses: ./.github/actions/setup-builder
@@ -167,7 +168,7 @@ jobs:
167168
- name: Download Cargo check artifacts
168169
id: download-check
169170
continue-on-error: true
170-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
171+
uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
171172
with:
172173
name: cargo-check
173174
path: ${{ runner.temp }}/cargo-check
@@ -278,7 +279,7 @@ jobs:
278279
- name: Download Cargo check artifacts
279280
id: download-check
280281
continue-on-error: true
281-
uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
282+
uses: actions/download-artifact@9000827ccba6bdab643e8b6fd33ac0654aef8333 # v8.0.2
282283
with:
283284
name: cargo-check
284285
path: ${{ runner.temp }}/cargo-check
@@ -399,14 +400,14 @@ jobs:
399400
save-if: false # The workspace and functions checks save this cache on main.
400401
shared-key: "amd-ci-check"
401402
- name: Check datafusion-spark (default features)
402-
run: cargo check --profile ci --all-targets -p datafusion-spark
403+
run: cargo xtask ci step check datafusion-spark default
403404
#
404405
# Note: Only check libraries (not --all-targets) to cover end user APIs
405406
#
406407
- name: Check datafusion-spark (no-default-features)
407-
run: cargo check --profile ci --no-default-features -p datafusion-spark
408+
run: cargo xtask ci step check datafusion-spark no-default
408409
- name: Check datafusion-spark (core)
409-
run: cargo check --profile ci --no-default-features -p datafusion-spark --features=core
410+
run: cargo xtask ci step check datafusion-spark core
410411

411412
# Library and integration tests
412413
linux-test:
@@ -430,7 +431,7 @@ jobs:
430431
- name: Install llvm-tools-preview
431432
run: rustup component add llvm-tools-preview
432433
- name: Install cargo-llvm-cov
433-
uses: taiki-e/install-action@861a07ce7084f55488e375df125cdc99bba60eb7 # v2.87.23
434+
uses: taiki-e/install-action@ab6895351a88b908e96a4697860d4ffea5e57dbe # v2.87.27
434435
with:
435436
tool: cargo-llvm-cov
436437
- name: Rust Dependency Cache
@@ -598,7 +599,7 @@ jobs:
598599
clang-18 --version
599600
clang++-18 --version
600601
- name: Setup wasm-pack
601-
uses: taiki-e/install-action@861a07ce7084f55488e375df125cdc99bba60eb7 # v2.87.23
602+
uses: taiki-e/install-action@ab6895351a88b908e96a4697860d4ffea5e57dbe # v2.87.27
602603
with:
603604
tool: wasm-pack
604605
- name: Run tests with headless mode
@@ -833,7 +834,7 @@ jobs:
833834
with:
834835
rust-version: stable
835836
- name: Install taplo
836-
uses: taiki-e/install-action@861a07ce7084f55488e375df125cdc99bba60eb7 # v2.87.23
837+
uses: taiki-e/install-action@ab6895351a88b908e96a4697860d4ffea5e57dbe # v2.87.27
837838
with:
838839
839840
# if you encounter an error, try running 'taplo format' to fix the formatting automatically.
@@ -857,7 +858,7 @@ jobs:
857858
uses: ./.github/actions/setup-builder
858859
with:
859860
rust-version: stable
860-
- uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
861+
- uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
861862
with:
862863
node-version: "20"
863864
- name: Check generated config and function docs
@@ -891,7 +892,7 @@ jobs:
891892

892893
- name: Set up Node.js (required for prettier)
893894
# doc_prettier_check.sh uses npx to run prettier for Markdown formatting
894-
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
895+
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
895896
with:
896897
node-version: '18'
897898

@@ -925,7 +926,7 @@ jobs:
925926
- name: Setup Rust toolchain
926927
uses: ./.github/actions/setup-builder
927928
- name: Install cargo-msrv
928-
uses: taiki-e/install-action@861a07ce7084f55488e375df125cdc99bba60eb7 # v2.87.23
929+
uses: taiki-e/install-action@ab6895351a88b908e96a4697860d4ffea5e57dbe # v2.87.27
929930
with:
930931
tool: cargo-msrv
931932

0 commit comments

Comments
 (0)