fixup

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

Author: joseph-isaacs

benchmarks/datafusion-bench/src/main.rs

@@ -175,7 +175,11 @@ async fn main() -> anyhow::Result<()> {
     let mode = if args.explain {
         BenchmarkMode::Explain
     } else if args.validate {
-        BenchmarkMode::Validate
+        BenchmarkMode::Run {
+            iterations: 1,
+            validate: true,
+            print_results: false,
+        }
     } else {
         BenchmarkMode::Run {
             iterations: args.iterations,

benchmarks/duckdb-bench/src/main.rs

@@ -160,7 +160,11 @@ fn main() -> anyhow::Result<()> {
     let mode = if args.explain {
         BenchmarkMode::Explain
     } else if args.validate {
-        BenchmarkMode::Validate
+        BenchmarkMode::Run {
+            iterations: 1,
+            validate: true,
+            print_results: false,
+        }
     } else {
         BenchmarkMode::Run {
             iterations: args.iterations,

vortex-bench/src/runner.rs

@@ -33,8 +33,6 @@ pub enum BenchmarkMode {
     },
     /// Prepend `EXPLAIN` to each query, print the result, skip timing.
     Explain,
-    /// Run each query once and compare results against reference files.
-    Validate,
 }
 
 /// Trait implemented by engine-specific query results so the runner can
@@ -409,29 +407,6 @@ impl SqlBenchmarkRunner {
                     }
                 }
             }
-            BenchmarkMode::Validate => {
-                let mut all_passed = true;
-                // Validate using only the first format (results should be format-independent)
-                let format = *self.formats.first().ok_or_else(|| {
-                    anyhow::anyhow!("At least one format is required for validation")
-                })?;
-                let mut ctx = setup(format)?;
-
-                for (query_idx, query) in queries.iter() {
-                    let (_, result) = execute(&mut ctx, *query_idx, format, query.as_str())?;
-                    let (_cols, mut rows) = result.normalized_result();
-                    if !self.validate_query_result(*query_idx, &mut rows) {
-                        all_passed = false;
-                    }
-                }
-
-                if !all_passed {
-                    anyhow::bail!(
-                        "Result validation failed for one or more queries ({engine})",
-                        engine = self.engine,
-                    );
-                }
-            }
         }
 
         Ok(())
@@ -551,28 +526,6 @@ impl SqlBenchmarkRunner {
                     }
                 }
             }
-            BenchmarkMode::Validate => {
-                let mut all_passed = true;
-                let format = *self.formats.first().ok_or_else(|| {
-                    anyhow::anyhow!("At least one format is required for validation")
-                })?;
-                let ctx = setup(format).await?;
-
-                for (query_idx, query) in queries.iter() {
-                    let (_, result) = execute(*query_idx, &ctx, query.as_str()).await?;
-                    let (_cols, mut rows) = result.normalized_result();
-                    if !self.validate_query_result(*query_idx, &mut rows) {
-                        all_passed = false;
-                    }
-                }
-
-                if !all_passed {
-                    anyhow::bail!(
-                        "Result validation failed for one or more queries ({engine})",
-                        engine = self.engine,
-                    );
-                }
-            }
         }
 
         Ok(())