fix[bench]: correct s3 path to run benchmarks (#3837)

Signed-off-by: Joe Isaacs <[email protected]>

Author: joseph-isaacs

.github/workflows/nightly-bench.yml

@@ -26,7 +26,16 @@ jobs:
             "subcommand": "tpch",
             "name": "TPC-H on NVME",
             "targets": "datafusion:parquet,datafusion:vortex,duckdb:parquet,duckdb:vortex",
-            "scale_factor": "--scale-factor 10"
+            "scale_factor": "--scale-factor 10.0"
+          },
+          {
+            "id": "tpch-s3",
+            "subcommand": "tpch",
+            "name": "TPC-H on S3",
+            "local_dir": "bench-vortex/data/tpch/10.0",
+            "remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/tpch/10.0/",
+            "targets": "datafusion:parquet,datafusion:vortex,duckdb:parquet",
+            "scale_factor": "--scale-factor 10.0"
           },
           {
             "id": "tpch-nvme",

.github/workflows/sql-benchmarks.yml

@@ -33,10 +33,10 @@ on:
               "id": "tpch-s3",
               "subcommand": "tpch",
               "name": "TPC-H on S3",
-              "local_dir": "bench-vortex/data/tpch/1",
-              "remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/tpch/1/",
+              "local_dir": "bench-vortex/data/tpch/1.0",
+              "remote_storage": "s3://vortex-bench-dev-eu/${{github.ref_name}}/tpch/1.0/",
               "targets": "datafusion:parquet,datafusion:vortex,duckdb:parquet",
-              "scale_factor": "--scale-factor 1"
+              "scale_factor": "--scale-factor 1.0"
             }
           ]
 

bench-vortex/src/datasets/mod.rs

@@ -26,10 +26,10 @@ pub trait Dataset {
     async fn to_vortex_array(&self) -> ArrayRef;
 }
 
-#[derive(Debug, Clone, PartialEq, Serialize)]
+#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
 pub enum BenchmarkDataset {
     #[serde(rename = "tpch")]
-    TpcH { scale_factor: f32 },
+    TpcH { scale_factor: String },
     #[serde(rename = "tpcds")]
     TpcDS { scale_factor: u32 },
     #[serde(rename = "clickbench")]

bench-vortex/src/tpch_benchmark.rs

@@ -128,11 +128,9 @@ impl Benchmark for TpcHBenchmark {
     }
 
     fn dataset(&self) -> BenchmarkDataset {
-        let scale_factor: f32 = self
-            .scale_factor
-            .parse()
-            .expect("Scale factor should be valid float");
-        BenchmarkDataset::TpcH { scale_factor }
+        BenchmarkDataset::TpcH {
+            scale_factor: self.scale_factor.clone(),
+        }
     }
 
     fn expected_row_counts(&self) -> Option<&[usize]> {
@@ -233,14 +231,12 @@ impl TpcHBenchmark {
         }
         fs::create_dir(&tmp_dir)?;
         let duckdb_ctx = DuckDBCtx::new_in_memory()?;
-        let scale_factor: f32 = self
-            .scale_factor
-            .parse()
-            .map_err(|_| anyhow!("Invalid scale factor: {}", self.scale_factor))?;
         duckdb_ctx.register_tables(
             self.data_url(),
             Format::OnDiskVortex,
-            &BenchmarkDataset::TpcH { scale_factor },
+            &BenchmarkDataset::TpcH {
+                scale_factor: self.scale_factor.clone(),
+            },
         )?;
 
         let mut query_files = fs::read_dir(query_dir)?