Skip to content

Commit 41ac1d1

Browse files
adriangbclaude
andcommitted
Merge apache/main; tighten rename-swap test filter to a > 15
Resolve conflicts with the pass-through column resolution from main (resolve_against), keeping the output-name guard. Change the filter in the rename-swap struct test to a > 15 so the result distinguishes the two possible bindings (review suggestion). Co-Authored-By: Claude Opus 5.5 <[email protected]>
2 parents dcbc474 + 7e102d7 commit 41ac1d1

646 files changed

Lines changed: 51457 additions & 11084 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: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,56 @@ 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
118155
allow_auto_merge: true
119156
# auto-delete head branches after being merged
120157
del_branch_on_merge: true
158+
# Limit open pull requests per user without write access.
159+
#
160+
# With coding agents, the number of open PRs now far exceeds our review capacity.
161+
# Setting a limit helps reviewers focus on fewer PRs at a time.
162+
creation_cap:
163+
enabled: true
164+
max_open_pull_requests: 3
121165

122166
# publishes the content of the `asf-site` branch to
123167
# https://datafusion.apache.org/

‎.envrc‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
source_up_if_exists
2+
if command -v nix >/dev/null 2>&1; then
3+
use flake
4+
fi
5+
source_env_if_exists .envrc.local

‎.github/ISSUE_TEMPLATE/bug_report.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,12 @@ body:
2626
label: Additional context
2727
placeholder: >
2828
Add any other context about the problem here.
29+
- type: dropdown
30+
attributes:
31+
label: Willingness to contribute
32+
description: >
33+
The Apache DataFusion community encourages bug fix contributions. Would you or another member of your organization be willing to contribute a fix for this bug to the Apache DataFusion codebase?
34+
options:
35+
- I plan to contribute a fix for this bug independently
36+
- I would like to contribute a fix for this bug, but request guidance from the DataFusion community
37+
- I cannot contribute a fix for this bug at this time

‎.github/ISSUE_TEMPLATE/feature_request.yml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,3 +25,12 @@ body:
2525
label: Additional context
2626
placeholder: >
2727
Add any other context or screenshots about the feature request here.
28+
- type: dropdown
29+
attributes:
30+
label: Willingness to contribute
31+
description: >
32+
The Apache DataFusion community encourages feature contributions. Would you or another member of your organization be willing to contribute to this feature for the Apache DataFusion codebase?
33+
options:
34+
- I plan to contribute to this feature independently
35+
- I would like to contribute to this feature, but request guidance from the DataFusion community
36+
- I cannot contribute to this feature at this time

‎.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@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
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@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
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@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
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@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
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@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
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@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
98+
uses: taiki-e/install-action@ab6895351a88b908e96a4697860d4ffea5e57dbe # v2.87.27
9999
with:
100100
101101
- name: Run typos check

0 commit comments

Comments
 (0)