small changes, and update test flags

MaterializeInc · Nov 27, 2024 · cb9b7b6 · cb9b7b6
1 parent 0510ae1
commit cb9b7b6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/misc/python/materialize/mzcompose/__init__.py b/misc/python/materialize/mzcompose/__init__.py
@@ -88,15 +88,17 @@ def get_default_system_parameters(
         "enable_0dt_deployment": "true" if zero_downtime else "false",
         "enable_0dt_deployment_panic_after_timeout": "true",
         "enable_0dt_deployment_sources": (
-            "true" if version >= MzVersion.parse_mz("v0.125.0-dev") else "false"
+            "true" if version > MzVersion.parse_mz("v0.126.0-dev") else "false"
         ),
         "enable_alter_swap": "true",
         "enable_assert_not_null": "true",
         "enable_columnation_lgalloc": "true",
         "enable_comment": "true",
         "enable_compute_chunked_stack": "true",
         "enable_connection_validation_syntax": "true",
-        "enable_continual_task_builtins": "true",
+        "enable_continual_task_builtins": (
+            "true" if version > MzVersion.parse_mz("v0.126.0-dev") else "false"
+        ),
         "enable_continual_task_create": "true",
         "enable_continual_task_retain": "true",
         "enable_continual_task_transform": "true",
@@ -126,7 +128,9 @@ def get_default_system_parameters(
         ),
         "persist_batch_columnar_format_percent": "100",
         "persist_batch_delete_enabled": "true",
-        "persist_record_schema_id": "true",
+        "persist_record_schema_id": (
+            "true" if version >= MzVersion.parse_mz("v0.126.0-dev") else "false"
+        ),
         "persist_batch_structured_order": (
             "true" if version >= MzVersion.parse_mz("v0.119.0-dev") else "false"
         ),

diff --git a/src/adapter/src/catalog/state.rs b/src/adapter/src/catalog/state.rs
@@ -723,7 +723,7 @@ impl CatalogState {
         self.get_entry(item_id)
     }
 
-    pub fn get_entries(&self) -> impl Iterator<Item = (&GlobalId, &CatalogEntry)> + '_ {
+    pub fn get_entries(&self) -> impl Iterator<Item = (&CatalogItemId, &CatalogEntry)> + '_ {
         self.entry_by_id.iter()
     }
 

diff --git a/src/repr/src/lib.rs b/src/repr/src/lib.rs
@@ -56,7 +56,7 @@ pub use crate::relation::{
     arb_relation_desc_diff, arb_row_for_relation, ColumnName, ColumnType, NotNullViolation,
     PropRelationDescDiff, ProtoColumnName, ProtoColumnType, ProtoRelationDesc, ProtoRelationType,
     RelationDesc, RelationDescBuilder, RelationType, RelationVersion, RelationVersionSelector,
-    TypeDiff, VersionedRelationDesc,
+    VersionedRelationDesc,
 };
 pub use crate::row::encode::{preserves_order, RowColumnarDecoder, RowColumnarEncoder};
 pub use crate::row::iter::{IntoRowIterator, RowIterator};