Skip to content

Commit 05e8630

Browse files
authored
ci: comment ignore ndjson files for benchmark (#19065)
1 parent 48a8953 commit 05e8630

File tree

2 files changed

+13
-5
lines changed

2 files changed

+13
-5
lines changed

.github/workflows/reuse.benchmark.yml

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -194,11 +194,18 @@ jobs:
194194
pattern: benchmark-*
195195
merge-multiple: true
196196
- name: Get Report Prefix
197+
working-directory: benchmark/clickbench
197198
run: |
198-
for result in benchmark/clickbench/results/*.json; do
199+
shopt -s nullglob
200+
for result in results/*.json; do
199201
dataset=$(echo $result | sed -E 's/.*result-(\w+)-.*\.json/\1/')
200-
mkdir -p benchmark/clickbench/results/${dataset}/
201-
mv $result benchmark/clickbench/results/${dataset}/$(basename $result)
202+
mkdir -p results/${dataset}/
203+
mv $result results/${dataset}/$(basename $result)
204+
done
205+
for ndjson in results/*.ndjson; do
206+
dataset=$(echo $ndjson | sed -E 's/.*result-(\w+)-.*\.ndjson/\1/')
207+
mkdir -p results/${dataset}/
208+
mv $ndjson results/${dataset}/$(basename $ndjson)
202209
done
203210
echo "REPORT_S3_PREFIX=s3://benchmark/clickbench/pr/${{ inputs.source_id }}/${{ inputs.run_id }}" >> $GITHUB_ENV
204211
- name: Upload PR clickbench result to R2
@@ -211,10 +218,12 @@ jobs:
211218
working-directory: benchmark/clickbench
212219
run: |
213220
echo -e "## ClickBench Report\n" > /tmp/body
221+
shopt -s nullglob
214222
for p in results/*; do
223+
[ -d "$p" ] || continue
215224
dataset=$(basename $p)
216225
aws s3 sync results/$dataset/ ${REPORT_S3_PREFIX}/ --include "*.json" --no-progress --checksum-algorithm=CRC32
217-
aws s3 sync "s3://benchmark/clickbench/release/${dataset}/latest/" ./results/${dataset}/ --exclude "*" --include "*.json"
226+
aws s3 sync "s3://benchmark/clickbench/release/${dataset}/latest/" ./results/${dataset}/ --exclude "*" --include "*.json" || true
218227
./update_results.py --dataset $dataset --pr ${{ inputs.source_id }}
219228
aws s3 cp ./results/${dataset}.html ${REPORT_S3_PREFIX}/${dataset}.html --no-progress --checksum-algorithm=CRC32
220229
echo "* **${dataset}**: https://benchmark.databend.com/clickbench/pr/${{ inputs.source_id }}/${{ inputs.run_id }}/${dataset}.html" >> /tmp/body

benchmark/clickbench/benchmark_cloud.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@ def write_result_files(script_dir: Path, record: ResultRecord) -> None:
239239
final_result_path = script_dir / f"result-{record.dataset}-cloud-{record.size}.json"
240240
ndjson_name = (
241241
f"result-{record.dataset}-cloud-{record.size}"
242-
f"-{record.date}"
243242
f"-{record.run_id}.ndjson"
244243
)
245244
ndjson_path = script_dir / ndjson_name

0 commit comments

Comments
 (0)