Skip to content

Commit bae285a

Browse files
committed
Merge remote-tracking branch 'origin/develop' into ji/claude-code-issue-dedup
# Conflicts: # .github/workflows/fuzz.yml
2 parents 8ea9a9b + 6d747a6 commit bae285a

File tree

179 files changed

+2965
-2547
lines changed

Some content is hidden

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

179 files changed

+2965
-2547
lines changed

.github/workflows/ci.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -140,9 +140,9 @@ jobs:
140140
repo-token: ${{ secrets.GITHUB_TOKEN }}
141141
- name: Docs
142142
run: |
143-
RUSTDOCFLAGS="-D warnings" cargo doc --no-deps
143+
RUSTFLAGS="--cfg gpu_unstable" RUSTDOCFLAGS="-D warnings" cargo doc --no-deps
144144
# nextest doesn't support doc tests, so we run it here
145-
cargo test --doc --workspace --all-features --exclude vortex-cxx --exclude vortex-jni --exclude vortex-ffi --exclude xtask --no-fail-fast
145+
RUSTFLAGS="--cfg gpu_unstable" cargo test --doc --workspace --all-features --exclude vortex-cxx --exclude vortex-jni --exclude vortex-ffi --exclude xtask --no-fail-fast
146146
147147
build-rust:
148148
name: "Rust build (${{matrix.config.name}})"
@@ -156,7 +156,7 @@ jobs:
156156
- tag=${{ matrix.config.name }}
157157
env:
158158
# disable lints for build, they will be caught in Rust lint job.
159-
RUSTFLAGS: "-A warnings"
159+
RUSTFLAGS: "-A warnings --cfg gpu_unstable"
160160
strategy:
161161
fail-fast: false
162162
matrix:
@@ -199,6 +199,8 @@ jobs:
199199
check-min-deps:
200200
name: "Check build with minimal dependencies"
201201
timeout-minutes: 120
202+
env:
203+
RUSTFLAGS: "--cfg gpu_unstable"
202204
runs-on:
203205
- runs-on=${{ github.run_id }}
204206
- family=m7i+m7i-flex+m7a
@@ -221,6 +223,8 @@ jobs:
221223
rust-lint:
222224
name: "Rust (lint)"
223225
timeout-minutes: 120
226+
env:
227+
RUSTFLAGS: "--cfg gpu_unstable"
224228
runs-on:
225229
- runs-on=${{ github.run_id }}
226230
- family=m7i+m7i-flex+m7a
@@ -249,6 +253,8 @@ jobs:
249253
rust-lint-no-default:
250254
name: "Rust (lint, no default)"
251255
timeout-minutes: 120
256+
env:
257+
RUSTFLAGS: "--cfg gpu_unstable"
252258
runs-on:
253259
- runs-on=${{ github.run_id }}
254260
- family=m7i+m7i-flex+m7a
@@ -415,6 +421,7 @@ jobs:
415421
# Keep frame pointers for better stack traces
416422
CARGO_PROFILE_DEV_DEBUG: "true"
417423
CARGO_PROFILE_TEST_DEBUG: "true"
424+
RUSTFLAGS: "--cfg gpu_unstable"
418425
steps:
419426
- uses: runs-on/action@v2
420427
with:

.github/workflows/claude.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737

3838
- name: Run Claude Code
3939
id: claude
40-
uses: anthropics/claude-code-action@beta
40+
uses: anthropics/claude-code-action@v1
4141
with:
4242
claude_code_oauth_token: ${{ secrets.CLAUDE_CODE_OAUTH_TOKEN }}
4343

.github/workflows/docs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
steps:
5757
# Note, since we provide the job with a CloudFlare scoped API token, we run it in a separate job that doesn't
5858
# execute any repository code.
59-
- uses: actions/download-artifact@v5
59+
- uses: actions/download-artifact@v6
6060
with:
6161
name: github-pages
6262
- name: Extract Pages Artifact

.github/workflows/fuzz.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ jobs:
7878
- name: Archive crash artifacts
7979
id: upload_artifacts
8080
if: steps.check.outputs.crashes_found == 'true'
81-
uses: actions/upload-artifact@v4
81+
uses: actions/upload-artifact@v5
8282
with:
8383
name: io-fuzzing-crash-artifacts
8484
path: fuzz/artifacts
@@ -344,7 +344,7 @@ jobs:
344344
run: RUST_BACKTRACE=1 cargo +nightly fuzz run --release --debug-assertions array_ops -- -max_total_time=7200
345345
continue-on-error: true
346346
- name: Archive crash artifacts
347-
uses: actions/upload-artifact@v4
347+
uses: actions/upload-artifact@v5
348348
with:
349349
name: operations-fuzzing-crash-artifacts
350350
path: fuzz/artifacts

.github/workflows/package.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ jobs:
6666
PYO3_ENVIRONMENT_SIGNATURE: "cpython3"
6767

6868
- name: Upload wheels
69-
uses: actions/upload-artifact@v4
69+
uses: actions/upload-artifact@v5
7070
with:
7171
name: "wheels-${{ matrix.target.target }}.zip"
7272
path: dist/
@@ -86,7 +86,7 @@ jobs:
8686
with:
8787
repo-token: ${{ secrets.GITHUB_TOKEN }}
8888
- run: cargo build --release --package vortex-jni
89-
- uses: actions/upload-artifact@v4
89+
- uses: actions/upload-artifact@v5
9090
with:
9191
name: "libvortex_jni_aarch64-apple-darwin.zip"
9292
path: "target/release/libvortex_jni.dylib"
@@ -127,7 +127,7 @@ jobs:
127127
targets: ${{ matrix.target.target }}
128128
repo-token: ${{ secrets.GITHUB_TOKEN }}
129129
- run: cargo build --release --package vortex-jni
130-
- uses: actions/upload-artifact@v4
130+
- uses: actions/upload-artifact@v5
131131
with:
132132
name: "libvortex_jni_${{ matrix.target.target }}.zip"
133133
path: "target/release/libvortex_jni.so"

.github/workflows/publish.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -34,14 +34,7 @@ jobs:
3434
3535
- name: Release
3636
run: |
37-
cargo +nightly publish -Zpublish-timeout --no-verify --allow-dirty --workspace \
38-
--exclude bench-vortex \
39-
--exclude vortex-python \
40-
--exclude vortex-duckdb \
41-
--exclude vortex-ffi \
42-
--exclude vortex-fuzz \
43-
--exclude vortex-jni \
44-
--exclude xtask
37+
cargo +nightly publish -Zpublish-timeout --no-verify --allow-dirty --workspace
4538
env:
4639
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
4740
CARGO_REGISTRY_TOKEN: ${{ secrets.CARGO_REGISTRY_TOKEN }}
@@ -56,7 +49,7 @@ jobs:
5649
name: push-to-pypi
5750
url: https://pypi.org/p/vortex-data
5851
steps:
59-
- uses: actions/download-artifact@v5
52+
- uses: actions/download-artifact@v6
6053
with:
6154
pattern: wheels-*.zip
6255
# https://github.com/actions/download-artifact?tab=readme-ov-file#download-all-artifacts
@@ -89,7 +82,7 @@ jobs:
8982
distribution: "corretto"
9083
java-version: "17"
9184
- uses: gradle/actions/setup-gradle@v5
92-
- uses: actions/download-artifact@v5
85+
- uses: actions/download-artifact@v6
9386
with:
9487
pattern: libvortex_jni_*.zip
9588
- name: Copy native JNI libs

Cargo.lock

Lines changed: 1 addition & 32 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ vortex-compute = { version = "0.1.0", path = "./vortex-compute", default-feature
226226
vortex-datafusion = { version = "0.1.0", path = "./vortex-datafusion", default-features = false }
227227
vortex-datetime-parts = { version = "0.1.0", path = "./encodings/datetime-parts", default-features = false }
228228
vortex-decimal-byte-parts = { version = "0.1.0", path = "encodings/decimal-byte-parts", default-features = false }
229-
vortex-dict = { version = "0.1.0", path = "./encodings/dict", default-features = false }
230229
vortex-dtype = { version = "0.1.0", path = "./vortex-dtype", default-features = false }
231230
vortex-error = { version = "0.1.0", path = "./vortex-error", default-features = false }
232231
vortex-fastlanes = { version = "0.1.0", path = "./encodings/fastlanes", default-features = false }
@@ -282,6 +281,7 @@ unexpected_cfgs = { level = "deny", check-cfg = [
282281
"cfg(codspeed)",
283282
"cfg(disable_loom)",
284283
"cfg(vortex_nightly)",
284+
"cfg(gpu_unstable)",
285285
] }
286286
warnings = "warn"
287287

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
[![Maven - Version](https://img.shields.io/maven-central/v/dev.vortex/vortex-spark)](https://central.sonatype.com/artifact/dev.vortex/vortex-spark)
1010
[![codecov](https://codecov.io/github/vortex-data/vortex/graph/badge.svg)](https://codecov.io/github/vortex-data/vortex)
1111

12-
📚 [Documentation](https://docs.vortex.dev/) | 📊 [Performance Benchmarks](https://bench.vortex.dev)
12+
🫶 [Join the community on Slack!](https://vortex.dev/slack) | 📚 [Documentation](https://docs.vortex.dev/) | 📊 [Performance Benchmarks](https://bench.vortex.dev)
1313

1414
## Overview
1515

REUSE.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ SPDX-FileCopyrightText = "Copyright the Vortex contributors"
3131
SPDX-License-Identifier = "CC-BY-4.0"
3232

3333
[[annotations]]
34-
path = ["**/.gitignore", ".gitmodules", ".python-version", "**/*.lock", "**/*.lockfile", "**/*.toml", "renovate.json", ".idea/**", ".github/**", "codecov.yml"]
34+
path = ["**/.gitignore", ".gitmodules", ".python-version", "**/*.lock", "**/*.lockfile", "**/*.toml", "renovate.json", ".idea/**", ".github/**", "codecov.yml", "java/gradle/wrapper/gradle-wrapper.properties"]
3535
precedence = "override"
3636
SPDX-FileCopyrightText = "Copyright the Vortex contributors"
3737
SPDX-License-Identifier = "Apache-2.0"

0 commit comments

Comments
 (0)