Merge pull request #33375 from def-/pr-nightly34

tests: Nightly fixes (2025-08-20)

Author: def-

ci/test/pipeline.template.yml

@@ -384,7 +384,7 @@ steps:
     depends_on: build-x86_64
     timeout_in_minutes: 30
     inputs: [test/sql-server-cdc]
-    parallelism: 3
+    parallelism: 4
     plugins:
       - ./ci/plugins/mzcompose:
           composition: sql-server-cdc

misc/python/materialize/cli/mzcompose.py

@@ -42,10 +42,10 @@
 from materialize.mzcompose.composition import (
     Composition,
     UnknownCompositionError,
-    filter_cmd,
 )
 from materialize.mzcompose.test_result import TestResult
 from materialize.ui import UIError
+from materialize.util import filter_cmd
 
 RECOMMENDED_MIN_MEM = 7 * 1024**3  # 7GiB
 RECOMMENDED_MIN_CPUS = 2

misc/python/materialize/cloudtest/k8s/testdrive.py

@@ -20,11 +20,11 @@
 from materialize.mzcompose import (
     cluster_replica_size_map,
 )
-from materialize.mzcompose.composition import filter_cmd
 from materialize.mzcompose.test_result import (
     extract_error_chunks_from_output,
 )
 from materialize.ui import CommandFailureCausedUIError
+from materialize.util import filter_cmd
 
 
 class TestdriveBase:

misc/python/materialize/cloudtest/util/common.py

@@ -14,7 +14,7 @@
 from time import sleep
 from typing import Any, cast
 
-from materialize.mzcompose.composition import filter_cmd
+from materialize.util import filter_cmd
 
 LOGGER = logging.getLogger(__name__)
 

misc/python/materialize/mzcompose/composition.py

@@ -63,32 +63,7 @@
     CommandFailureCausedUIError,
     UIError,
 )
-
-FILTERED_ARGS = [
-    # Secrets
-    "mzp_",
-    "-----BEGIN PRIVATE KEY-----",
-    "-----BEGIN CERTIFICATE-----",
-    "confluent-api-key=",
-    "confluent-api-secret=",
-    "aws-access-key-id=",
-    "aws-secret-access-key=",
-    # Not a secret, but too spammy, filter too
-    "CLUSTER_REPLICA_SIZES",
-    "cluster-replica-sizes=",
-]
-
-
-def filter_cmd(args: list[str]) -> list[str]:
-    """Don't print out secrets in test logs"""
-    return [
-        (
-            "[REDACTED]"
-            if any(filtered_arg in arg for filtered_arg in FILTERED_ARGS)
-            else arg
-        )
-        for arg in args
-    ]
+from materialize.util import filter_cmd
 
 
 class Service:

misc/python/materialize/mzcompose/test_result.py

@@ -14,6 +14,7 @@
 
 from materialize import MZ_ROOT
 from materialize.ui import CommandFailureCausedUIError, UIError
+from materialize.util import filter_cmd
 
 PEM_CONTENT_RE = r"-----BEGIN ([A-Z ]+)-----[^-]+-----END [A-Z ]+-----"
 PEM_CONTENT_REPLACEMENT = r"<\1>"
@@ -155,5 +156,5 @@ def extract_error_chunks_from_output(output: str) -> list[str]:
 
 
 def to_sanitized_command_str(cmd: list[str]) -> str:
-    command_str = " ".join([str(x) for x in cmd])
+    command_str = " ".join([str(x) for x in filter_cmd(cmd)])
     return re.sub(PEM_CONTENT_RE, PEM_CONTENT_REPLACEMENT, command_str)

misc/python/materialize/util.py

@@ -198,3 +198,30 @@ def parse_pg_conn_string(conn_string: str) -> PgConnInfo:
         database=url.path.lstrip("/"),
         ssl=query_params.get("sslmode", ["disable"])[-1] != "disable",
     )
+
+
+FILTERED_ARGS = [
+    # Secrets
+    "mzp_",
+    "-----BEGIN PRIVATE KEY-----",
+    "-----BEGIN CERTIFICATE-----",
+    "confluent-api-key=",
+    "confluent-api-secret=",
+    "aws-access-key-id=",
+    "aws-secret-access-key=",
+    # Not a secret, but too spammy, filter too
+    "CLUSTER_REPLICA_SIZES",
+    "cluster-replica-sizes=",
+]
+
+
+def filter_cmd(args: list[str]) -> list[str]:
+    """Don't print out secrets in test logs"""
+    return [
+        (
+            "[REDACTED]"
+            if any(filtered_arg in arg for filtered_arg in FILTERED_ARGS)
+            else arg
+        )
+        for arg in args
+    ]

src/sql/src/func.rs

@@ -1671,10 +1671,10 @@ pub struct TableFuncPlan {
 /// 2. or a general HIR expression. This happens when it's implemented as SQL, i.e., by a call to
 ///    `sql_impl_table_func_inner`.
 ///
-/// TODO(ggevay): when a table function in 2. is used with WITH ORDINALITY or ROWS FROM, we fall
-/// back to the legacy WITH ORDINALITY implementation, which relies on the row_number window
-/// function, and is mostly broken. It can give an incorrect ordering, and also has an extreme
-/// performance problem in some cases, see
+/// TODO(ggevay, database-issues#9598): when a table function in 2. is used with WITH ORDINALITY or
+/// ROWS FROM, we fall back to the legacy WITH ORDINALITY implementation, which relies on the
+/// row_number window function, and is mostly broken. It can give an incorrect ordering, and also
+/// has an extreme performance problem in some cases. Discussed in
 /// <https://github.com/MaterializeInc/database-issues/issues/4764#issuecomment-2854572614>
 ///
 /// These table functions are somewhat exotic, and WITH ORDINALITY / ROWS FROM are also somewhat

src/testdrive/src/action/sql.rs

@@ -117,8 +117,12 @@ pub async fn run_sql(mut cmd: SqlCommand, state: &mut State) -> Result<ControlFl
                             state.error_line_count = 0;
                             state.error_string = error_string;
                             state.error_line_count = state.error_string.lines().count() + 1;
-                            // Contains a newline already, so don't print an additional one
-                            print!("{}", state.error_string);
+                            if state.error_string.ends_with('\n') {
+                                print!("{}", state.error_string);
+                            } else {
+                                println!("{}", state.error_string);
+                                state.error_line_count += 1;
+                            }
                             println!(
                                 "rows didn't match; sleeping to see if dataflow catches up 🕑 {:.0?}",
                                 retry_state.next_backoff.unwrap_or_default()
@@ -454,7 +458,12 @@ pub async fn run_fail_sql(
                                 state.error_line_count = 0;
                                 state.error_string = error_string;
                                 state.error_line_count = state.error_string.lines().count() + 1;
-                                println!("{}", state.error_string);
+                                if state.error_string.ends_with('\n') {
+                                    print!("{}", state.error_string);
+                                } else {
+                                    println!("{}", state.error_string);
+                                    state.error_line_count += 1;
+                                }
                                 println!("query error didn't match; sleeping to see if dataflow produces error shortly 🕑 {:.0?}", retry_state.next_backoff.unwrap_or_default());
                             }
                         }

test/sqllogictest/regex.slt

@@ -493,7 +493,7 @@ ORDER BY 1
 {hello,world}
 {hello,world}
 
-# TODO: Correct ordering when database-issues#4764 is fixed.
+# TODO: Correct ordering when database-issues#9598 is fixed.
 query T
 SELECT foo FROM regexp_split_to_table('the quick brown fox jumps over the lazy dog', '\s+') AS foo ORDER BY 1
 ----
@@ -507,7 +507,7 @@ quick
 the
 the
 
-# TODO: Correct ordering when database-issues#4764 is fixed.
+# TODO: Correct ordering when database-issues#9598 is fixed.
 query T
 SELECT foo FROM regexp_split_to_table('the quick brown fox', '\s*') AS foo ORDER BY 1
 ----