Skip to content

Commit

Permalink
Merge branch 'main' into support-list-in-row-encoder
Browse files Browse the repository at this point in the history
  • Loading branch information
mapleFU committed Sep 6, 2024
2 parents 7ed5df4 + ab0a40e commit 9aaff83
Show file tree
Hide file tree
Showing 273 changed files with 7,479 additions and 4,984 deletions.
1 change: 1 addition & 0 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,4 @@ BasedOnStyle: Google
ColumnLimit: 90
DerivePointerAlignment: false
IncludeBlocks: Preserve
IndentPPDirectives: AfterHash
21 changes: 2 additions & 19 deletions .dockerignore
Original file line number Diff line number Diff line change
Expand Up @@ -27,11 +27,11 @@
# include explicitly
!ci/**
!c_glib/Gemfile
!dev/archery/setup.py
!dev/release/setup-*.sh
!docs/requirements*.txt
!go/go.mod
!go/go.sum
!python/requirements*.txt
!python/manylinux1/**
!r/DESCRIPTION
!ruby/Gemfile
!ruby/red-arrow/Gemfile
Expand All @@ -46,20 +46,3 @@
!ruby/red-parquet/Gemfile
!ruby/red-parquet/lib/parquet/version.rb
!ruby/red-parquet/red-parquet.gemspec
!ruby/red-plasma/Gemfile
!ruby/red-plasma/lib/plasma/version.rb
!ruby/red-plasma/red-plasma.gemspec
!rust/Cargo.toml
!rust/benchmarks/Cargo.toml
!rust/arrow/Cargo.toml
!rust/arrow/benches
!rust/arrow-flight/Cargo.toml
!rust/parquet/Cargo.toml
!rust/parquet/build.rs
!rust/parquet_derive/Cargo.toml
!rust/parquet_derive_test/Cargo.toml
!rust/datafusion/Cargo.toml
!rust/datafusion/benches
!rust/integration-testing/Cargo.toml
!go/go.mod
!go/go.sum
1 change: 1 addition & 0 deletions .env
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ NUMBA=latest
NUMPY=latest
PANDAS=latest
PYTHON=3.8
PYTHON_IMAGE_TAG=3.8
R=4.4
SPARK=master
TURBODBC=latest
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/archery.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ name: Archery & Crossbow
on:
push:
paths:
- '.dockerignore'
- '.github/workflows/archery.yml'
- 'dev/archery/**'
- 'dev/tasks/**'
- 'docker-compose.yml'
pull_request:
paths:
- '.dockerignore'
- '.github/workflows/archery.yml'
- 'dev/archery/**'
- 'dev/tasks/**'
Expand Down Expand Up @@ -58,7 +60,7 @@ jobs:
shell: bash
run: git branch $ARCHERY_DEFAULT_BRANCH origin/$ARCHERY_DEFAULT_BRANCH || true
- name: Setup Python
uses: actions/setup-python@v5.1.1
uses: actions/setup-python@v5.2.0
with:
python-version: '3.9'
- name: Install pygit2 binary wheel
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/comment_bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
# fetch the tags for version number generation
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.12
- name: Install Archery and Crossbow dependencies
Expand Down
12 changes: 6 additions & 6 deletions .github/workflows/cpp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ name: C++
on:
push:
paths:
- '.dockerignore'
- '.github/workflows/cpp.yml'
- 'ci/conda_env_*'
- 'ci/docker/**'
Expand All @@ -35,6 +36,7 @@ on:
- 'testing'
pull_request:
paths:
- '.dockerignore'
- '.github/workflows/cpp.yml'
- 'ci/conda_env_*'
- 'ci/docker/**'
Expand Down Expand Up @@ -243,7 +245,7 @@ jobs:
$(brew --prefix bash)/bin/bash \
ci/scripts/install_minio.sh latest ${ARROW_HOME}
- name: Set up Python
uses: actions/setup-python@v5.1.1
uses: actions/setup-python@v5.2.0
with:
python-version: 3.12
- name: Install Google Cloud Storage Testbench
Expand Down Expand Up @@ -409,12 +411,10 @@ jobs:
ARROW_WITH_SNAPPY: ON
ARROW_WITH_ZLIB: ON
ARROW_WITH_ZSTD: ON
# Don't use preinstalled Boost by empty BOOST_ROOT and
# -DBoost_NO_BOOST_CMAKE=ON
# Don't use preinstalled Boost by empty BOOST_ROOT
BOOST_ROOT: ""
ARROW_CMAKE_ARGS: >-
-DARROW_PACKAGE_PREFIX=/${{ matrix.msystem_lower}}
-DBoost_NO_BOOST_CMAKE=ON
-DCMAKE_FIND_PACKAGE_PREFER_CONFIG=ON
# We can't use unity build because we don't have enough memory on
# GitHub Actions.
Expand Down Expand Up @@ -464,15 +464,15 @@ jobs:
https://dl.min.io/server/minio/release/windows-amd64/archive/minio.RELEASE.2022-05-26T05-48-41Z
chmod +x /usr/local/bin/minio.exe
- name: Set up Python
uses: actions/setup-python@v5.1.1
uses: actions/setup-python@v5.2.0
id: python-install
with:
python-version: 3.9
- name: Install Google Cloud Storage Testbench
shell: msys2 {0}
env:
PIPX_BIN_DIR: /usr/local/bin
PIPX_PYTHON: ${{ steps.python-install.outputs.python-path }}
PIPX_BASE_PYTHON: ${{ steps.python-install.outputs.python-path }}
run: |
ci/scripts/install_gcs_testbench.sh default
- name: Test
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/csharp.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ jobs:
with:
dotnet-version: ${{ matrix.dotnet }}
- name: Setup Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.12
- name: Checkout Arrow
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ jobs:
with:
fetch-depth: 0
- name: Setup Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.12
- name: Install pre-commit
Expand Down Expand Up @@ -104,7 +104,7 @@ jobs:
with:
fetch-depth: 0
- name: Install Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: '3.12'
- name: Install Ruby
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
key: debian-docs-${{ hashFiles('cpp/**') }}
restore-keys: debian-docs-
- name: Setup Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.12
- name: Setup Archery
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/docs_light.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ name: Docs
on:
pull_request:
paths:
- '.dockerignore'
- 'docs/**'
- '.github/workflows/docs_light.yml'
- 'ci/docker/conda.dockerfile'
Expand Down Expand Up @@ -58,7 +59,7 @@ jobs:
key: conda-docs-${{ hashFiles('cpp/**') }}
restore-keys: conda-docs-
- name: Setup Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.12
- name: Setup Archery
Expand Down
8 changes: 5 additions & 3 deletions .github/workflows/go.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,15 @@ name: Go
on:
push:
paths:
- '.dockerignore'
- '.github/workflows/go.yml'
- 'ci/docker/*_go.dockerfile'
- 'ci/scripts/go_*'
- 'docker-compose.yml'
- 'go/**'
pull_request:
paths:
- '.dockerignore'
- '.github/workflows/go.yml'
- 'ci/docker/*_go.dockerfile'
- 'ci/docker/**'
Expand Down Expand Up @@ -207,7 +209,7 @@ jobs:
fetch-depth: 0
submodules: recursive
- name: Setup Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.8
- name: Setup Archery
Expand Down Expand Up @@ -247,7 +249,7 @@ jobs:
with:
fetch-depth: 0
- name: Setup Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.8
- name: Setup Archery
Expand Down Expand Up @@ -339,7 +341,7 @@ jobs:
github.event_name == 'push' &&
github.repository == 'apache/arrow' &&
github.ref_name == 'main'
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: '3.10'
- name: Run Benchmarks
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ name: Integration
on:
push:
paths:
- '.dockerignore'
- '.github/workflows/integration.yml'
- 'ci/**'
- 'dev/archery/**'
Expand All @@ -33,6 +34,7 @@ on:
- 'format/**'
pull_request:
paths:
- '.dockerignore'
- '.github/workflows/integration.yml'
- 'ci/**'
- 'dev/archery/**'
Expand Down Expand Up @@ -89,7 +91,7 @@ jobs:
key: conda-${{ hashFiles('cpp/**') }}
restore-keys: conda-
- name: Setup Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.8
- name: Setup Archery
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/java.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ name: Java
on:
push:
paths:
- '.dockerignore'
- '.github/workflows/java.yml'
- 'ci/docker/*java*'
- 'ci/scripts/java*.sh'
Expand All @@ -29,6 +30,7 @@ on:
- 'java/**'
pull_request:
paths:
- '.dockerignore'
- '.github/workflows/java.yml'
- 'ci/docker/*java*'
- 'ci/scripts/java*.sh'
Expand Down Expand Up @@ -76,7 +78,7 @@ jobs:
key: maven-${{ hashFiles('java/**') }}
restore-keys: maven-
- name: Setup Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.8
- name: Setup Archery
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/java_jni.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ name: Java JNI
on:
push:
paths:
- '.dockerignore'
- '.github/workflows/java_jni.yml'
- 'ci/docker/**'
- 'ci/scripts/cpp_build.sh'
Expand All @@ -29,6 +30,7 @@ on:
- 'java/**'
pull_request:
paths:
- '.dockerignore'
- '.github/workflows/java_jni.yml'
- 'ci/docker/**'
- 'ci/scripts/cpp_build.sh'
Expand Down Expand Up @@ -70,7 +72,7 @@ jobs:
key: java-jni-manylinux-2014-${{ hashFiles('cpp/**', 'java/**') }}
restore-keys: java-jni-manylinux-2014-
- name: Setup Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.8
- name: Setup Archery
Expand Down Expand Up @@ -110,7 +112,7 @@ jobs:
key: maven-${{ hashFiles('java/**') }}
restore-keys: maven-
- name: Setup Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.8
- name: Setup Archery
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/java_nightly.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ jobs:
repository: ursacomputing/crossbow
ref: main
- name: Set up Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
cache: 'pip'
python-version: 3.12
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/js.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,14 @@ name: NodeJS
on:
push:
paths:
- '.dockerignore'
- '.github/workflows/js.yml'
- 'ci/docker/*js.dockerfile'
- 'ci/scripts/js_*'
- 'js/**'
pull_request:
paths:
- '.dockerignore'
- '.github/workflows/js.yml'
- 'ci/docker/*js.dockerfile'
- 'ci/scripts/js_*'
Expand Down Expand Up @@ -54,7 +56,7 @@ jobs:
with:
fetch-depth: 0
- name: Setup Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.8
- name: Setup Archery
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_bot.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ jobs:
# fetch the tags for version number generation
fetch-depth: 0
- name: Set up Python
uses: actions/setup-python@39cd14951b08e74b54015e9e001cdefcf80e669f # v5.1.1
uses: actions/setup-python@f677139bbe7f9c59b41e40162b753c062f5d49a3 # v5.2.0
with:
python-version: 3.12
- name: Install Archery and Crossbow dependencies
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/pr_review_trigger.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: "Upload PR review Payload"
uses: actions/upload-artifact@v3
uses: actions/upload-artifact@v4.4.0
with:
path: "${{ github.event_path }}"
name: "pr_review_payload"
Loading

0 comments on commit 9aaff83

Please sign in to comment.