wip

Signed-off-by: Joe Isaacs <joe.isaacs@live.co.uk>

Author: joseph-isaacs

benchmarks/datafusion-bench/src/main.rs

@@ -107,6 +107,14 @@ struct Args {
     #[arg(long, default_value_t = false, conflicts_with = "explain")]
     print_results: bool,
 
+    /// Regenerate `.slt.no` reference files from actual query output.
+    #[arg(
+        long,
+        default_value_t = false,
+        conflicts_with_all = ["explain", "validate"]
+    )]
+    regenerate_slt: bool,
+
     #[arg(long, value_delimiter = ',', value_parser = value_parser!(Format))]
     formats: Vec<Format>,
 
@@ -173,6 +181,8 @@ async fn main() -> anyhow::Result<()> {
 
     let mode = if args.explain {
         BenchmarkMode::Explain
+    } else if args.regenerate_slt {
+        BenchmarkMode::RegenerateSlt
     } else if args.validate {
         BenchmarkMode::Run {
             iterations: 1,
@@ -233,7 +243,7 @@ async fn main() -> anyhow::Result<()> {
         )
         .await?;
 
-    if !args.explain && !args.validate {
+    if !args.explain && !args.validate && !args.regenerate_slt {
         // Print metrics if requested
         if show_metrics {
             let plans = collected_plans.lock();

benchmarks/duckdb-bench/src/main.rs

@@ -82,6 +82,14 @@ struct Args {
     #[arg(long, default_value_t = false, conflicts_with = "explain")]
     print_results: bool,
 
+    /// Regenerate `.slt.no` reference files from actual query output.
+    #[arg(
+        long,
+        default_value_t = false,
+        conflicts_with_all = ["explain", "validate"]
+    )]
+    regenerate_slt: bool,
+
     #[arg(
         long,
         default_value_t = false,
@@ -159,6 +167,8 @@ fn main() -> anyhow::Result<()> {
 
     let mode = if args.explain {
         BenchmarkMode::Explain
+    } else if args.regenerate_slt {
+        BenchmarkMode::RegenerateSlt
     } else if args.validate {
         BenchmarkMode::Run {
             iterations: 1,
@@ -201,7 +211,7 @@ fn main() -> anyhow::Result<()> {
         },
     )?;
 
-    if !args.explain && !args.validate {
+    if !args.explain && !args.validate && !args.regenerate_slt {
         let benchmark_id = format!("duckdb-{}", benchmark.dataset_name());
         let writer = create_output_writer(&args.display_format, args.output_path, &benchmark_id)?;
         runner.export_to(&args.display_format, writer)?;

vortex-bench/clickbench/slt/results/datafusion/q00.slt.no

@@ -1 +1,4 @@
-include ../q00.slt.no
+query T rowsort
+SELECT COUNT(*) FROM hits
+----
+99997497

vortex-bench/clickbench/slt/results/datafusion/q01.slt.no

@@ -1 +1,4 @@
-include ../q01.slt.no
+query T rowsort
+SELECT COUNT(*) FROM hits WHERE "AdvEngineID" <> 0
+----
+630500

vortex-bench/clickbench/slt/results/datafusion/q02.slt.no

@@ -1 +1,4 @@
-include ../q02.slt.no
+query TTT rowsort
+SELECT SUM("AdvEngineID"), COUNT(*), AVG("ResolutionWidth") FROM hits
+----
+7280088 99997497 1513.4879349030107

vortex-bench/clickbench/slt/results/datafusion/q03.slt.no

@@ -1 +1,4 @@
-include ../q03.slt.no
+query T rowsort
+SELECT AVG("UserID") FROM hits
+----
+2.528953029789716e18

vortex-bench/clickbench/slt/results/datafusion/q04.slt.no

@@ -1 +1,4 @@
-include ../q04.slt.no
+query T rowsort
+SELECT COUNT(DISTINCT "UserID") FROM hits
+----
+17630976

vortex-bench/clickbench/slt/results/datafusion/q05.slt.no

@@ -1 +1,4 @@
-include ../q05.slt.no
+query T rowsort
+SELECT COUNT(DISTINCT "SearchPhrase") FROM hits
+----
+6019103

vortex-bench/clickbench/slt/results/datafusion/q06.slt.no

@@ -1 +1,4 @@
-include ../q06.slt.no
+query TT rowsort
+SELECT MIN("EventDate"), MAX("EventDate") FROM hits
+----
+2013-07-02T00:00:00 2013-07-31T00:00:00

vortex-bench/clickbench/slt/results/datafusion/q07.slt.no

@@ -1 +1,21 @@
-include ../q07.slt.no
+query TT rowsort
+SELECT "AdvEngineID", COUNT(*) FROM hits WHERE "AdvEngineID" <> 0 GROUP BY "AdvEngineID" ORDER BY COUNT(*) DESC
+----
+13 45631
+16 7
+2 404602
+21 38
+22 1
+25 343
+27 113167
+28 836
+3 6896
+42 20
+44 9730
+45 38960
+50 938
+52 3554
+53 350
+61 158
+62 5266
+7 3