Skip to content

Commit a55e8a5

Browse files
AdamGSAdamGS
committed
Maybe this can actually run?
Signed-off-by: Adam Gutglick <[email protected]>
1 parent c73834a commit a55e8a5

File tree

14 files changed

+340
-135
lines changed

14 files changed

+340
-135
lines changed

‎.github/workflows/bench-pr.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ jobs:
9090
env:
9191
RUST_BACKTRACE: full
9292
run: |
93-
target/release_debug/${{ matrix.benchmark.id }} -d gh-json -o ${{ matrix.benchmark.id }}.json
93+
target/release_debug/${{ matrix.benchmark.id }} -d gh-json
9494
9595
- name: Setup AWS CLI
9696
if: github.event.pull_request.head.repo.fork == false
@@ -124,7 +124,7 @@ jobs:
124124
125125
echo '# Benchmarks: ${{ matrix.benchmark.name }}' > comment.md
126126
echo '' >> comment.md
127-
uv run --no-project scripts/compare-benchmark-jsons.py base.json ${{ matrix.benchmark.id }}.json "${{ matrix.benchmark.name }}" \
127+
uv run --no-project scripts/compare-benchmark-jsons.py base.json target/vortex-bench/${{ matrix.benchmark.id }}/results.json "${{ matrix.benchmark.name }}" \
128128
>> comment.md
129129
130130
- name: Comment PR

‎.github/workflows/bench.yml‎

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ jobs:
8585
env:
8686
RUST_BACKTRACE: full
8787
run: |
88-
target/release_debug/${{ matrix.benchmark.id }} -d gh-json -o ${{ matrix.benchmark.id }}.json --formats parquet,lance,vortex
88+
target/release_debug/${{ matrix.benchmark.id }} -d gh-json --formats parquet,lance,vortex
8989
9090
- name: Setup AWS CLI
9191
uses: aws-actions/configure-aws-credentials@v5
@@ -96,7 +96,7 @@ jobs:
9696
- name: Upload Benchmark Results
9797
shell: bash
9898
run: |
99-
bash scripts/cat-s3.sh vortex-benchmark-results-database data.json.gz ${{ matrix.benchmark.id }}.json
99+
bash scripts/cat-s3.sh vortex-benchmark-results-database data.json.gz target/vortex-bench/${{ matrix.benchmark.id }}/results.json
100100
sql:
101101
uses: ./.github/workflows/sql-benchmarks.yml
102102
secrets: inherit
@@ -109,15 +109,15 @@ jobs:
109109
"subcommand": "clickbench",
110110
"name": "Clickbench on NVME",
111111
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,datafusion:lance,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact,duckdb:duckdb",
112-
"build_args": "--features lance"
112+
"build_lance": true
113113
},
114114
{
115115
"id": "tpch-nvme",
116116
"subcommand": "tpch",
117117
"name": "TPC-H SF=1 on NVME",
118118
"targets": "datafusion:arrow,datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,datafusion:lance,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact,duckdb:duckdb",
119-
"scale_factor": "--scale-factor 1.0",
120-
"build_args": "--features lance"
119+
"scale_factor": "1.0",
120+
"build_lance": true
121121
},
122122
{
123123
"id": "tpch-s3",
@@ -126,16 +126,16 @@ jobs:
126126
"local_dir": "vortex-bench/data/tpch/1.0",
127127
"remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/${{github.run_id}}/tpch/1.0/",
128128
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,datafusion:lance,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
129-
"scale_factor": "--scale-factor 1.0",
130-
"build_args": "--features lance"
129+
"scale_factor": "1.0",
130+
"build_lance": true
131131
},
132132
{
133133
"id": "tpch-nvme-10",
134134
"subcommand": "tpch",
135135
"name": "TPC-H SF=10 on NVME",
136136
"targets": "datafusion:arrow,datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,datafusion:lance,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact,duckdb:duckdb",
137-
"scale_factor": "--scale-factor 10.0",
138-
"build_args": "--features lance"
137+
"scale_factor": "10.0",
138+
"build_lance": true
139139
},
140140
{
141141
"id": "tpch-s3-10",
@@ -144,54 +144,50 @@ jobs:
144144
"local_dir": "vortex-bench/data/tpch/10.0",
145145
"remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/${{github.run_id}}/tpch/10.0/",
146146
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,datafusion:lance,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
147-
"scale_factor": "--scale-factor 10.0",
148-
"build_args": "--features lance"
147+
"scale_factor": "10.0",
148+
"build_lance": true
149149
},
150150
{
151151
"id": "tpcds-nvme",
152152
"subcommand": "tpcds",
153153
"name": "TPC-DS SF=1 on NVME",
154154
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact,duckdb:duckdb",
155-
"scale_factor": "--scale-factor 1.0"
155+
"scale_factor": "1.0"
156156
},
157157
{
158158
"id": "statpopgen",
159159
"subcommand": "statpopgen",
160160
"name": "Statistical and Population Genetics",
161161
"local_dir": "vortex-bench/data/statpopgen",
162162
"targets": "duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
163-
"scale_factor": "--scale-factor 100"
163+
"scale_factor": "100"
164164
},
165165
{
166166
"id": "fineweb",
167167
"subcommand": "fineweb",
168168
"name": "FineWeb NVMe",
169-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
170-
"scale_factor": "--scale-factor 100"
169+
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact"
171170
},
172171
{
173172
"id": "fineweb-s3",
174173
"subcommand": "fineweb",
175174
"name": "FineWeb S3",
176175
"local_dir": "vortex-bench/data/fineweb",
177176
"remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/${{github.run_id}}/fineweb/",
178-
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact",
179-
"scale_factor": "--scale-factor 100"
177+
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact"
180178
},
181179
{
182180
"id": "gharchive-nvme",
183181
"subcommand": "gharchive",
184182
"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"
183+
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact"
187184
},
188185
{
189186
"id": "gharchive-s3",
190187
"subcommand": "gharchive",
191188
"name": "GitHub Archive (S3)",
192189
"local_dir": "vortex-bench/data/gharchive",
193190
"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-
},
191+
"targets": "datafusion:parquet,datafusion:vortex,datafusion:vortex-compact,duckdb:parquet,duckdb:vortex,duckdb:vortex-compact"
192+
}
197193
]

0 commit comments

Comments
 (0)