Skip to content

Commit

Permalink
Merge branch 'master' into feature/interval-cmp
Browse files Browse the repository at this point in the history
  • Loading branch information
berkaysynnada committed Nov 28, 2023
2 parents 76fe5ec + 34a816d commit 7855304
Show file tree
Hide file tree
Showing 410 changed files with 24,486 additions and 17,800 deletions.
19 changes: 12 additions & 7 deletions .github/workflows/arrow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ on:
- arrow-integration-test/**
- arrow-ipc/**
- arrow-json/**
- arrow-avro/**
- arrow-ord/**
- arrow-row/**
- arrow-schema/**
Expand All @@ -55,7 +56,7 @@ jobs:
container:
image: amd64/rust
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup Rust toolchain
Expand All @@ -78,6 +79,8 @@ jobs:
run: cargo test -p arrow-csv --all-features
- name: Test arrow-json with all features
run: cargo test -p arrow-json --all-features
- name: Test arrow-avro with all features
run: cargo test -p arrow-avro --all-features
- name: Test arrow-string with all features
run: cargo test -p arrow-string --all-features
- name: Test arrow-ord with all features
Expand All @@ -91,7 +94,7 @@ jobs:
- name: Test arrow with default features
run: cargo test -p arrow
- name: Test arrow with all features apart from simd
run: cargo test -p arrow --features=force_validate,prettyprint,ipc_compression,ffi,dyn_cmp_dict,chrono-tz
run: cargo test -p arrow --features=force_validate,prettyprint,ipc_compression,ffi,chrono-tz
- name: Run examples
run: |
# Test arrow examples
Expand All @@ -109,7 +112,7 @@ jobs:
container:
image: amd64/rust
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup Rust toolchain
Expand All @@ -136,7 +139,7 @@ jobs:
container:
image: amd64/rust
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup Rust toolchain
Expand All @@ -160,7 +163,7 @@ jobs:
container:
image: amd64/rust
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup Rust toolchain
Expand All @@ -179,7 +182,7 @@ jobs:
container:
image: amd64/rust
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder
- name: Setup Clippy
Expand All @@ -202,6 +205,8 @@ jobs:
run: cargo clippy -p arrow-csv --all-targets --all-features -- -D warnings
- name: Clippy arrow-json with all features
run: cargo clippy -p arrow-json --all-targets --all-features -- -D warnings
- name: Clippy arrow-avro with all features
run: cargo clippy -p arrow-avro --all-targets --all-features -- -D warnings
- name: Clippy arrow-string with all features
run: cargo clippy -p arrow-string --all-targets --all-features -- -D warnings
- name: Clippy arrow-ord with all features
Expand All @@ -211,7 +216,7 @@ jobs:
- name: Clippy arrow-row with all features
run: cargo clippy -p arrow-row --all-targets --all-features -- -D warnings
- name: Clippy arrow with all features except SIMD
run: cargo clippy -p arrow --features=prettyprint,csv,ipc,test_utils,ffi,ipc_compression,dyn_cmp_dict,chrono-tz --all-targets -- -D warnings
run: cargo clippy -p arrow --features=prettyprint,csv,ipc,test_utils,ffi,ipc_compression,chrono-tz --all-targets -- -D warnings
- name: Clippy arrow-integration-test with all features
run: cargo clippy -p arrow-integration-test --all-targets --all-features -- -D warnings
- name: Clippy arrow-integration-testing with all features
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/arrow_flight.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
container:
image: amd64/rust
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup Rust toolchain
Expand All @@ -68,7 +68,7 @@ jobs:
container:
image: amd64/rust
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder
- name: Run gen
Expand All @@ -82,7 +82,7 @@ jobs:
container:
image: amd64/rust
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder
- name: Setup Clippy
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/coverage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
# otherwise we get this error:
# Failed to run tests: ASLR disable failed: EPERM: Operation not permitted
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup Rust toolchain
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ jobs:
name: Release Audit Tool (RAT)
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Python
uses: actions/setup-python@v4
with:
Expand All @@ -50,8 +50,8 @@ jobs:
name: Markdown format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/setup-node@v3
- uses: actions/checkout@v4
- uses: actions/setup-node@v4
with:
node-version: "14"
- name: Prettier check
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/dev_pr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ jobs:
contents: read
pull-requests: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Assign GitHub labels
if: |
Expand Down
1 change: 1 addition & 0 deletions .github/workflows/dev_pr/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ arrow:
- arrow-integration-testing/**/*
- arrow-ipc/**/*
- arrow-json/**/*
- arrow-avro/**/*
- arrow-ord/**/*
- arrow-row/**/*
- arrow-schema/**/*
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
env:
RUSTDOCFLAGS: "-Dwarnings --enable-index-page -Zunstable-options"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Install python dev
Expand Down Expand Up @@ -77,7 +77,7 @@ jobs:
contents: write
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Download crate docs
uses: actions/download-artifact@v3
with:
Expand Down
57 changes: 20 additions & 37 deletions .github/workflows/integration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ on:
- arrow-integration-testing/**
- arrow-ipc/**
- arrow-json/**
- arrow-avro/**
- arrow-ord/**
- arrow-pyarrow-integration-testing/**
- arrow-schema/**
Expand All @@ -56,7 +57,15 @@ jobs:
env:
ARROW_USE_CCACHE: OFF
ARROW_CPP_EXE_PATH: /build/cpp/debug
ARROW_RUST_EXE_PATH: /build/rust/debug
BUILD_DOCS_CPP: OFF
ARROW_INTEGRATION_CPP: ON
ARROW_INTEGRATION_CSHARP: ON
ARROW_INTEGRATION_GO: ON
ARROW_INTEGRATION_JAVA: ON
ARROW_INTEGRATION_JS: ON
# https://github.com/apache/arrow/pull/38403/files#r1371281630
ARCHERY_INTEGRATION_WITH_RUST: ON
# These are necessary because the github runner overrides $HOME
# https://github.com/actions/runner/issues/863
RUSTUP_HOME: /root/.rustup
Expand All @@ -76,48 +85,20 @@ jobs:
- name: Check cmake
run: which cmake
- name: Checkout Arrow
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: apache/arrow
submodules: true
fetch-depth: 0
- name: Checkout Arrow Rust
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: rust
fetch-depth: 0
- name: Make build directory
run: mkdir /build
- name: Build Rust
run: conda run --no-capture-output ci/scripts/rust_build.sh $PWD /build
- name: Build C++
run: conda run --no-capture-output ci/scripts/cpp_build.sh $PWD /build
- name: Build C#
run: conda run --no-capture-output ci/scripts/csharp_build.sh $PWD /build
- name: Build Go
run: conda run --no-capture-output ci/scripts/go_build.sh $PWD
- name: Build Java
run: conda run --no-capture-output ci/scripts/java_build.sh $PWD /build
- name: Build JS
run: conda run --no-capture-output ci/scripts/js_build.sh $PWD /build
- name: Install archery
run: conda run --no-capture-output pip install -e dev/archery
- name: Run integration tests
run: |
conda run --no-capture-output archery integration \
--run-flight \
--with-cpp=1 \
--with-csharp=1 \
--with-java=1 \
--with-js=1 \
--with-go=1 \
--with-rust=1 \
--gold-dirs=testing/data/arrow-ipc-stream/integration/0.14.1 \
--gold-dirs=testing/data/arrow-ipc-stream/integration/0.17.1 \
--gold-dirs=testing/data/arrow-ipc-stream/integration/1.0.0-bigendian \
--gold-dirs=testing/data/arrow-ipc-stream/integration/1.0.0-littleendian \
--gold-dirs=testing/data/arrow-ipc-stream/integration/2.0.0-compression \
--gold-dirs=testing/data/arrow-ipc-stream/integration/4.0.0-shareddict
- name: Build
run: conda run --no-capture-output ci/scripts/integration_arrow_build.sh $PWD /build
- name: Run
run: conda run --no-capture-output ci/scripts/integration_arrow.sh $PWD /build

# test FFI against the C-Data interface exposed by pyarrow
pyarrow-integration-test:
Expand All @@ -126,8 +107,10 @@ jobs:
strategy:
matrix:
rust: [ stable ]
# PyArrow 13 was the last version prior to introduction to Arrow PyCapsules
pyarrow: [ "13", "14" ]
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup Rust toolchain
Expand All @@ -148,14 +131,14 @@ jobs:
key: ${{ runner.os }}-${{ matrix.arch }}-target-maturin-cache-${{ matrix.rust }}-
- uses: actions/setup-python@v4
with:
python-version: '3.7'
python-version: '3.8'
- name: Upgrade pip and setuptools
run: pip install --upgrade pip setuptools wheel virtualenv
- name: Create virtualenv and install dependencies
run: |
virtualenv venv
source venv/bin/activate
pip install maturin toml pytest pytz pyarrow>=5.0
pip install maturin toml pytest pytz pyarrow==${{ matrix.pyarrow }}
- name: Run Rust tests
run: |
source venv/bin/activate
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/miri.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ on:
- arrow-data/**
- arrow-ipc/**
- arrow-json/**
- arrow-avro/**
- arrow-schema/**
- arrow-select/**
- arrow-string/**
Expand All @@ -46,7 +47,7 @@ jobs:
name: MIRI
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup Rust toolchain
Expand Down
12 changes: 7 additions & 5 deletions .github/workflows/object_store.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ jobs:
run:
working-directory: object_store
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup Rust toolchain
uses: ./.github/actions/setup-builder
- name: Setup Clippy
Expand All @@ -60,6 +60,8 @@ jobs:
run: cargo clippy --features gcp -- -D warnings
- name: Run clippy with azure feature
run: cargo clippy --features azure -- -D warnings
- name: Run clippy with http feature
run: cargo clippy --features http -- -D warnings
- name: Run clippy with all features
run: cargo clippy --all-features -- -D warnings
- name: Run clippy with all features and all targets
Expand All @@ -79,7 +81,7 @@ jobs:
env:
RUSTDOCFLAGS: "-Dwarnings"
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Run cargo doc
run: cargo doc --document-private-items --no-deps --workspace --all-features

Expand Down Expand Up @@ -115,7 +117,7 @@ jobs:
GOOGLE_SERVICE_ACCOUNT: "/tmp/gcs.json"

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Configure Fake GCS Server (GCP emulation)
# Custom image - see fsouza/fake-gcs-server#1164
Expand All @@ -124,7 +126,7 @@ jobs:
# Give the container a moment to start up prior to configuring it
sleep 1
curl -v -X POST --data-binary '{"name":"test-bucket"}' -H "Content-Type: application/json" "http://localhost:4443/storage/v1/b"
echo '{"gcs_base_url": "http://localhost:4443", "disable_oauth": true, "client_email": "", "private_key": ""}' > "$GOOGLE_SERVICE_ACCOUNT"
echo '{"gcs_base_url": "http://localhost:4443", "disable_oauth": true, "client_email": "", "private_key": "", "private_key_id": ""}' > "$GOOGLE_SERVICE_ACCOUNT"
- name: Setup WebDav
run: docker run -d -p 8080:80 rclone/rclone serve webdav /data --addr :80
Expand Down Expand Up @@ -160,7 +162,7 @@ jobs:
run:
working-directory: object_store
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: true
- name: Setup Rust toolchain
Expand Down
Loading

0 comments on commit 7855304

Please sign in to comment.