update args

Author: alamb

benchmarks/bench.sh

@@ -389,7 +389,7 @@ run_clickbench_1() {
     RESULTS_FILE="${RESULTS_DIR}/clickbench_1.json"
     echo "RESULTS_FILE: ${RESULTS_FILE}"
     echo "Running clickbench (1 file) benchmark..."
-    $CARGO_COMMAND --bin dfbench -- clickbench  --iterations 10 --path "${DATA_DIR}/hits.parquet" -o ${RESULTS_FILE}
+    $CARGO_COMMAND --bin dfbench -- clickbench  --iterations 10 --path "${DATA_DIR}/hits.parquet" --queries_path = "${SCRIPT_DIR}/benchmarks/queries/clickbench/queries.sql" -o ${RESULTS_FILE}
 }
 
  # Runs the clickbench benchmark with a single large parquet file

benchmarks/src/clickbench.rs

@@ -34,6 +34,7 @@ use crate::{BenchmarkRun, CommonOpt};
 /// [1]: https://github.com/ClickHouse/ClickBench
 /// [2]: https://github.com/ClickHouse/ClickBench/tree/main/datafusion
 #[derive(Debug, StructOpt, Clone)]
+#[structopt(verbatim_doc_comment)]
 pub struct RunOpt {
     /// Query number. If not specified, runs all queries
     #[structopt(short, long)]
@@ -47,7 +48,6 @@ pub struct RunOpt {
     /// (partitioned, 100 files)
     #[structopt(
         parse(from_os_str),
-        required = true,
         short = "p",
         long = "path",
         default_value = "benchmarks/data/hits.parquet"
@@ -57,7 +57,8 @@ pub struct RunOpt {
     /// Path to queries.sql (single file)
     #[structopt(
         parse(from_os_str),
-        required = true,
+        short = "qp",
+        long = "queries_path",
         default_value = "benchmarks/queries/clickbench/queries.sql"
     )]
     queries_path: PathBuf,