Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/main' into itertools-update
Browse files Browse the repository at this point in the history
  • Loading branch information
korowa committed Aug 21, 2024
2 parents fbe3270 + 121f330 commit 7005b21
Show file tree
Hide file tree
Showing 694 changed files with 60,309 additions and 28,524 deletions.
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.github/ export-ignore
datafusion/core/tests/data/newlines_in_values.csv text eol=lf
datafusion/proto/src/generated/prost.rs linguist-generated
datafusion/proto/src/generated/pbjson.rs linguist-generated
29 changes: 25 additions & 4 deletions .github/workflows/dev_pr/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@

development-process:
- changed-files:
- any-glob-to-any-file: ['dev/**.*', '.github/**.*', 'ci/**.*', '.asf.yaml']
- any-glob-to-any-file: ['dev/**/*', '.github/**/*', 'ci/**/*', '.asf.yaml']

documentation:
- changed-files:
- any-glob-to-any-file: ['docs/**.*', 'README.md', './**/README.md', 'DEVELOPERS.md', 'datafusion/docs/**.*']
- any-glob-to-any-file: ['docs/**/*', 'README.md', './**/README.md', 'DEVELOPERS.md', 'datafusion/docs/**/*']

sql:
- changed-files:
Expand All @@ -33,16 +33,37 @@ logical-expr:

physical-expr:
- changed-files:
- any-glob-to-any-file: ['datafusion/physical-expr/**/*']
- any-glob-to-any-file: ['datafusion/physical-expr/**/*', 'datafusion/physical-expr-common/**/*', 'datafusion/physical-expr-aggregate/**/*', 'datafusion/physical-plan/**/*']

catalog:
- changed-files:
- any-glob-to-any-file: ['datafusion/catalog/**/*']

common:
- changed-files:
- any-glob-to-any-file: ['datafusion/common/**/*', 'datafusion/common-runtime/**/*']

execution:
- changed-files:
- any-glob-to-any-file: ['datafusion/execution/**/*']

functions:
- changed-files:
- any-glob-to-any-file: ['datafusion/functions/**/*', 'datafusion/functions-aggregate/**/*', 'datafusion/functions-aggregate-common', 'datafusion/functions-nested']


optimizer:
- changed-files:
- any-glob-to-any-file: ['datafusion/optimizer/**/*']
- any-glob-to-any-file: ['datafusion/optimizer/**/*', 'datafusion/physical-optimizer/**/*']

core:
- changed-files:
- any-glob-to-any-file: ['datafusion/core/**/*']

proto:
- changed-files:
- any-glob-to-any-file: ['datafusion/proto/**/*', 'datafusion/proto-common/**/*']

substrait:
- changed-files:
- any-glob-to-any-file: ['datafusion/substrait/**/*']
Expand Down
55 changes: 55 additions & 0 deletions .github/workflows/large_files.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
# Licensed to the Apache Software Foundation (ASF) under one
# or more contributor license agreements. See the NOTICE file
# distributed with this work for additional information
# regarding copyright ownership. The ASF licenses this file
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.

name: Large files PR check

concurrency:
group: ${{ github.repository }}-${{ github.head_ref || github.sha }}-${{ github.workflow }}
cancel-in-progress: true

on:
pull_request:

jobs:
check-files:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
with:
fetch-depth: 0
- name: Check size of new Git objects
env:
# 1 MB ought to be enough for anybody.
# TODO in case we may want to consciously commit a bigger file to the repo without using Git LFS we may disable the check e.g. with a label
MAX_FILE_SIZE_BYTES: 1048576
shell: bash
run: |
git rev-list --objects ${{ github.event.pull_request.base.sha }}..${{ github.event.pull_request.head.sha }} \
> pull-request-objects.txt
exit_code=0
while read -r id path; do
# Skip objects which are not files (commits, trees)
if [ ! -z "${path}" ]; then
size="$(git cat-file -s "${id}")"
if [ "${size}" -gt "${MAX_FILE_SIZE_BYTES}" ]; then
exit_code=1
echo "Object ${id} [${path}] has size ${size}, exceeding ${MAX_FILE_SIZE_BYTES} limit." >&2
echo "::error file=${path}::File ${path} has size ${size}, exceeding ${MAX_FILE_SIZE_BYTES} limit."
fi
fi
done < pull-request-objects.txt
exit "${exit_code}"
45 changes: 27 additions & 18 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,7 @@ jobs:
~/.cargo/git/db/
./target/
./datafusion-cli/target/
# this key equals the ones on `linux-build-lib` for re-use
key: cargo-cache-benchmark-${{ hashFiles('datafusion/**/Cargo.toml', 'benchmarks/Cargo.toml', 'datafusion-cli/Cargo.toml') }}
key: cargo-cache-${{ hashFiles('**/Cargo.toml', '**/Cargo.lock') }}

- name: Check datafusion without default features
# Some of the test binaries require the parquet feature still
Expand All @@ -90,8 +89,8 @@ jobs:
# Ensure that the datafusion crate can be built with only a subset of the function
# packages enabled.
- name: Check datafusion (array_expressions)
run: cargo check --no-default-features --features=array_expressions -p datafusion
- name: Check datafusion (nested_expressions)
run: cargo check --no-default-features --features=nested_expressions -p datafusion

- name: Check datafusion (crypto)
run: cargo check --no-default-features --features=crypto_expressions -p datafusion
Expand Down Expand Up @@ -234,11 +233,7 @@ jobs:
with:
rust-version: stable
- name: Run cargo doc
run: |
export RUSTDOCFLAGS="-D warnings -A rustdoc::private-intra-doc-links"
cargo doc --document-private-items --no-deps --workspace
cd datafusion-cli
cargo doc --document-private-items --no-deps
run: ci/scripts/rust_docs.sh

linux-wasm-pack:
name: build with wasm-pack
Expand Down Expand Up @@ -567,18 +562,32 @@ jobs:
- name: Check datafusion
working-directory: datafusion/core
run: |
# If you encounter an error with any of the commands below
# it means some crate in your dependency tree has a higher
# MSRV (Min Supported Rust Version) than the one specified
# in the `rust-version` key of `Cargo.toml`. Check your
# dependencies or update the version in `Cargo.toml`
cargo msrv verify
# If you encounter an error with any of the commands below it means
# your code or some crate in the dependency tree has a higher MSRV
# (Min Supported Rust Version) than the one specified in the
# `rust-version` key of `Cargo.toml`.
#
# To reproduce:
# 1. Install the version of Rust that is failing. Example:
# rustup install 1.76.0
# 2. Run the command that failed with that version. Example:
# cargo +1.76.0 check -p datafusion
#
# To resolve, either:
# 1. Change your code to use older Rust features,
# 2. Revert dependency update
# 3. Update the MSRV version in `Cargo.toml`
#
# Please see the DataFusion Rust Version Compatibility Policy before
# updating Cargo.toml. You may have to update the code instead.
# https://github.com/apache/datafusion/blob/main/README.md#rust-version-compatibility-policy
cargo msrv --output-format json --log-target stdout verify
- name: Check datafusion-substrait
working-directory: datafusion/substrait
run: cargo msrv verify
run: cargo msrv --output-format json --log-target stdout verify
- name: Check datafusion-proto
working-directory: datafusion/proto
run: cargo msrv verify
run: cargo msrv --output-format json --log-target stdout verify
- name: Check datafusion-cli
working-directory: datafusion-cli
run: cargo msrv verify
run: cargo msrv --output-format json --log-target stdout verify
46 changes: 1 addition & 45 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -16,45 +16,11 @@
# under the License.

apache-rat-*.jar
arrow-src.tar
arrow-src.tar.gz

# Compiled source
*.a
*.dll
*.o
*.py[ocd]
*.so
*.so.*
*.bundle
*.dylib
.build_cache_dir
dependency-reduced-pom.xml
MANIFEST
compile_commands.json
build.ninja

# Generated Visual Studio files
*.vcxproj
*.vcxproj.*
*.sln
*.iml

# Linux perf sample data
perf.data
perf.data.old

cpp/.idea/
.clangd/
cpp/.clangd/
cpp/apidoc/xml/
docs/example.gz
docs/example1.dat
docs/example3.dat
python/.eggs/
python/doc/
# Egg metadata
*.egg-info

.vscode
.idea/
Expand All @@ -66,16 +32,9 @@ docker_cache
.*.swp
.*.swo

site/

# R files
**/.Rproj.user
**/*.Rcheck/
**/.Rhistory
.Rproj.user
venv/*

# macOS
cpp/Brewfile.lock.json
.DS_Store

# docker volumes used for caching
Expand All @@ -90,9 +49,6 @@ rusty-tags.vi
.history
.flatbuffers/

.vscode
venv/*

# apache release artifacts
dev/dist

Expand Down
Loading

0 comments on commit 7005b21

Please sign in to comment.