diff --git a/src/test/regress/expected/multi_explain.out b/src/test/regress/expected/multi_explain.out index beac2eef4..7eb3eb0d4 100644 --- a/src/test/regress/expected/multi_explain.out +++ b/src/test/regress/expected/multi_explain.out @@ -81,13 +81,11 @@ EXPLAIN (COSTS FALSE, FORMAT JSON) "Node Type": "Aggregate", "Strategy": "Hashed", "Partial Mode": "Simple", - "Parent Relationship": "Outer", "Parallel Aware": false, "Group Key": ["remote_scan.l_quantity"], "Plans": [ { "Node Type": "Custom Scan", - "Parent Relationship": "Outer", "Custom Plan Provider": "Citus Adaptive", "Parallel Aware": false, "Distributed Query": { @@ -109,7 +107,6 @@ EXPLAIN (COSTS FALSE, FORMAT JSON) "Plans": [ { "Node Type": "Seq Scan", - "Parent Relationship": "Outer", "Parallel Aware": false, "Relation Name": "lineitem_290000", "Alias": "lineitem" @@ -154,7 +151,6 @@ EXPLAIN (COSTS FALSE, FORMAT XML) Aggregate Hashed Simple - Outer false remote_scan.l_quantity @@ -162,7 +158,6 @@ EXPLAIN (COSTS FALSE, FORMAT XML) Custom Scan - Outer Citus Adaptive false @@ -186,7 +181,6 @@ EXPLAIN (COSTS FALSE, FORMAT XML) Seq Scan - Outer false lineitem_290000 lineitem @@ -226,13 +220,11 @@ EXPLAIN (COSTS FALSE, FORMAT YAML) - Node Type: "Aggregate" Strategy: "Hashed" Partial Mode: "Simple" - Parent Relationship: "Outer" Parallel Aware: false Group Key: - "remote_scan.l_quantity" Plans: - Node Type: "Custom Scan" - Parent Relationship: "Outer" Custom Plan Provider: "Citus Adaptive" Parallel Aware: false Distributed Query: @@ -251,7 +243,6 @@ EXPLAIN (COSTS FALSE, FORMAT YAML) - "l_quantity" Plans: - Node Type: "Seq Scan" - Parent Relationship: "Outer" Parallel Aware: false Relation Name: "lineitem_290000" Alias: "lineitem" @@ -1093,7 +1084,6 @@ EXPLAIN (COSTS FALSE, FORMAT JSON) "Plans": [ { "Node Type": "Custom Scan", - "Parent Relationship": "Outer", "Custom Plan Provider": "Citus Adaptive", "Parallel Aware": false, "Distributed Query": { @@ -1142,7 +1132,6 @@ EXPLAIN (COSTS FALSE, FORMAT XML) Custom Scan - Outer Citus Adaptive false @@ -1201,7 +1190,6 @@ EXPLAIN (COSTS FALSE, FORMAT YAML) Parallel Aware: false Plans: - Node Type: "Custom Scan" - Parent Relationship: "Outer" Custom Plan Provider: "Citus Adaptive" Parallel Aware: false Distributed Query: @@ -1284,14 +1272,14 @@ Custom Scan (Citus Adaptive) (actual rows=3 loops=1) \set VERBOSITY TERSE PREPARE multi_shard_query_param(int) AS UPDATE lineitem SET l_quantity = $1; BEGIN; -EXPLAIN EXECUTE multi_shard_query_param(5); -Custom Scan (Citus Adaptive) (cost=0.00..0.00 rows=0 width=0) +EXPLAIN (COSTS OFF) EXECUTE multi_shard_query_param(5); +Custom Scan (Citus Adaptive) Task Count: 2 Tasks Shown: One of 2 -> Task Node: host=localhost port=xxxxx dbname=regression - -> Update on lineitem_290000 lineitem (cost=0.00..176.00 rows=6000 width=140) - -> Seq Scan on lineitem_290000 lineitem (cost=0.00..176.00 rows=6000 width=140) + -> Update on lineitem_290000 lineitem + -> Seq Scan on lineitem_290000 lineitem ROLLBACK; BEGIN; EXPLAIN (ANALYZE ON, COSTS OFF, TIMING OFF, SUMMARY OFF) EXECUTE multi_shard_query_param(5); @@ -2078,7 +2066,6 @@ EXPLAIN (COSTS off, ANALYZE on, TIMING off, SUMMARY off, FORMAT JSON) INSERT INT "Plans": [ { "Node Type": "Result", - "Parent Relationship": "Member", "Parallel Aware": false, "Actual Rows": 1, "Actual Loops": 1 @@ -2176,7 +2163,6 @@ EXPLAIN (COSTS off, ANALYZE on, TIMING off, SUMMARY off, FORMAT XML) INSERT INTO Result - Member false 1 1 @@ -2784,14 +2770,14 @@ Custom Scan (Citus Adaptive) (actual rows=0 loops=1) deallocate update_query; -- prepared deletes PREPARE delete_query AS DELETE FROM simple WHERE name=$1 OR name=$2; -EXPLAIN EXECUTE delete_query('x', 'y'); -Custom Scan (Citus Adaptive) (cost=0.00..0.00 rows=0 width=0) +EXPLAIN (COSTS OFF) EXECUTE delete_query('x', 'y'); +Custom Scan (Citus Adaptive) Task Count: 2 Tasks Shown: One of 2 -> Task Node: host=localhost port=xxxxx dbname=regression - -> Delete on simple_570026 simple (cost=0.00..29.05 rows=13 width=6) - -> Seq Scan on simple_570026 simple (cost=0.00..29.05 rows=13 width=6) + -> Delete on simple_570026 simple + -> Seq Scan on simple_570026 simple Filter: ((name = 'x'::text) OR (name = 'y'::text)) EXPLAIN :default_analyze_flags EXECUTE delete_query('x', 'y'); Custom Scan (Citus Adaptive) (actual rows=0 loops=1) diff --git a/src/test/regress/sql/multi_explain.sql b/src/test/regress/sql/multi_explain.sql index 1840fa208..d58477f72 100644 --- a/src/test/regress/sql/multi_explain.sql +++ b/src/test/regress/sql/multi_explain.sql @@ -539,7 +539,7 @@ EXPLAIN (ANALYZE ON, COSTS OFF, TIMING OFF, SUMMARY OFF) EXECUTE router_executor \set VERBOSITY TERSE PREPARE multi_shard_query_param(int) AS UPDATE lineitem SET l_quantity = $1; BEGIN; -EXPLAIN EXECUTE multi_shard_query_param(5); +EXPLAIN (COSTS OFF) EXECUTE multi_shard_query_param(5); ROLLBACK; BEGIN; EXPLAIN (ANALYZE ON, COSTS OFF, TIMING OFF, SUMMARY OFF) EXECUTE multi_shard_query_param(5); @@ -990,7 +990,7 @@ deallocate update_query; -- prepared deletes PREPARE delete_query AS DELETE FROM simple WHERE name=$1 OR name=$2; -EXPLAIN EXECUTE delete_query('x', 'y'); +EXPLAIN (COSTS OFF) EXECUTE delete_query('x', 'y'); EXPLAIN :default_analyze_flags EXECUTE delete_query('x', 'y'); deallocate delete_query;