Skip to content

Commit 5b719a8

Browse files
committed
Merge remote-tracking branch 'upstream/main' into jiff-proto
# Conflicts: # Cargo.lock # datafusion/functions/benches/to_timestamp.rs # datafusion/functions/src/datetime/common.rs # datafusion/functions/src/datetime/mod.rs # datafusion/functions/src/datetime/to_date.rs # datafusion/functions/src/datetime/to_timestamp.rs # datafusion/functions/src/datetime/to_unixtime.rs # datafusion/sqllogictest/test_files/to_timestamp_timezone.slt # docs/source/user-guide/configs.md
2 parents 6328c6f + f9697c1 commit 5b719a8

File tree

1,290 files changed

+80489
-32193
lines changed

Some content is hidden

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

1,290 files changed

+80489
-32193
lines changed

.asf.yaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,9 @@ github:
6262
branch-51:
6363
required_pull_request_reviews:
6464
required_approving_review_count: 1
65+
branch-52:
66+
required_pull_request_reviews:
67+
required_approving_review_count: 1
6568
pull_requests:
6669
# enable updating head branches of pull requests
6770
allow_update_branch: true

.github/actions/setup-builder/action.yaml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,17 @@ runs:
4646
# https://github.com/actions/checkout/issues/766
4747
shell: bash
4848
run: git config --global --add safe.directory "$GITHUB_WORKSPACE"
49+
- name: Remove unnecessary preinstalled software
50+
shell: bash
51+
run: |
52+
echo "Disk space before cleanup:"
53+
df -h
54+
apt-get clean
55+
# remove tool cache: about 8.5GB (github has host /opt/hostedtoolcache mounted as /__t)
56+
rm -rf /__t/* || true
57+
# remove Haskell runtime: about 6.3GB (host /usr/local/.ghcup)
58+
rm -rf /host/usr/local/.ghcup || true
59+
# remove Android library: about 7.8GB (host /usr/local/lib/android)
60+
rm -rf /host/usr/local/lib/android || true
61+
echo "Disk space after cleanup:"
62+
df -h

.github/dependabot.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ updates:
2323
interval: weekly
2424
target-branch: main
2525
labels: [auto-dependencies]
26+
open-pull-requests-limit: 15
2627
ignore:
2728
# major version bumps of arrow* and parquet are handled manually
2829
- dependency-name: "arrow*"

.github/workflows/audit.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,10 @@ jobs:
4242
steps:
4343
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
4444
- name: Install cargo-audit
45-
uses: taiki-e/install-action@92e6dd1c202153a204d471a3c509bf1e03dcfa44 # v2.62.61
45+
uses: taiki-e/install-action@3522286d40783523f9c7880e33f785905b4c20d0 # v2.66.1
4646
with:
4747
tool: cargo-audit
4848
- name: Run audit check
49+
# Note: you can ignore specific RUSTSEC issues using the `--ignore` flag ,for example:
50+
# run: cargo audit --ignore RUSTSEC-2026-0001
4951
run: cargo audit

.github/workflows/dev.yml

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -48,16 +48,8 @@ jobs:
4848
with:
4949
node-version: "20"
5050
- name: Prettier check
51-
run: |
52-
# if you encounter error, rerun the command below and commit the changes
53-
#
54-
# ignore subproject CHANGELOG.md because they are machine generated
55-
npx [email protected] --write \
56-
'{datafusion,datafusion-cli,datafusion-examples,dev,docs}/**/*.md' \
57-
'!datafusion/CHANGELOG.md' \
58-
README.md \
59-
CONTRIBUTING.md
60-
git diff --exit-code
51+
# if you encounter error, see instructions inside the script
52+
run: ci/scripts/doc_prettier_check.sh
6153

6254
typos:
6355
name: Spell Check with Typos
@@ -72,4 +64,4 @@ jobs:
7264
- name: Install typos-cli
7365
run: cargo install typos-cli --locked --version 1.37.0
7466
- name: Run typos check
75-
run: ci/scripts/typos_check.sh
67+
run: ci/scripts/typos_check.sh

.github/workflows/rust.yml

Lines changed: 19 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -272,18 +272,6 @@ jobs:
272272
volumes:
273273
- /usr/local:/host/usr/local
274274
steps:
275-
- name: Remove unnecessary preinstalled software
276-
run: |
277-
echo "Disk space before cleanup:"
278-
df -h
279-
# remove tool cache: about 8.5GB (github has host /opt/hostedtoolcache mounted as /__t)
280-
rm -rf /__t/* || true
281-
# remove Haskell runtime: about 6.3GB (host /usr/local/.ghcup)
282-
rm -rf /host/usr/local/.ghcup || true
283-
# remove Android library: about 7.8GB (host /usr/local/lib/android)
284-
rm -rf /host/usr/local/lib/android || true
285-
echo "Disk space after cleanup:"
286-
df -h
287275
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
288276
with:
289277
submodules: true
@@ -374,19 +362,6 @@ jobs:
374362
with:
375363
save-if: ${{ github.ref_name == 'main' }}
376364
shared-key: "amd-ci-linux-test-example"
377-
- name: Remove unnecessary preinstalled software
378-
run: |
379-
echo "Disk space before cleanup:"
380-
df -h
381-
apt-get clean
382-
rm -rf /__t/CodeQL
383-
rm -rf /__t/PyPy
384-
rm -rf /__t/Java_Temurin-Hotspot_jdk
385-
rm -rf /__t/Python
386-
rm -rf /__t/go
387-
rm -rf /__t/Ruby
388-
echo "Disk space after cleanup:"
389-
df -h
390365
- name: Run examples
391366
run: |
392367
# test datafusion-sql examples
@@ -446,7 +421,7 @@ jobs:
446421
sudo apt-get update -qq
447422
sudo apt-get install -y -qq clang
448423
- name: Setup wasm-pack
449-
uses: taiki-e/install-action@92e6dd1c202153a204d471a3c509bf1e03dcfa44 # v2.62.61
424+
uses: taiki-e/install-action@3522286d40783523f9c7880e33f785905b4c20d0 # v2.66.1
450425
with:
451426
tool: wasm-pack
452427
- name: Run tests with headless mode
@@ -734,6 +709,23 @@ jobs:
734709
./dev/update_function_docs.sh
735710
git diff --exit-code
736711
712+
examples-docs-check:
713+
name: check example README is up-to-date
714+
needs: linux-build-lib
715+
runs-on: ubuntu-latest
716+
container:
717+
image: amd64/rust
718+
719+
steps:
720+
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
721+
with:
722+
submodules: true
723+
fetch-depth: 1
724+
725+
- name: Run examples docs check script
726+
run: |
727+
bash ci/scripts/check_examples_docs.sh
728+
737729
# Verify MSRV for the crates which are directly used by other projects:
738730
# - datafusion
739731
# - datafusion-substrait
@@ -749,7 +741,7 @@ jobs:
749741
- name: Setup Rust toolchain
750742
uses: ./.github/actions/setup-builder
751743
- name: Install cargo-msrv
752-
uses: taiki-e/install-action@92e6dd1c202153a204d471a3c509bf1e03dcfa44 # v2.62.61
744+
uses: taiki-e/install-action@3522286d40783523f9c7880e33f785905b4c20d0 # v2.66.1
753745
with:
754746
tool: cargo-msrv
755747

0 commit comments

Comments
 (0)