diff --git a/src/test/regress/bin/normalize.sed b/src/test/regress/bin/normalize.sed index 1ec8fd923..f26004269 100644 --- a/src/test/regress/bin/normalize.sed +++ b/src/test/regress/bin/normalize.sed @@ -406,3 +406,6 @@ s/^[[:space:]]*ERROR:[[:space:]]+could not connect to the publisher:[[:space:]]* # Output /^[[:space:]]*Output:/ s/(OVER[[:space:]]+)w[0-9]+/\1(?)/g # end PG18 window ref normalization + +# PG18 Actual Loops, Alias has extra comma, normalize the values +s/("Actual Loops":|"Alias":)(.*)\,(.*)/\1\2\3/g diff --git a/src/test/regress/expected/multi_explain.out b/src/test/regress/expected/multi_explain.out index e7f1ecac5..008c966e2 100644 --- a/src/test/regress/expected/multi_explain.out +++ b/src/test/regress/expected/multi_explain.out @@ -2179,7 +2179,7 @@ EXPLAIN (COSTS off, ANALYZE on, TIMING off, SUMMARY off, FORMAT JSON, BUFFERS OF "Parallel Aware": false, "Async Capable": false, "Actual Rows": 0, - "Actual Loops": 1, + "Actual Loops": 1 "Distributed Query": { "Job": { "Task Count": 2, @@ -2196,9 +2196,9 @@ EXPLAIN (COSTS off, ANALYZE on, TIMING off, SUMMARY off, FORMAT JSON, BUFFERS OF "Parallel Aware": false, "Async Capable": false, "Relation Name": "explain_pk_570013", - "Alias": "citus_table_alias", + "Alias": "citus_table_alias" "Actual Rows": 0, - "Actual Loops": 1, + "Actual Loops": 1 "Plans": [ { "Node Type": "Result", @@ -2235,7 +2235,7 @@ EXPLAIN (COSTS off, ANALYZE on, TIMING off, SUMMARY off, FORMAT JSON, BUFFERS OF "Parallel Aware": false, "Async Capable": false, "Actual Rows": 0, - "Actual Loops": 1, + "Actual Loops": 1 "Distributed Query": { "Job": { "Task Count": 4, @@ -2253,7 +2253,7 @@ EXPLAIN (COSTS off, ANALYZE on, TIMING off, SUMMARY off, FORMAT JSON, BUFFERS OF "Parallel Aware": false, "Async Capable": false, "Relation Name": "explain_pk_570013", - "Alias": "explain_pk", + "Alias": "explain_pk" "Actual Rows": 0, "Actual Loops": 1 }, @@ -3285,7 +3285,7 @@ SELECT * FROM a; "Parallel Aware": false, "Async Capable": false, "Actual Rows": 1, - "Actual Loops": 1, + "Actual Loops": 1 "Distributed Query": { "Subplans": [ { @@ -3299,7 +3299,7 @@ SELECT * FROM a; "Parallel Aware": false, "Async Capable": false, "Actual Rows": 1, - "Actual Loops": 1, + "Actual Loops": 1 "Distributed Query": { "Job": { "Task Count": 1, @@ -3318,9 +3318,9 @@ SELECT * FROM a; "Parallel Aware": false, "Async Capable": false, "Relation Name": "test_subplans_570038", - "Alias": "test_subplans_570038", + "Alias": "test_subplans_570038" "Actual Rows": 1, - "Actual Loops": 1, + "Actual Loops": 1 "Plans": [ { "Node Type": "Result", @@ -3365,7 +3365,7 @@ SELECT * FROM a; "Parallel Aware": false, "Async Capable": false, "Function Name": "read_intermediate_result", - "Alias": "intermediate_result", + "Alias": "intermediate_result" "Actual Rows": 1, "Actual Loops": 1 }, diff --git a/src/test/regress/expected/multi_explain_0.out b/src/test/regress/expected/multi_explain_0.out index 60cd87316..3f3dcd52d 100644 --- a/src/test/regress/expected/multi_explain_0.out +++ b/src/test/regress/expected/multi_explain_0.out @@ -2179,7 +2179,7 @@ EXPLAIN (COSTS off, ANALYZE on, TIMING off, SUMMARY off, FORMAT JSON, BUFFERS OF "Parallel Aware": false, "Async Capable": false, "Actual Rows": 0, - "Actual Loops": 1, + "Actual Loops": 1 "Distributed Query": { "Job": { "Task Count": 2, @@ -2196,9 +2196,9 @@ EXPLAIN (COSTS off, ANALYZE on, TIMING off, SUMMARY off, FORMAT JSON, BUFFERS OF "Parallel Aware": false, "Async Capable": false, "Relation Name": "explain_pk_570013", - "Alias": "citus_table_alias", + "Alias": "citus_table_alias" "Actual Rows": 0, - "Actual Loops": 1, + "Actual Loops": 1 "Plans": [ { "Node Type": "Result", @@ -2235,7 +2235,7 @@ EXPLAIN (COSTS off, ANALYZE on, TIMING off, SUMMARY off, FORMAT JSON, BUFFERS OF "Parallel Aware": false, "Async Capable": false, "Actual Rows": 0, - "Actual Loops": 1, + "Actual Loops": 1 "Distributed Query": { "Job": { "Task Count": 4, @@ -2253,7 +2253,7 @@ EXPLAIN (COSTS off, ANALYZE on, TIMING off, SUMMARY off, FORMAT JSON, BUFFERS OF "Parallel Aware": false, "Async Capable": false, "Relation Name": "explain_pk_570013", - "Alias": "explain_pk", + "Alias": "explain_pk" "Actual Rows": 0, "Actual Loops": 1 }, @@ -3274,7 +3274,7 @@ SELECT * FROM a; "Parallel Aware": false, "Async Capable": false, "Actual Rows": 1, - "Actual Loops": 1, + "Actual Loops": 1 "Distributed Query": { "Subplans": [ { @@ -3288,7 +3288,7 @@ SELECT * FROM a; "Parallel Aware": false, "Async Capable": false, "Actual Rows": 1, - "Actual Loops": 1, + "Actual Loops": 1 "Distributed Query": { "Job": { "Task Count": 1, @@ -3307,9 +3307,9 @@ SELECT * FROM a; "Parallel Aware": false, "Async Capable": false, "Relation Name": "test_subplans_570038", - "Alias": "test_subplans_570038", + "Alias": "test_subplans_570038" "Actual Rows": 1, - "Actual Loops": 1, + "Actual Loops": 1 "Plans": [ { "Node Type": "Result", @@ -3354,7 +3354,7 @@ SELECT * FROM a; "Parallel Aware": false, "Async Capable": false, "Function Name": "read_intermediate_result", - "Alias": "intermediate_result", + "Alias": "intermediate_result" "Actual Rows": 1, "Actual Loops": 1 }, diff --git a/src/test/regress/expected/pg17.out b/src/test/regress/expected/pg17.out index b93e790b0..ddfb469a1 100644 --- a/src/test/regress/expected/pg17.out +++ b/src/test/regress/expected/pg17.out @@ -2169,7 +2169,7 @@ CONTEXT: PL/pgSQL function public.explain_filter(text,boolean) line XX at FOR o "Actual Startup Time": N.N, + "Actual Total Time": N.N, + "Actual Rows": N, + - "Actual Loops": N, + + "Actual Loops": N + "Distributed Query": { + "Job": { + "Task Count": N, + @@ -2187,7 +2187,7 @@ CONTEXT: PL/pgSQL function public.explain_filter(text,boolean) line XX at FOR o "Parallel Aware": false, + "Async Capable": false, + "Relation Name": "int8_tbl_12242024", + - "Alias": "i8", + + "Alias": "i8" + "Startup Cost": N.N, + "Total Cost": N.N, + "Plan Rows": N, +