style

src/test/regress/citus_tests/upgrade/citus_upgrade_test.py

@@ -92,7 +92,6 @@ def run_citus_upgrade_tests(config, before_upgrade_schedule, after_upgrade_sched
 
 
 def get_citus_catalog_info(config):
-
     results = {}
     # Store GUCs
     guc_results = utils.psql_capture(
@@ -258,7 +257,6 @@ def compare_citus_catalog_info(config, pre_upgrade):
 
 
 def find_compatible_udf_signature(full_args, return_type, post_signatures):
-
     pre_args_list = [arg.strip() for arg in full_args.split(",") if arg.strip()]
 
     for post_full_args, post_return_type in post_signatures:

src/test/regress/expected/multi_explain.out

@@ -524,17 +524,17 @@ EXPLAIN (COSTS FALSE, ANALYZE TRUE, TIMING FALSE, SUMMARY FALSE, BUFFERS OFF)
 	UPDATE lineitem
 	SET l_suppkey = 12
 	WHERE l_orderkey = 1 AND l_partkey = 0
-	', true);
-Custom Scan (Citus Adaptive) (actual rows=0 loops=1)
-  Task Count: 1
+	');
+Custom Scan (Citus Adaptive) (actual rows=N loops=N)
+  Task Count: N
   Tasks Shown: All
   ->  Task
-        Node: host=localhost port=xxxxx dbname=regression
-        ->  Update on lineitem_360000 lineitem (actual rows=0 loops=1)
-              ->  Index Scan using lineitem_pkey_360000 on lineitem_360000 lineitem (actual rows=0 loops=1)
-                    Index Cond: (l_orderkey = 1)
-                    Filter: (l_partkey = 0)
-                    Rows Removed by Filter: 6
+        Node: host=localhost port=N dbname=regression
+        ->  Update on lineitem_360000 lineitem (actual rows=N loops=N)
+              ->  Index Scan using lineitem_pkey_360000 on lineitem_360000 lineitem (actual rows=N loops=N)
+                    Index Cond: (l_orderkey = N)
+                    Filter: (l_partkey = N)
+                    Rows Removed by Filter: N
 ROLLBACk;
 -- Test delete
 EXPLAIN (COSTS FALSE)
@@ -1389,16 +1389,16 @@ Custom Scan (Citus Adaptive)  (cost=0.00..0.00 rows=0 width=0)
         Node: host=localhost port=xxxxx dbname=regression
         ->  Index Scan using lineitem_pkey_360000 on lineitem_360000 lineitem  (cost=0.28..13.60 rows=4 width=5)
               Index Cond: (l_orderkey = 5)
-select public.explain_filter('EXPLAIN (ANALYZE ON, COSTS OFF, TIMING OFF, SUMMARY OFF, BUFFERS OFF) EXECUTE router_executor_query_param(5)', true);
-Custom Scan (Citus Adaptive) (actual rows=3 loops=1)
-  Task Count: 1
-  Tuple data received from nodes: 30 bytes
+select public.explain_filter('EXPLAIN (ANALYZE ON, COSTS OFF, TIMING OFF, SUMMARY OFF, BUFFERS OFF) EXECUTE router_executor_query_param(5)');
+Custom Scan (Citus Adaptive) (actual rows=N loops=N)
+  Task Count: N
+  Tuple data received from nodes: N bytes
   Tasks Shown: All
   ->  Task
-        Tuple data received from node: 30 bytes
-        Node: host=localhost port=xxxxx dbname=regression
-        ->  Index Scan using lineitem_pkey_360000 on lineitem_360000 lineitem (actual rows=3 loops=1)
-              Index Cond: (l_orderkey = 5)
+        Tuple data received from node: N bytes
+        Node: host=localhost port=N dbname=regression
+        ->  Index Scan using lineitem_pkey_360000 on lineitem_360000 lineitem (actual rows=N loops=N)
+              Index Cond: (l_orderkey = N)
 \set VERBOSITY TERSE
 PREPARE multi_shard_query_param(int) AS UPDATE lineitem SET l_quantity = $1;
 BEGIN;

src/test/regress/expected/multi_explain_0.out

@@ -524,17 +524,17 @@ EXPLAIN (COSTS FALSE, ANALYZE TRUE, TIMING FALSE, SUMMARY FALSE, BUFFERS OFF)
 	UPDATE lineitem
 	SET l_suppkey = 12
 	WHERE l_orderkey = 1 AND l_partkey = 0
-	', true);
-Custom Scan (Citus Adaptive) (actual rows=0 loops=1)
-  Task Count: 1
+	');
+Custom Scan (Citus Adaptive) (actual rows=N loops=N)
+  Task Count: N
   Tasks Shown: All
   ->  Task
-        Node: host=localhost port=xxxxx dbname=regression
-        ->  Update on lineitem_360000 lineitem (actual rows=0 loops=1)
-              ->  Index Scan using lineitem_pkey_360000 on lineitem_360000 lineitem (actual rows=0 loops=1)
-                    Index Cond: (l_orderkey = 1)
-                    Filter: (l_partkey = 0)
-                    Rows Removed by Filter: 6
+        Node: host=localhost port=N dbname=regression
+        ->  Update on lineitem_360000 lineitem (actual rows=N loops=N)
+              ->  Index Scan using lineitem_pkey_360000 on lineitem_360000 lineitem (actual rows=N loops=N)
+                    Index Cond: (l_orderkey = N)
+                    Filter: (l_partkey = N)
+                    Rows Removed by Filter: N
 ROLLBACk;
 -- Test delete
 EXPLAIN (COSTS FALSE)
@@ -1389,16 +1389,16 @@ Custom Scan (Citus Adaptive)  (cost=0.00..0.00 rows=0 width=0)
         Node: host=localhost port=xxxxx dbname=regression
         ->  Index Scan using lineitem_pkey_360000 on lineitem_360000 lineitem  (cost=0.28..13.60 rows=4 width=5)
               Index Cond: (l_orderkey = 5)
-select public.explain_filter('EXPLAIN (ANALYZE ON, COSTS OFF, TIMING OFF, SUMMARY OFF, BUFFERS OFF) EXECUTE router_executor_query_param(5)', true);
-Custom Scan (Citus Adaptive) (actual rows=3 loops=1)
-  Task Count: 1
-  Tuple data received from nodes: 30 bytes
+select public.explain_filter('EXPLAIN (ANALYZE ON, COSTS OFF, TIMING OFF, SUMMARY OFF, BUFFERS OFF) EXECUTE router_executor_query_param(5)');
+Custom Scan (Citus Adaptive) (actual rows=N loops=N)
+  Task Count: N
+  Tuple data received from nodes: N bytes
   Tasks Shown: All
   ->  Task
-        Tuple data received from node: 30 bytes
-        Node: host=localhost port=xxxxx dbname=regression
-        ->  Index Scan using lineitem_pkey_360000 on lineitem_360000 lineitem (actual rows=3 loops=1)
-              Index Cond: (l_orderkey = 5)
+        Tuple data received from node: N bytes
+        Node: host=localhost port=N dbname=regression
+        ->  Index Scan using lineitem_pkey_360000 on lineitem_360000 lineitem (actual rows=N loops=N)
+              Index Cond: (l_orderkey = N)
 \set VERBOSITY TERSE
 PREPARE multi_shard_query_param(int) AS UPDATE lineitem SET l_quantity = $1;
 BEGIN;

src/test/regress/sql/multi_explain.sql

@@ -189,7 +189,7 @@ EXPLAIN (COSTS FALSE, ANALYZE TRUE, TIMING FALSE, SUMMARY FALSE, BUFFERS OFF)
 	UPDATE lineitem
 	SET l_suppkey = 12
 	WHERE l_orderkey = 1 AND l_partkey = 0
-	', true);
+	');
 ROLLBACk;
 
 -- Test delete
@@ -599,7 +599,7 @@ EXPLAIN (COSTS FALSE) EXECUTE real_time_executor_query;
 -- at least make sure to fail without crashing
 PREPARE router_executor_query_param(int) AS SELECT l_quantity FROM lineitem WHERE l_orderkey = $1;
 EXPLAIN EXECUTE router_executor_query_param(5);
-select public.explain_filter('EXPLAIN (ANALYZE ON, COSTS OFF, TIMING OFF, SUMMARY OFF, BUFFERS OFF) EXECUTE router_executor_query_param(5)', true);
+select public.explain_filter('EXPLAIN (ANALYZE ON, COSTS OFF, TIMING OFF, SUMMARY OFF, BUFFERS OFF) EXECUTE router_executor_query_param(5)');
 
 \set VERBOSITY TERSE
 PREPARE multi_shard_query_param(int) AS UPDATE lineitem SET l_quantity = $1;