@@ -137,10 +137,10 @@ jobs:
137137 strategy :
138138 matrix :
139139 include :
140- - { dataset: hits, size: Small, database: clickbench , timeout: 10 }
141- - { dataset: hits, size: Large, database: clickbench , timeout: 10 }
142- - { dataset: tpch , size: Small, database: clickbench , timeout: 20 }
143- - { dataset: tpch , size: Large, database: clickbench , timeout: 20 }
140+ - { dataset: hits, size: Small, database: hits , timeout: 10 }
141+ - { dataset: hits, size: Large, database: hits , timeout: 10 }
142+ - { dataset: tpch100 , size: Small, database: tpch_100 , timeout: 20 }
143+ - { dataset: tpch100 , size: Large, database: tpch_100 , timeout: 20 }
144144 - { dataset: tpch1000, size: Large, database: tpch_1000, timeout: 60 }
145145 fail-fast : true
146146 max-parallel : 1
@@ -242,9 +242,9 @@ jobs:
242242 strategy :
243243 matrix :
244244 dataset :
245- - " tpch"
246- - " hits"
247245 - " load"
246+ - " hits"
247+ - " tpch100"
248248 - " tpch1000"
249249 # - "internal"
250250 steps :
@@ -267,10 +267,11 @@ jobs:
267267 mkdir -p results/${dataset}/
268268 mv $result results/${dataset}/$(basename $result)
269269 done
270+ mkdir -p ndjsons/
270271 for ndjson in results/*.ndjson; do
271272 dataset=$(echo $ndjson | sed -E 's/.*result-(\w+)-.*\.ndjson/\1/')
272- mkdir -p results /${dataset}/
273- mv $ndjson results /${dataset}/$(basename $ndjson)
273+ mkdir -p ndjsons /${dataset}/
274+ mv $ndjson ndjsons /${dataset}/$(basename $ndjson)
274275 done
275276 - name : Generate report and upload to R2
276277 working-directory : benchmark/clickbench
@@ -305,7 +306,7 @@ jobs:
305306 MONTH=$(date -u +%Y-%m)
306307 ARCHIVE_PREFIX="s3://benchmark/results/${DATASET}/${MONTH}/"
307308 IMPORT_PREFIX="s3://benchmark/results/import/"
308- for file in ./results /${DATASET}/*.ndjson; do
309+ for file in ./ndjsons /${DATASET}/*.ndjson; do
309310 aws s3 cp $file "${ARCHIVE_PREFIX}$(basename $file)" --no-progress --checksum-algorithm=CRC32
310311 aws s3 cp $file "${IMPORT_PREFIX}$(basename $file)" --no-progress --checksum-algorithm=CRC32
311312 done
0 commit comments