Skip to content

Commit 48e8e33

Browse files
committed
Merge remote-tracking branch 'origin/main' into tpt/distinct-cte-hash
2 parents 6cf4151 + 710d14b commit 48e8e33

File tree

898 files changed

+45022
-18139
lines changed

Some content is hidden

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

898 files changed

+45022
-18139
lines changed

.asf.yaml

Lines changed: 3 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -54,72 +54,14 @@ github:
5454
# needs to be updated as part of the release process
5555
# .asf.yaml doesn't support wildcard branch protection rules, only exact branch names
5656
# https://github.com/apache/infrastructure-asfyaml?tab=readme-ov-file#branch-protection
57-
# Keeping set of protected branches for future releases
58-
# Meanwhile creating a prerelease script that will update the branch protection names
59-
# automatically. Keep track on it https://github.com/apache/datafusion/issues/17134
57+
# these branches protection blocks autogenerated during release process which is described in
58+
# https://github.com/apache/datafusion/tree/main/dev/release#2-add-a-protection-to-release-candidate-branch
6059
branch-50:
6160
required_pull_request_reviews:
6261
required_approving_review_count: 1
6362
branch-51:
6463
required_pull_request_reviews:
6564
required_approving_review_count: 1
66-
branch-52:
67-
required_pull_request_reviews:
68-
required_approving_review_count: 1
69-
branch-53:
70-
required_pull_request_reviews:
71-
required_approving_review_count: 1
72-
branch-54:
73-
required_pull_request_reviews:
74-
required_approving_review_count: 1
75-
branch-55:
76-
required_pull_request_reviews:
77-
required_approving_review_count: 1
78-
branch-56:
79-
required_pull_request_reviews:
80-
required_approving_review_count: 1
81-
branch-57:
82-
required_pull_request_reviews:
83-
required_approving_review_count: 1
84-
branch-58:
85-
required_pull_request_reviews:
86-
required_approving_review_count: 1
87-
branch-59:
88-
required_pull_request_reviews:
89-
required_approving_review_count: 1
90-
branch-60:
91-
required_pull_request_reviews:
92-
required_approving_review_count: 1
93-
branch-61:
94-
required_pull_request_reviews:
95-
required_approving_review_count: 1
96-
branch-62:
97-
required_pull_request_reviews:
98-
required_approving_review_count: 1
99-
branch-63:
100-
required_pull_request_reviews:
101-
required_approving_review_count: 1
102-
branch-64:
103-
required_pull_request_reviews:
104-
required_approving_review_count: 1
105-
branch-65:
106-
required_pull_request_reviews:
107-
required_approving_review_count: 1
108-
branch-66:
109-
required_pull_request_reviews:
110-
required_approving_review_count: 1
111-
branch-67:
112-
required_pull_request_reviews:
113-
required_approving_review_count: 1
114-
branch-68:
115-
required_pull_request_reviews:
116-
required_approving_review_count: 1
117-
branch-69:
118-
required_pull_request_reviews:
119-
required_approving_review_count: 1
120-
branch-70:
121-
required_pull_request_reviews:
122-
required_approving_review_count: 1
12365
pull_requests:
12466
# enable updating head branches of pull requests
12567
allow_update_branch: true
@@ -129,3 +71,4 @@ github:
12971
# https://datafusion.apache.org/
13072
publish:
13173
whoami: asf-site
74+

.github/workflows/audit.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,9 @@ jobs:
4040
security_audit:
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
43+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4444
- name: Install cargo-audit
45-
uses: taiki-e/install-action@80466ef8efa80486cdfbddf929453a4f3565c791 # v2.62.34
45+
uses: taiki-e/install-action@f79fe7514db78f0a7bdba3cb6dd9c1baa7d046d9 # v2.62.56
4646
with:
4747
tool: cargo-audit
4848
- name: Run audit check

.github/workflows/dependencies.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ jobs:
4444
container:
4545
image: amd64/rust
4646
steps:
47-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
47+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4848
with:
4949
submodules: true
5050
fetch-depth: 1
@@ -62,7 +62,7 @@ jobs:
6262
container:
6363
image: amd64/rust
6464
steps:
65-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
65+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
6666
- name: Install cargo-machete
6767
run: cargo install cargo-machete --version ^0.9 --locked
6868
- name: Detect unused dependencies

.github/workflows/dev.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ jobs:
3232
runs-on: ubuntu-latest
3333
name: Check License Header
3434
steps:
35-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
35+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3636
- name: Install HawkEye
3737
run: cargo install hawkeye --version 6.2.0 --locked --profile dev
3838
- name: Run license header check
@@ -42,7 +42,7 @@ jobs:
4242
name: Use prettier to check formatting of documents
4343
runs-on: ubuntu-latest
4444
steps:
45-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
45+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4646
- uses: actions/setup-node@2028fbc5c25fe9cf00d9f06a71cc4710d4507903 # v6.0.0
4747
with:
4848
node-version: "20"

.github/workflows/docs.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
runs-on: ubuntu-latest
3333
steps:
3434
- name: Checkout docs sources
35-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
35+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3636

3737
- name: Checkout asf-site branch
38-
uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
38+
uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3939
with:
4040
ref: asf-site
4141
path: asf-site

.github/workflows/docs_pr.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ jobs:
4040
name: Test doc build
4141
runs-on: ubuntu-latest
4242
steps:
43-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
43+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4444
with:
4545
submodules: true
4646
fetch-depth: 1

.github/workflows/extended.yml

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ on:
4444
- 'datafusion/physical*/**/*.rs'
4545
- 'datafusion/expr*/**/*.rs'
4646
- 'datafusion/optimizer/**/*.rs'
47+
- 'datafusion-testing'
4748
workflow_dispatch:
4849
inputs:
4950
pr_number:
@@ -68,7 +69,7 @@ jobs:
6869
runs-on: ubuntu-latest
6970
# note: do not use amd/rust container to preserve disk space
7071
steps:
71-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
72+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
7273
with:
7374
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
7475
submodules: true
@@ -92,7 +93,7 @@ jobs:
9293
runs-on: ubuntu-latest
9394
# note: do not use amd/rust container to preserve disk space
9495
steps:
95-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
96+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
9697
with:
9798
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
9899
submodules: true
@@ -123,7 +124,7 @@ jobs:
123124
--lib \
124125
--tests \
125126
--bins \
126-
--features avro,json,backtrace,extended_tests,recursive_protection
127+
--features avro,json,backtrace,extended_tests,recursive_protection,parquet_encryption
127128
- name: Verify Working Directory Clean
128129
run: git diff --exit-code
129130
- name: Cleanup
@@ -136,7 +137,7 @@ jobs:
136137
container:
137138
image: amd64/rust
138139
steps:
139-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
140+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
140141
with:
141142
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
142143
submodules: true
@@ -157,7 +158,7 @@ jobs:
157158
container:
158159
image: amd64/rust
159160
steps:
160-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
161+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
161162
with:
162163
ref: ${{ github.event.inputs.pr_head_sha }} # will be empty if triggered by push
163164
submodules: true
@@ -168,7 +169,7 @@ jobs:
168169
rust-version: stable
169170
- name: Run sqllogictest
170171
run: |
171-
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
172173
cargo clean
173174
174175

.github/workflows/labeler.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ jobs:
3939
contents: read
4040
pull-requests: write
4141
steps:
42-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
42+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
4343

4444
- name: Assign GitHub labels
4545
if: |

.github/workflows/large_files.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ jobs:
2929
check-files:
3030
runs-on: ubuntu-latest
3131
steps:
32-
- uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
32+
- uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
3333
with:
3434
fetch-depth: 0
3535
- name: Check size of new Git objects

0 commit comments

Comments
 (0)