Remove the and helpers that were only needed for ClickHouse unquoted identifier handling.

Queries are now returned as-is without dialect-specific transformation.

Signed-off-by: fastio <pengjian.uestc@gmail.com>

Author: fastio

vortex-bench/src/clickbench/benchmark.rs

@@ -10,7 +10,6 @@ use url::Url;
 
 use crate::Benchmark;
 use crate::BenchmarkDataset;
-use crate::Engine;
 use crate::IdempotentPath;
 use crate::TableSpec;
 use crate::clickbench::*;
@@ -20,8 +19,6 @@ pub struct ClickBenchBenchmark {
     pub flavor: Flavor,
     pub queries_file: Option<String>,
     pub data_url: Url,
-    /// Override the engine to select engine-specific query files.
-    pub engine: Option<Engine>,
 }
 
 impl ClickBenchBenchmark {
@@ -35,16 +32,9 @@ impl ClickBenchBenchmark {
             flavor,
             queries_file,
             data_url: url,
-            engine: None,
         })
     }
 
-    /// Set the engine to select engine-specific query files.
-    pub fn with_engine(mut self, engine: Engine) -> Self {
-        self.engine = Some(engine);
-        self
-    }
-
     /// Returns the path to the queries file.
     fn queries_file_path(&self) -> PathBuf {
         if let Some(file) = &self.queries_file {
@@ -54,21 +44,6 @@ impl ClickBenchBenchmark {
         manifest_dir.join("clickbench_queries.sql")
     }
 
-    /// Returns true if the engine requires unquoted column names.
-    fn uses_unquoted_identifiers(&self) -> bool {
-        matches!(self.engine, Some(Engine::ClickHouse))
-    }
-
-    /// Strips double quotes only from simple SQL identifiers for engines like
-    /// ClickHouse that don't require quoted column names.
-    fn normalize_query(&self, query: &str) -> String {
-        if !self.uses_unquoted_identifiers() {
-            return query.to_string();
-        }
-
-        strip_simple_identifier_quotes(query)
-    }
-
     fn create_data_url(remote_data_dir: &Option<String>, flavor: Flavor) -> Result<Url> {
         match remote_data_dir {
             None => {
@@ -96,64 +71,6 @@ impl ClickBenchBenchmark {
     }
 }
 
-fn strip_simple_identifier_quotes(query: &str) -> String {
-    let bytes = query.as_bytes();
-    let mut out = String::with_capacity(query.len());
-    let mut i = 0;
-
-    while i < query.len() {
-        let rel = match query[i..].find('"') {
-            Some(pos) => pos,
-            None => {
-                out.push_str(&query[i..]);
-                break;
-            }
-        };
-
-        let start = i + rel;
-        out.push_str(&query[i..start]);
-
-        let mut end = start + 1;
-        while end < bytes.len() {
-            if bytes[end] == b'"' {
-                if end + 1 < bytes.len() && bytes[end + 1] == b'"' {
-                    end += 2;
-                } else {
-                    break;
-                }
-            } else {
-                end += 1;
-            }
-        }
-
-        if end >= bytes.len() {
-            out.push_str(&query[start..]);
-            break;
-        }
-
-        let inner = &query[start + 1..end];
-        if is_simple_identifier(inner) {
-            out.push_str(inner);
-        } else {
-            out.push_str(&query[start..=end]);
-        }
-
-        i = end + 1;
-    }
-
-    out
-}
-
-fn is_simple_identifier(s: &str) -> bool {
-    let mut chars = s.chars();
-    let Some(first) = chars.next() else {
-        return false;
-    };
-
-    (first.is_ascii_alphabetic() || first == '_')
-        && chars.all(|c| c.is_ascii_alphanumeric() || c == '_')
-}
-
 #[async_trait::async_trait]
 impl Benchmark for ClickBenchBenchmark {
     fn queries(&self) -> Result<Vec<(usize, String)>> {
@@ -163,7 +80,7 @@ impl Benchmark for ClickBenchBenchmark {
             .split(';')
             .map(|s| s.trim())
             .filter(|s| !s.is_empty())
-            .map(|s| self.normalize_query(s))
+            .map(|s| s.to_string())
             .enumerate()
             .collect())
     }