From bfad33bd35a0a0ba3f2d58bf5595a386e4a27d88 Mon Sep 17 00:00:00 2001
From: discord9 <55937128+discord9@users.noreply.github.com>
Date: Fri, 9 Oct 2026 16:27:47 +0800
Subject: [PATCH] fix: normalize validated query option booleans

Signed-off-by: discord9 <55937128+discord9@users.noreply.github.com>
---
 src/session/src/context.rs       | 131 +++++++++++++++++++++++++++++++
 src/session/src/query_options.rs |  35 +++++++--
 2 files changed, 161 insertions(+), 5 deletions(-)

diff --git a/src/session/src/context.rs b/src/session/src/context.rs
index a600980e130..e9b7c1c5334 100644
--- a/src/session/src/context.rs
+++ b/src/session/src/context.rs
@@ -831,6 +831,9 @@ mod test {
             .unwrap();
         ctx.set_extension("query_parallelism", "4");
         ctx.set_extension("flow.return_region_seq", "true");
+        let mut expected_extensions = ctx.extensions();
+        expected_extensions.remove("query_parallelism");
+        expected_extensions.insert("query.parallelism".to_string(), "4".to_string());
         let snapshot = ctx.query_option_snapshot().unwrap();
         assert_eq!(snapshot.extension("query.parallelism"), Some("4"));
         assert_eq!(snapshot.extension("query_parallelism"), None);
@@ -839,6 +842,15 @@ mod test {
             .set_query_option("query.parallelism", "16")
             .unwrap();
         assert_eq!(snapshot.extension("query.parallelism"), Some("4"));
+        assert_eq!(
+            snapshot.configuration_parameter().query_options(),
+            HashMap::from([("query.parallelism".to_string(), "8".to_string())])
+        );
+        assert_eq!(
+            snapshot.effective_query_options().unwrap(),
+            HashMap::from([("query.parallelism".to_string(), "4".to_string()),])
+        );
+        assert_eq!(snapshot.extensions(), expected_extensions);
 
         let mut aliases = QueryContextBuilder::default().build();
         aliases.set_extension("query_fallback", "TRUE");
@@ -853,6 +865,125 @@ mod test {
         );
         aliases.set_extension("allow_query_fallback", "false");
         assert!(aliases.query_option_snapshot().is_err());
+
+        let mut ctx = QueryContextBuilder::default().build();
+        ctx.configuration_parameter()
+            .set_query_option("query_fallback", "true")
+            .unwrap();
+        assert_eq!(
+            ctx.effective_query_options()
+                .unwrap()
+                .get("query.allow_query_fallback")
+                .map(String::as_str),
+            Some("true")
+        );
+        ctx.set_extension("query_fallback", "false");
+        assert_eq!(
+            ctx.effective_query_options()
+                .unwrap()
+                .get("query.allow_query_fallback")
+                .map(String::as_str),
+            Some("false")
+        );
+        ctx.set_extension("query_fallback", "true");
+        ctx.configuration_parameter()
+            .set_query_option("query.parallelism", "1")
+            .unwrap();
+        let before = ctx.configuration_parameter().query_options();
+        assert!(
+            ctx.configuration_parameter()
+                .set_query_option("query.parallelism", "1025")
+                .is_err()
+        );
+        assert_eq!(ctx.configuration_parameter().query_options(), before);
+        assert!(
+            ctx.configuration_parameter()
+                .set_query_option("query.parallelism", "")
+                .is_err()
+        );
+        assert_eq!(ctx.configuration_parameter().query_options(), before);
+
+        let absent = QueryContextBuilder::default().build();
+        let mut explicit_false = QueryContextBuilder::default().build();
+        explicit_false.set_extension("query.allow_query_fallback", "false");
+        assert_eq!(
+            absent
+                .effective_query_options()
+                .unwrap()
+                .get("query.allow_query_fallback"),
+            None
+        );
+        assert_eq!(
+            explicit_false
+                .effective_query_options()
+                .unwrap()
+                .get("query.allow_query_fallback")
+                .map(String::as_str),
+            Some("false")
+        );
+    }
+
+    #[test]
+    fn query_option_snapshot_roundtrips_options_and_shares_only_mutable_session_data() {
+        let mut context = QueryContextBuilder::default()
+            .current_catalog(DEFAULT_CATALOG_NAME.to_string())
+            .current_schema("public".to_string())
+            .build();
+        context
+            .configuration_parameter()
+            .set_query_option(
+                "datafusion.optimizer.enable_dynamic_filter_pushdown",
+                "TRUE",
+            )
+            .unwrap();
+        context.set_extension("query_parallelism", "8");
+        context.set_extension("flow.return_region_seq", "true");
+        context.set_extension(REMOTE_QUERY_ID_EXTENSION_KEY, "query-id");
+        context.enable_live_analyze_metrics();
+
+        let snapshot = context.query_option_snapshot().unwrap();
+        let expected_options = snapshot.effective_query_options().unwrap();
+        let expected_extensions = snapshot.extensions();
+        assert_eq!(
+            expected_options
+                .get("datafusion.optimizer.enable_dynamic_filter_pushdown")
+                .map(String::as_str),
+            Some("true")
+        );
+        assert_eq!(
+            expected_options
+                .get("query.parallelism")
+                .map(String::as_str),
+            Some("8")
+        );
+        assert_eq!(
+            expected_extensions
+                .get("flow.return_region_seq")
+                .map(String::as_str),
+            Some("true")
+        );
+        assert_eq!(
+            expected_extensions
+                .get(REMOTE_QUERY_ID_EXTENSION_KEY)
+                .map(String::as_str),
+            Some("query-id")
+        );
+        assert!(snapshot.live_analyze_metrics_enabled());
+
+        context.set_current_schema("changed");
+        assert_eq!(snapshot.current_schema(), "changed");
+        let other = QueryContextBuilder::default().build();
+        assert!(!other.extensions().contains_key("query.parallelism"));
+
+        let api_context: api::v1::QueryContext = (&snapshot).into();
+        let restored = QueryContext::from(api_context);
+        let restored_snapshot = restored.query_option_snapshot().unwrap();
+        assert_eq!(
+            restored_snapshot.effective_query_options().unwrap(),
+            expected_options
+        );
+        assert_eq!(restored_snapshot.extensions(), expected_extensions);
+        assert!(restored_snapshot.live_analyze_metrics_enabled());
     }
 
     #[test]
diff --git a/src/session/src/query_options.rs b/src/session/src/query_options.rs
index 4e7d47b344a..61e0357279d 100644
--- a/src/session/src/query_options.rs
+++ b/src/session/src/query_options.rs
@@ -87,8 +87,9 @@ pub fn parse_query_option(key: &str, value: &str) -> Result<Option<(String, Stri
             }
         }
     } else {
+        let normalized = value.to_ascii_lowercase();
         let mut options = datafusion_common::config::ConfigOptions::default();
-        if let Err(error) = options.set(canonical, value) {
+        if let Err(error) = options.set(canonical, &normalized) {
             return InvalidConfigValueSnafu {
                 name: key,
                 value,
@@ -96,7 +97,7 @@ pub fn parse_query_option(key: &str, value: &str) -> Result<Option<(String, Stri
             }
             .fail();
         }
-        value.to_ascii_lowercase()
+        normalized
     };
     Ok(Some((canonical.to_string(), normalized)))
 }
@@ -111,15 +112,39 @@ mod tests {
             parse_query_option("QUERY_PARALLELISM", "1024").unwrap(),
             Some(("query.parallelism".into(), "1024".into()))
         );
-        assert!(parse_query_option("query.parallelism", "0").is_err());
-        assert!(parse_query_option("query.parallelism", "1025").is_err());
+        assert_eq!(
+            parse_query_option("query.parallelism", "1").unwrap(),
+            Some(("query.parallelism".into(), "1".into()))
+        );
+        for value in ["", "-1", "0", "1025", "65536", "18446744073709551615"] {
+            assert!(parse_query_option("query.parallelism", value).is_err());
+        }
+        assert!(parse_query_option("query.unknown", "true").is_err());
         assert_eq!(
             parse_query_option("query_fallback", "TRUE").unwrap(),
             Some(("query.allow_query_fallback".into(), "true".into()))
         );
         assert!(parse_query_option("query.allow_query_fallback", "yes").is_err());
-        assert!(parse_query_option("datafusion.optimizer.repartition_joins", "nope").is_err());
+        for key in DATAFUSION_OPTIONS {
+            assert_eq!(
+                parse_query_option(key, "TRUE").unwrap(),
+                Some((key.to_string(), "true".to_string())),
+                "{key} should accept uppercase true"
+            );
+            assert_eq!(
+                parse_query_option(key, "FALSE").unwrap(),
+                Some((key.to_string(), "false".to_string())),
+                "{key} should accept uppercase false"
+            );
+            assert!(parse_query_option(key, "yes").is_err(), "{key}");
+        }
         assert!(parse_query_option("datafusion.execution.batch_size", "12").is_err());
+        assert!(parse_query_option("datafusion.optimizer.skip_failed_rules", "true").is_err());
+        assert!(parse_query_option("datafusion.optimizer.filter_null_join_keys", "true").is_err());
+        assert_eq!(
+            parse_query_option("custom.extension", "value").unwrap(),
+            None
+        );
         assert_eq!(
             parse_query_option("flow.return_region_seq", "true").unwrap(),
             None