From 1fc4924ae7eacb02b168a2f767e576c438c996b9 Mon Sep 17 00:00:00 2001 From: Dennis Felsing Date: Thu, 7 May 2026 00:45:50 +0000 Subject: [PATCH] ci: Nightly/test fixes (2026-05-07) Mostly follow-ups to #36214, except the pg-cdc flake which is old --- misc/python/materialize/mzcompose/__init__.py | 2 +- misc/python/materialize/parallel_workload/action.py | 2 +- src/environmentd/tests/sql.rs | 1 - src/timely-util/src/columnar/consolidate.rs | 1 + test/pg-cdc-old-syntax/alter-table-after-source.td | 4 ++++ test/sqllogictest/distinct_arrangements.slt | 8 +++++--- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/misc/python/materialize/mzcompose/__init__.py b/misc/python/materialize/mzcompose/__init__.py index 8cf37ccbd71c5..f9e0222ce0505 100644 --- a/misc/python/materialize/mzcompose/__init__.py +++ b/misc/python/materialize/mzcompose/__init__.py @@ -402,7 +402,7 @@ def get_variable_system_parameters( "arrangement_size_history_collection_interval", "1h", ["1s", "10s", "1h"] ), VariableSystemParameter( - "arrangement_size_history_retention_period", "7d", ["1m", "1h", "7d"] + "arrangement_size_history_retention_period", "7d", ["1min", "1h", "7d"] ), VariableSystemParameter( "persist_validate_part_bounds_on_read", "false", ["true", "false"] diff --git a/misc/python/materialize/parallel_workload/action.py b/misc/python/materialize/parallel_workload/action.py index 5709dae568719..cdff494541f1a 100644 --- a/misc/python/materialize/parallel_workload/action.py +++ b/misc/python/materialize/parallel_workload/action.py @@ -1551,7 +1551,7 @@ def __init__( "'1h'", ] self.flags_with_values["arrangement_size_history_retention_period"] = [ - "'1m'", + "'1min'", "'1h'", "'7d'", ] diff --git a/src/environmentd/tests/sql.rs b/src/environmentd/tests/sql.rs index fa933d1c5e78c..d4307799d0c7f 100644 --- a/src/environmentd/tests/sql.rs +++ b/src/environmentd/tests/sql.rs @@ -1266,7 +1266,6 @@ source materialize.public.t1 (u1, storage): binding constraints: lower: - (Storage inputs: [u1]): [] (Isolation level: StrictSerializable): []\n"; let row = client diff --git a/src/timely-util/src/columnar/consolidate.rs b/src/timely-util/src/columnar/consolidate.rs index 98e45b81b076a..2b226fd1f4755 100644 --- a/src/timely-util/src/columnar/consolidate.rs +++ b/src/timely-util/src/columnar/consolidate.rs @@ -338,6 +338,7 @@ mod tests { } #[mz_ore::test] + #[cfg_attr(miri, ignore)] // too slow fn emits_multiple_containers() { let mut builder: ConsolidatingColumnBuilder = Default::default(); // Enough distinct rows to fill the SoA accumulator past the output target multiple diff --git a/test/pg-cdc-old-syntax/alter-table-after-source.td b/test/pg-cdc-old-syntax/alter-table-after-source.td index 1bc2513bc1fab..22e10a1253239 100644 --- a/test/pg-cdc-old-syntax/alter-table-after-source.td +++ b/test/pg-cdc-old-syntax/alter-table-after-source.td @@ -7,6 +7,10 @@ # the Business Source License, use of this software will be governed # by the Apache License, Version 2.0. +# TODO: Reenable when https://github.com/MaterializeInc/database-issues/issues/7900 is fixed +$ skip-if +SELECT true + # # Test ALTER TABLE -- source will error out for tables which existed when the source was created # diff --git a/test/sqllogictest/distinct_arrangements.slt b/test/sqllogictest/distinct_arrangements.slt index 148aeb9f0c0be..c3687ad81ec7a 100644 --- a/test/sqllogictest/distinct_arrangements.slt +++ b/test/sqllogictest/distinct_arrangements.slt @@ -1057,10 +1057,12 @@ JOIN mz_introspection.mz_dataflow_operator_dataflows mdod ON mash.operator_id = GROUP BY mdod.name ORDER BY mdod.name ---- -AccumulableErrorCheck 2 +AccumulableErrorCheck 3 Arrange␠ReduceMinsMaxes 1 -ArrangeAccumulable␠[val:␠empty] 2 -ReduceAccumulable 2 +ArrangeAccumulable␠[val:␠empty] 3 +ArrangeBy[[Column(0,␠"operator_id")]] 2 +ArrangeBy[[Column(1,␠"dataflow_id")]] 2 +ReduceAccumulable 3 ReduceMinsMaxes 1 ReduceMinsMaxes␠Error␠Check 1