benchmarks: use postgres oracle

MaterializeInc · Nov 24, 2023 · 605810d · 605810d
1 parent 1e4d428
commit 605810d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 22 deletions.
diff --git a/misc/python/materialize/scalability/endpoints.py b/misc/python/materialize/scalability/endpoints.py
@@ -105,12 +105,6 @@ def __str__(self) -> str:
         return f"MaterializeLocal ({self.host()})"
 
 
-# TODO(def-,aljoscha) Switch this to "postgres" before #22029 is enabled in
-# production Also verify that there is no regression when the "other" side uses
-# catalog ts oracle and "this" uses postgres ts oracle
-ADDITIONAL_SYSTEM_PARAMETER_DEFAULTS = {"timestamp_oracle": "catalog"}
-
-
 class MaterializeContainer(MaterializeNonRemote):
     def __init__(
         self,
@@ -142,10 +136,7 @@ def up(self) -> None:
 
         if self.image is not None and self.alternative_image is not None:
             if not self.composition.try_pull_service_image(
-                Materialized(
-                    image=self.image,
-                    additional_system_parameter_defaults=ADDITIONAL_SYSTEM_PARAMETER_DEFAULTS,
-                )
+                Materialized(image=self.image)
             ):
                 # explicitly specified image cannot be found and alternative exists
                 print(
@@ -160,11 +151,7 @@ def up(self) -> None:
 
     def up_internal(self) -> None:
         with self.composition.override(
-            Materialized(
-                image=self.image,
-                sanity_restart=False,
-                additional_system_parameter_defaults=ADDITIONAL_SYSTEM_PARAMETER_DEFAULTS,
-            )
+            Materialized(image=self.image, sanity_restart=False)
         ):
             self.composition.up("materialized")
             self._port = self.composition.default_port("materialized")

diff --git a/test/feature-benchmark/mzcompose.py b/test/feature-benchmark/mzcompose.py
@@ -140,10 +140,6 @@ def run_one_scenario(
 
         additional_system_parameter_defaults = {}
 
-        # TODO(def-,aljoscha) Switch this to "postgres" before #22029 is enabled in production
-        # Also verify that there is no regression when the "other" side uses catalog ts oracle and "this" uses postgres ts oracle
-        additional_system_parameter_defaults["timestamp_oracle"] = "catalog"
-
         if params is not None:
             for param in params.split(";"):
                 param_name, param_value = param.split("=")

diff --git a/test/scalability/mzcompose.py b/test/scalability/mzcompose.py
@@ -50,9 +50,6 @@
         image="materialize/materialized:latest",
         sanity_restart=False,
         catalog_store="stash",
-        # TODO(def-,aljoscha) Switch this to "postgres" before #22029 is enabled in production
-        # Also verify that there is no regression when the "other" side uses catalog ts oracle and "this" uses postgres ts oracle
-        additional_system_parameter_defaults={"timestamp_oracle": "catalog"},
     ),
     Postgres(),
 ]