Added support for defaults for true/false version of variable substitution in benchmark files - ${VARIABLE:-default|true value|false value}

Author: Omega359

benchmarks/sql_benchmarks/README.md

@@ -55,9 +55,10 @@ Variables are supported in two forms:
 
 * string substitution based on environment variables (with default values if unset): \${ENV_VAR} and
   \${ENV_VAR:-default}.
-* if / else based on whether an environment variable is true or not (\${ENV_VAR|true value|false value}). In this
-  form only the value `true` (case-insensitive) selects the true branch; any other set value selects the false branch.
-  If ENV_VAR is unset the benchmark will return an error.
+* if / else based on whether an environment variable is true or not
+  (\${ENV_VAR:-default|true value|false value}). In this form only the value `true` (case-insensitive) selects the
+  true branch; any other set value selects the false branch. If ENV_VAR is unset, `default` is used to select the
+  branch.
 
 Comments in files are supported with lines starting with # or --.
 

benchmarks/src/sql_benchmark.rs

@@ -1310,15 +1310,16 @@ fn replace_all<E>(
 }
 
 static TRUE_FALSE_REPLACEMENT_RE: LazyLock<Regex> = LazyLock::new(|| {
-    Regex::new(r"\$\{(\w+)\|([^|]+)\|([^}]+)}").expect("Regex failed to compile")
+    Regex::new(r"\$\{(\w+)(?::-([^|}]+))?\|([^|]+)\|([^}]+)}")
+        .expect("Regex failed to compile")
 });
 
 static VARIABLE_REPLACEMENT_RE: LazyLock<Regex> = LazyLock::new(|| {
     Regex::new(r"\$\{(\w+)(?::-([^}]+))?}").expect("Regex failed to compile")
 });
 
 /// Replace all `${KEY}` or `${KEY:-default}` placeholders in a string according to the mapping.
-/// Also handles `${KEY|True value|false value}` syntax.
+/// Also handles `${KEY:-default|True value|false value}` syntax.
 fn process_replacements(
     input: &str,
     replacement_map: &HashMap<String, String>,
@@ -1333,13 +1334,14 @@ fn process_replacements_with_env(
 ) -> Result<String> {
     debug!("processing replacements for line '{input}'");
 
-    // handle ${VAR|true value|false value} syntax
+    // handle ${VAR:-default|true value|false value} syntax
     let replacement = |caps: &regex::Captures| -> Result<String> {
         let key = &caps[1];
-        let true_val = &caps[2];
-        let false_val = &caps[3];
+        let default = caps.get(2).map(|m| m.as_str().to_string());
+        let true_val = &caps[3];
+        let false_val = &caps[4];
 
-        let value = lookup_replacement_value(key, replacement_map, &get_env);
+        let value = lookup_replacement_value(key, replacement_map, &get_env).or(default);
 
         match value {
             Some(v) if v.eq_ignore_ascii_case("true") => Ok(true_val.to_string()),
@@ -1690,7 +1692,7 @@ mod tests {
         let env = replacement_map(&[("USE_PARQUET", "TrUe")]);
 
         let actual = process_replacements_with_env(
-            "load_${USE_PARQUET|parquet|csv}.sql",
+            "load_${USE_PARQUET:-false|parquet|csv}.sql",
             &replacements,
             |key| env.get(key).cloned(),
         )
@@ -1705,7 +1707,7 @@ mod tests {
         let env = replacement_map(&[("USE_PARQUET", "false")]);
 
         let actual = process_replacements_with_env(
-            "load_${USE_PARQUET|parquet|csv}.sql",
+            "load_${USE_PARQUET:-true|parquet|csv}.sql",
             &replacements,
             |key| env.get(key).cloned(),
         )
@@ -1719,7 +1721,7 @@ mod tests {
         let replacements = replacement_map(&[("USE_PARQUET", "true")]);
 
         let actual = process_replacements_with_env(
-            "load_${USE_PARQUET|parquet|csv}.sql",
+            "load_${USE_PARQUET:-false|parquet|csv}.sql",
             &replacements,
             |_| None,
         )
@@ -1734,7 +1736,7 @@ mod tests {
         let env = replacement_map(&[("USE_PARQUET", "true")]);
 
         let actual = process_replacements_with_env(
-            "load_${USE_PARQUET|parquet|csv}.sql",
+            "load_${USE_PARQUET:-true|parquet|csv}.sql",
             &replacements,
             |key| env.get(key).cloned(),
         )
@@ -1744,7 +1746,35 @@ mod tests {
     }
 
     #[test]
-    fn process_replacements_reports_missing_true_false_env_variable() {
+    fn process_replacements_uses_true_false_default_for_missing_true_value() {
+        let replacements = HashMap::new();
+
+        let actual = process_replacements_with_env(
+            "load_${USE_PARQUET:-true|parquet|csv}.sql",
+            &replacements,
+            |_| None,
+        )
+        .expect("replacement should succeed");
+
+        assert_eq!(actual, "load_parquet.sql");
+    }
+
+    #[test]
+    fn process_replacements_uses_true_false_default_for_missing_false_value() {
+        let replacements = HashMap::new();
+
+        let actual = process_replacements_with_env(
+            "load_${USE_PARQUET:-false|parquet|csv}.sql",
+            &replacements,
+            |_| None,
+        )
+        .expect("replacement should succeed");
+
+        assert_eq!(actual, "load_csv.sql");
+    }
+
+    #[test]
+    fn process_replacements_reports_missing_true_false_variable_without_default() {
         let replacements = HashMap::new();
 
         let error = process_replacements_with_env(
@@ -1768,7 +1798,7 @@ mod tests {
         let env = replacement_map(&[("USE_TYPED_PATH", "true")]);
 
         let actual = process_replacements_with_env(
-            "${USE_TYPED_PATH|data.${FILE_TYPE}|data.csv}",
+            "${USE_TYPED_PATH:-false|data.${FILE_TYPE}|data.csv}",
             &replacements,
             |key| env.get(key).cloned(),
         )