Split clickbench query set into one file per query

[pepijnve]

Which issue does this PR close?

None

Rationale for this change

Clickbench query IDs are zero-based while most editors are one-based wrt line numbers. This causes a little bit of friction every time you want to check the query for a particular clickbench run.

There's precedent in the benchmark suite already for having one file per query rather than one file with a query per line. By having distinct files, the query id can be reflected in the filename making lookup trivial.

What changes are included in this PR?

• Add a script to download the upstream queries.sql file from the clickbench repo and split it into one file per query
• Adapt the clickbench benchmark code to read queries from individual files
• Adjust parameters in bench.sh
• Adapt the sql_planner benchmark code to read queries from individual files

Are these changes tested?

Manually tested

Are there any user-facing changes?

No

[alamb]

Thank you @pepijnve -- this looks great and I think will make a significant improvement to ease of use / rerunning these queries

I also tried running these queries with a local copy of hits and they work great

datafusion-cli -f ~/Software/datafusion2/benchmarks/queries/clickbench/queries/q23.sql

[alamb]

I also ran this script locally and it works great for me

[pepijnve]

Thank you to Claude for that one. He's my buddy for quick and dirty scripts like this.

[alamb]

🤖

[alamb]

Actually, I tried running some tests manually and I got an error that seems to imply something is still looking for clickbench.queries:

(venv) andrewlamb@Andrews-MacBook-Pro-2:~/Software/datafusion2$ ./benchmarks/bench.sh run clickbench_partitioned
***************************
DataFusion Benchmark Script
COMMAND: run
BENCHMARK: clickbench_partitioned
DATAFUSION_DIR: /Users/andrewlamb/Software/datafusion2/benchmarks/..
BRANCH_NAME: clickbench_split
DATA_DIR: /Users/andrewlamb/Software/datafusion2/benchmarks/data
RESULTS_DIR: /Users/andrewlamb/Software/datafusion2/benchmarks/results/clickbench_split
CARGO_COMMAND: cargo run --release
PREFER_HASH_JOIN: true***************************
RESULTS_FILE: /Users/andrewlamb/Software/datafusion2/benchmarks/results/clickbench_split/clickbench_partitioned.json
Running clickbench (partitioned, 100 files) benchmark...
+ cargo run --release --bin dfbench -- clickbench --iterations 5 --path /Users/andrewlamb/Software/datafusion2/benchmarks/data/hits_partitioned --queries-path /Users/andrewlamb/Software/datafusion2/benchmarks/queries/clickbench/queries.sql -o /Users/andrewlamb/Software/datafusion2/benchmarks/results/clickbench_split/clickbench_partitioned.json
Finished `release` profile [optimized] target(s) in 0.28s
Running `/Users/andrewlamb/Software/datafusion2/target/release/dfbench clickbench --iterations 5 --path /Users/andrewlamb/Software/datafusion2/benchmarks/data/hits_partitioned --queries-path /Users/andrewlamb/Software/datafusion2/benchmarks/queries/clickbench/queries.sql -o /Users/andrewlamb/Software/datafusion2/benchmarks/results/clickbench_split/clickbench_partitioned.json`
Running benchmarks with the following options: RunOpt { query: None, common: CommonOpt { iterations: 5, partitions: None, batch_size: None, mem_pool_type: "fair", memory_limit: None, sort_spill_reservation_bytes: None, debug: false }, path: "/Users/andrewlamb/Software/datafusion2/benchmarks/data/hits_partitioned", queries_path: "/Users/andrewlamb/Software/datafusion2/benchmarks/queries/clickbench/queries.sql", output_path: Some("/Users/andrewlamb/Software/datafusion2/benchmarks/results/clickbench_split/clickbench_partitioned.json") }
Error: Execution("Query path '/Users/andrewlamb/Software/datafusion2/benchmarks/queries/clickbench/queries.sql' does not exist.")

Need to test a bit more

[alamb]

The same command ./benchmarks/bench.sh run clickbench_partitioned passes on main 🤔

[pepijnve]

I'll have a look. I ran this locally with a couple of the benchmarks and it worked fine for me, but I must have missed something.

[pepijnve]

I had run using a run config in my IDE. Forgot to update the paths in bench.sh. Last commit should fix that.

[alamb]

Thanks @pepijnve -- I tested it again locally and it worked great!

./benchmarks/bench.sh run clickbench_extended
./benchmarks/bench.sh run clickbench_partitioned
./benchmarks/bench.sh run clickbench_1

[alamb]

Thanks again @pepijnve