Merge pull request #30938 from def-/pr-nightly16

ci: Nightly fixes (January 3)

Author: def-

misc/python/materialize/version_ancestor_overrides.py

@@ -28,6 +28,12 @@ def get_ancestor_overrides_for_performance_regressions(
 
     min_ancestor_mz_version_per_commit = dict()
 
+    if scenario_class_name == "FastPathOrderByLimit":
+        # PR#30872 (rust: Upgrade to 1.83.0) increases wallclock
+        min_ancestor_mz_version_per_commit[
+            "74ebdd68dd2e9ec860837d52866ab9db61a0a49e"
+        ] = MzVersion.parse_mz("v0.129.0")
+
     if scenario_class_name == "OptbenchTPCHQ01":
         # PR#30806 ([optimizer] report per-transform metrics) increases wallclock
         min_ancestor_mz_version_per_commit[

src/persist-client/src/internal/merge.rs

@@ -169,6 +169,7 @@ mod tests {
     use super::*;
 
     #[mz_ore::test]
+    #[cfg_attr(miri, ignore)] // too slow
     fn test_merge_tree() {
         // Exhaustively test the merge tree for small sizes.
         for max_len in 2..8 {

test/testdrive/statistics-maintenance.td

@@ -55,13 +55,12 @@ one:two
 sink1 1 1 true true
 
 > SELECT s.name,
-  SUM(u.updates_committed) > 0,
   SUM(u.messages_received) >= 2
   FROM mz_sources s
   JOIN mz_internal.mz_source_statistics_raw u ON s.id = u.id
   WHERE s.name IN ('upsert1')
   GROUP BY s.id, s.name
-upsert1 true true
+upsert1 true
 
 # Shut down the cluster
 > ALTER CLUSTER cluster1 SET (REPLICATION FACTOR = 0)
@@ -75,13 +74,12 @@ upsert1 true true
 sink1 1 1 true true
 
 > SELECT s.name,
-  SUM(u.updates_committed) > 0,
   SUM(u.messages_received) >= 2
   FROM mz_sources s
   JOIN mz_internal.mz_source_statistics_raw u ON s.id = u.id
   WHERE s.name IN ('upsert1')
   GROUP BY s.id, s.name
-upsert1 true true
+upsert1 true
 
 # Ingest some more data, and ensure counters are maintained
 
@@ -99,10 +97,9 @@ two:three
 sink1 2 2 true true
 
 > SELECT s.name,
-  SUM(u.updates_committed) > 0,
   SUM(u.messages_received) >= 4
   FROM mz_sources s
   JOIN mz_internal.mz_source_statistics_raw u ON s.id = u.id
   WHERE s.name IN ('upsert1')
   GROUP BY s.id, s.name
-upsert1 true true
+upsert1 true