Skip to content

Commit 4e41004

Browse files
authored
Merge branch 'develop' into bp/vortex-tui
2 parents d02991f + be9c708 commit 4e41004

File tree

238 files changed

+9650
-2366
lines changed

Some content is hidden

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

238 files changed

+9650
-2366
lines changed

.github/workflows/bench.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -178,20 +178,4 @@ jobs:
178178
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
179179
"scale_factor": "--scale-factor 100"
180180
},
181-
{
182-
"id": "gharchive-nvme",
183-
"subcommand": "gharchive",
184-
"name": "GitHub Archive (NVMe)",
185-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
186-
"scale_factor": "--scale-factor 100"
187-
},
188-
{
189-
"id": "gharchive-s3",
190-
"subcommand": "gharchive",
191-
"name": "GitHub Archive (S3)",
192-
"local_dir": "bench-vortex/data/gharchive",
193-
"remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/${{github.run_id}}/gharchive/",
194-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
195-
"scale_factor": "--scale-factor 100"
196-
},
197181
]

.github/workflows/ci.yml

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -493,12 +493,7 @@ jobs:
493493
matrix:
494494
include:
495495
- os: windows-x64
496-
runner:
497-
- runs-on=${{ github.run_id }}
498-
- family=m7i
499-
- cpu=8
500-
- image=windows22-full-x64
501-
- tag=rust-test-windows
496+
runner: runs-on=${{ github.run_id }}/pool=windows-x64
502497
- os: linux-arm64
503498
runner:
504499
- runs-on=${{ github.run_id }}
@@ -662,13 +657,10 @@ jobs:
662657
- uses: ./.github/actions/setup-rust
663658
with:
664659
repo-token: ${{ secrets.GITHUB_TOKEN }}
665-
toolchain: nightly-2025-06-26
666660
targets: "wasm32-wasip1"
667-
components: "rust-src"
668661
- name: Setup Wasmer
669662
uses: wasmerio/[email protected]
670-
# there is a compiler bug in nightly (but not in nightly-2025-06-26)
671-
- run: cargo +nightly-2025-06-26 -Zbuild-std=panic_abort,std build --target wasm32-wasip1
663+
- run: cargo build --target wasm32-wasip1
672664
working-directory: ./wasm-test
673665
- run: wasmer run ./target/wasm32-wasip1/debug/wasm-test.wasm
674666
working-directory: ./wasm-test

.github/workflows/fuzz.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ jobs:
5656
- name: Run fuzzing target
5757
id: fuzz
5858
run: |
59-
RUSTFLAGS="--cfg vortex_nightly" RUST_BACKTRACE=1 cargo +nightly fuzz run --release --debug-assertions file_io -- -max_total_time=7200 2>&1 | tee fuzz_output.log
59+
RUSTFLAGS="--cfg vortex_nightly" RUST_BACKTRACE=1 cargo +nightly fuzz run --release --debug-assertions file_io -- -max_total_time=7200 -rss_limit_mb=0 2>&1 | tee fuzz_output.log
6060
continue-on-error: true
6161
- name: Check for crashes
6262
id: check
@@ -189,7 +189,7 @@ jobs:
189189
- name: Run fuzzing target
190190
id: fuzz
191191
run: |
192-
RUSTFLAGS="--cfg vortex_nightly" RUST_BACKTRACE=1 cargo +nightly fuzz run --release --debug-assertions array_ops -- -max_total_time=7200 2>&1 | tee fuzz_output.log
192+
RUSTFLAGS="--cfg vortex_nightly" RUST_BACKTRACE=1 cargo +nightly fuzz run --release --debug-assertions array_ops -- -max_total_time=7200 -rss_limit_mb=0 2>&1 | tee fuzz_output.log
193193
continue-on-error: true
194194
- name: Check for crashes
195195
id: check

.github/workflows/fuzzer-fix-automation.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ jobs:
187187
echo "Attempting to reproduce crash with fuzzer (debug mode)..."
188188
189189
# Run fuzzer with crash file (debug mode, no sanitizer, full backtrace)
190-
RUSTFLAGS="--cfg vortex_nightly" RUST_BACKTRACE=full timeout 30s cargo +nightly fuzz run --dev --sanitizer=none "${{ steps.extract.outputs.target }}" "${{ steps.download.outputs.crash_file_path }}" -- -runs=1 2>&1 | tee crash_reproduction.log
190+
RUSTFLAGS="--cfg vortex_nightly" RUST_BACKTRACE=full timeout 30s cargo +nightly fuzz run --dev --sanitizer=none "${{ steps.extract.outputs.target }}" "${{ steps.download.outputs.crash_file_path }}" -- -runs=1 -rss_limit_mb=0 2>&1 | tee crash_reproduction.log
191191
192192
FUZZ_EXIT_CODE=${PIPESTATUS[0]}
193193
@@ -216,7 +216,7 @@ jobs:
216216
217217
I ran:
218218
\`\`\`bash
219-
cargo +nightly fuzz run --sanitizer=none ${{ steps.extract.outputs.target }} ${{ steps.download.outputs.crash_file_path }} -- -runs=1
219+
cargo +nightly fuzz run --sanitizer=none ${{ steps.extract.outputs.target }} ${{ steps.download.outputs.crash_file_path }} -- -runs=1 -rss_limit_mb=0
220220
\`\`\`
221221
222222
The fuzzer exited with code 0 (success).
@@ -275,7 +275,7 @@ jobs:
275275
- This ensures your work is visible and reviewable even if you hit the turn limit
276276
- Keep fixes minimal - only fix the specific bug
277277
- Follow CLAUDE.md code style guidelines
278-
- **Use `--dev` flag** for faster builds: `cargo +nightly fuzz run --dev --sanitizer=none`
278+
- **Use `--dev` flag** for faster builds: `cargo +nightly fuzz run --dev --sanitizer=none <target> <crash_file> -- -rss_limit_mb=0`
279279
280280
## Fixability Guidelines
281281

.github/workflows/report-fuzz-crash.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ jobs:
155155
### Reproduction
156156
157157
```bash
158-
cargo +nightly fuzz run --sanitizer=none $FUZZ_TARGET $FUZZ_TARGET/$CRASH_FILE
158+
cargo +nightly fuzz run -D --sanitizer=none $FUZZ_TARGET $FUZZ_TARGET/$CRASH_FILE -- -rss_limit_mb=0
159159
```
160160
161161
---
@@ -219,12 +219,12 @@ jobs:
219219
2. Reproduce locally:
220220
```bash
221221
# The artifact contains $FUZZ_TARGET/$CRASH_FILE
222-
cargo +nightly fuzz run --sanitizer=none $FUZZ_TARGET $FUZZ_TARGET/$CRASH_FILE
222+
cargo +nightly fuzz run -D --sanitizer=none $FUZZ_TARGET $FUZZ_TARGET/$CRASH_FILE -- -rss_limit_mb=0
223223
```
224224
225225
3. Get full backtrace:
226226
```bash
227-
RUST_BACKTRACE=full cargo +nightly fuzz run --sanitizer=none $FUZZ_TARGET $FUZZ_TARGET/$CRASH_FILE
227+
RUST_BACKTRACE=full cargo +nightly fuzz run -D --sanitizer=none $FUZZ_TARGET $FUZZ_TARGET/$CRASH_FILE -- -rss_limit_mb=0
228228
```
229229
230230
---

.github/workflows/sql-benchmarks.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -85,22 +85,6 @@ on:
8585
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
8686
"scale_factor": "--scale-factor 100"
8787
},
88-
{
89-
"id": "gharchive-nvme",
90-
"subcommand": "gharchive",
91-
"name": "GitHub Archive (NVMe)",
92-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
93-
"scale_factor": "--scale-factor 100"
94-
},
95-
{
96-
"id": "gharchive-s3",
97-
"subcommand": "gharchive",
98-
"name": "GitHub Archive (S3)",
99-
"local_dir": "bench-vortex/data/gharchive",
100-
"remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/${{github.run_id}}/gharchive/",
101-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
102-
"scale_factor": "--scale-factor 100"
103-
},
10488
]
10589
10690
jobs:

Cargo.lock

Lines changed: 36 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

bench-vortex/src/bin/compress.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ fn compress(
109109
.map(|f| Target::new(Engine::default(), *f))
110110
.collect_vec();
111111

112-
let structlistofints = vec![
112+
let structlistofints = [
113113
StructListOfInts::new(100, 1000, 1),
114114
StructListOfInts::new(1000, 1000, 1),
115115
StructListOfInts::new(10000, 1000, 1),

0 commit comments

Comments
 (0)