Skip to content

Commit 62cf7a9

Browse files
committed
chore: merge origin/main and resolve conflict in subquery.slt
2 parents bcc68fd + 8248a57 commit 62cf7a9

305 files changed

Lines changed: 21691 additions & 4128 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: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,7 @@ github:
8787
- "check Cargo.toml formatting"
8888
- "check configs.md and ***_functions.md is up-to-date"
8989
- "check example README is up-to-date"
90+
- "Check datafusion crates used in datafusion-examples"
9091
- "Verify MSRV (Min Supported Rust Version)"
9192
# needs to be updated as part of the release process
9293
# .asf.yaml doesn't support wildcard branch protection rules, only exact branch names
@@ -117,6 +118,13 @@ github:
117118
allow_auto_merge: true
118119
# auto-delete head branches after being merged
119120
del_branch_on_merge: true
121+
# Limit open pull requests per user without write access.
122+
#
123+
# With coding agents, the number of open PRs now far exceeds our review capacity.
124+
# Setting a limit helps reviewers focus on fewer PRs at a time.
125+
creation_cap:
126+
enabled: true
127+
max_open_pull_requests: 3
120128

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

‎.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@9114bf4d891761788c546334fd37538eae1bf8b3 # v2.87.16
48+
uses: taiki-e/install-action@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
4949
with:
5050
tool: cargo-audit
5151
- name: Run audit check

‎.github/workflows/breaking_changes_detector.yml‎

Lines changed: 1 addition & 1 deletion
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@9114bf4d891761788c546334fd37538eae1bf8b3 # v2.87.16
92+
uses: taiki-e/install-action@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
9393
with:
9494
tool: cargo-semver-checks
9595

‎.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@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4
48+
uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4
4949
with:
5050
languages: actions
5151

5252
- name: Perform CodeQL Analysis
53-
uses: github/codeql-action/analyze@1c5b675653bb5c22dbe9b12b556ec555138e09fd # v4
53+
uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # 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@9114bf4d891761788c546334fd37538eae1bf8b3 # v2.87.16
72+
uses: taiki-e/install-action@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
7373
with:
7474
tool: cargo-machete@${{ env.CARGO_MACHETE_VERSION }}
7575
- name: Detect unused dependencies

‎.github/workflows/dev.yml‎

Lines changed: 3 additions & 3 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@9114bf4d891761788c546334fd37538eae1bf8b3 # v2.87.16
45+
uses: taiki-e/install-action@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
4646
with:
4747
tool: hawkeye@7.0.0
4848
- name: Run license header 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@9114bf4d891761788c546334fd37538eae1bf8b3 # v2.87.16
73+
uses: taiki-e/install-action@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
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@9114bf4d891761788c546334fd37538eae1bf8b3 # v2.87.16
98+
uses: taiki-e/install-action@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
9999
with:
100100
tool: typos@1.37.0
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@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
46+
uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.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@9114bf4d891761788c546334fd37538eae1bf8b3 # v2.87.16
56+
uses: taiki-e/install-action@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
5757
with:
5858
tool: cargo-depgraph@1.6
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@bec219d24cd3e171d82865faccec33120bb574f4 # v10.1.0
55+
uses: astral-sh/setup-uv@c18668ad3cf93ea998bef934396af7bb5c839dc7 # v10.2.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@9114bf4d891761788c546334fd37538eae1bf8b3 # v2.87.16
64+
uses: taiki-e/install-action@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
6565
with:
6666
tool: cargo-depgraph@1.6
6767
- name: Build docs html and check for warnings
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
# Add the expected target version as a label to a merged PR.
19+
# The "target_version" is automatically updated by the dev/update_datafusion_versions.py script.
20+
21+
name: Release Version Labeler
22+
23+
concurrency:
24+
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
25+
cancel-in-progress: true
26+
27+
on:
28+
pull_request_target:
29+
types:
30+
- closed
31+
branches:
32+
- main
33+
34+
jobs:
35+
label:
36+
if: github.event.pull_request.merged == true
37+
runs-on: ubuntu-slim
38+
permissions:
39+
pull-requests: write
40+
contents: read
41+
steps:
42+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
43+
- name: Add the target release version
44+
uses: actions/github-script@v9.0.0
45+
with:
46+
script: |
47+
const labeler = require('./ci/scripts/release_version_labeler.js');
48+
await labeler({ github, context });

‎.github/workflows/rust.yml‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -430,7 +430,7 @@ jobs:
430430
- name: Install llvm-tools-preview
431431
run: rustup component add llvm-tools-preview
432432
- name: Install cargo-llvm-cov
433-
uses: taiki-e/install-action@9114bf4d891761788c546334fd37538eae1bf8b3 # v2.87.16
433+
uses: taiki-e/install-action@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
434434
with:
435435
tool: cargo-llvm-cov
436436
- name: Rust Dependency Cache
@@ -598,7 +598,7 @@ jobs:
598598
clang-18 --version
599599
clang++-18 --version
600600
- name: Setup wasm-pack
601-
uses: taiki-e/install-action@9114bf4d891761788c546334fd37538eae1bf8b3 # v2.87.16
601+
uses: taiki-e/install-action@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
602602
with:
603603
tool: wasm-pack
604604
- name: Run tests with headless mode
@@ -831,7 +831,7 @@ jobs:
831831
with:
832832
rust-version: stable
833833
- name: Install taplo
834-
uses: taiki-e/install-action@9114bf4d891761788c546334fd37538eae1bf8b3 # v2.87.16
834+
uses: taiki-e/install-action@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
835835
with:
836836
tool: taplo-cli@0.9
837837
# if you encounter an error, try running 'taplo format' to fix the formatting automatically.
@@ -897,6 +897,16 @@ jobs:
897897
run: |
898898
bash ci/scripts/check_examples_docs.sh
899899
900+
# Ensures that the examples only use the main `datafusion` crate and not its subcrates, which are
901+
# already exported by `datafusion` (there are a few exceptions, like `datafusion-proto`).
902+
# See: https://github.com/apache/datafusion/pull/14305
903+
examples-check-datafusion-crates:
904+
name: Check datafusion crates used in datafusion-examples
905+
runs-on: ubuntu-slim
906+
steps:
907+
- uses: actions/checkout@3d3c42e5aac5ba805825da76410c181273ba90b1 # v7.0.1
908+
- run: python3 ci/scripts/check_examples_datafusion_crates.py
909+
900910
# Verify MSRV for the crates which are directly used by other projects:
901911
# - datafusion
902912
# - datafusion-substrait
@@ -913,7 +923,7 @@ jobs:
913923
- name: Setup Rust toolchain
914924
uses: ./.github/actions/setup-builder
915925
- name: Install cargo-msrv
916-
uses: taiki-e/install-action@9114bf4d891761788c546334fd37538eae1bf8b3 # v2.87.16
926+
uses: taiki-e/install-action@4cef1412cce204788f482e778a0b9187f9626a29 # v2.87.21
917927
with:
918928
tool: cargo-msrv
919929

0 commit comments

Comments
 (0)