feat: do not clobber existing overrides with new overrides

getsentry · Sep 23, 2024 · 1a94ecf · 1a94ecf
1 parent 550bfab
commit 1a94ecf
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/snuba/query/processors/physical/clickhouse_settings_override.py b/snuba/query/processors/physical/clickhouse_settings_override.py
@@ -14,4 +14,7 @@ def __init__(self, settings: MutableMapping[str, Any]) -> None:
         self.__settings = settings
 
     def process_query(self, query: Query, query_settings: QuerySettings) -> None:
-        query_settings.set_clickhouse_settings(self.__settings)
+        new_settings = {}
+        new_settings.update(query_settings.get_clickhouse_settings())
+        new_settings.update(self.__settings)
+        query_settings.set_clickhouse_settings(new_settings)
diff --git a/tests/query/processors/test_clickhouse_settings_override.py b/tests/query/processors/test_clickhouse_settings_override.py
@@ -52,7 +52,11 @@ def test_apply_clickhouse_settings(
             )
         ],
     )
+
     settings = HTTPQuerySettings()
+    settings.set_clickhouse_settings({"use_query_cache": "true"})
 
     ClickhouseSettingsOverride(clickhouse_settings).process_query(query, settings)
-    assert settings.get_clickhouse_settings() == clickhouse_settings
+    expected = dict(clickhouse_settings)
+    expected["use_query_cache"] = "true"
+    assert settings.get_clickhouse_settings() == expected