From 4f668ad38b8502e0f1ae553120c649a11078a36b Mon Sep 17 00:00:00 2001 From: Onder Kalaci Date: Fri, 11 Aug 2017 14:05:48 +0300 Subject: [PATCH] Make the test outputs consistent by using VACUUM ANALYZE on the tables. --- ...olation_distributed_deadlock_detection.out | 34 +++++++++---------- src/test/regress/expected/multi_view.out | 1 + src/test/regress/sql/multi_view.sql | 2 ++ 3 files changed, 20 insertions(+), 17 deletions(-) diff --git a/src/test/regress/expected/isolation_distributed_deadlock_detection.out b/src/test/regress/expected/isolation_distributed_deadlock_detection.out index 0d21c17e6..10b86be22 100644 --- a/src/test/regress/expected/isolation_distributed_deadlock_detection.out +++ b/src/test/regress/expected/isolation_distributed_deadlock_detection.out @@ -33,7 +33,7 @@ check_distributed_deadlocks t step s2-update-1: <... completed> step s1-update-2: <... completed> -error in steps deadlock-checker-call s2-update-1 s1-update-2: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s2-update-1 s1-update-2: ERROR: canceling the transaction since it has involved in a distributed deadlock step s1-finish: COMMIT; @@ -74,7 +74,7 @@ check_distributed_deadlocks t step s2-update-1-rep-2: <... completed> step s1-update-2-rep-2: <... completed> -error in steps deadlock-checker-call s2-update-1-rep-2 s1-update-2-rep-2: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s2-update-1-rep-2 s1-update-2-rep-2: ERROR: canceling the transaction since it has involved in a distributed deadlock step s1-finish: COMMIT; @@ -121,7 +121,7 @@ check_distributed_deadlocks t step s2-update-1: <... completed> step s1-update-2: <... completed> -error in steps deadlock-checker-call s2-update-1 s1-update-2: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s2-update-1 s1-update-2: ERROR: canceling the transaction since it has involved in a distributed deadlock step s1-finish: COMMIT; @@ -162,7 +162,7 @@ check_distributed_deadlocks t step s1-update-2: <... completed> step s2-upsert-select-all: <... completed> -error in steps deadlock-checker-call s1-update-2 s2-upsert-select-all: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s1-update-2 s2-upsert-select-all: ERROR: canceling the transaction since it has involved in a distributed deadlock step s1-finish: COMMIT; @@ -203,7 +203,7 @@ check_distributed_deadlocks t step s1-update-2: <... completed> step s2-ddl: <... completed> -error in steps deadlock-checker-call s1-update-2 s2-ddl: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s1-update-2 s2-ddl: ERROR: canceling the transaction since it has involved in a distributed deadlock step s1-finish: COMMIT; @@ -238,7 +238,7 @@ check_distributed_deadlocks t step s2-insert-dist-10: <... completed> step s1-insert-local-10: <... completed> -error in steps deadlock-checker-call s2-insert-dist-10 s1-insert-local-10: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s2-insert-dist-10 s1-insert-local-10: ERROR: canceling the transaction since it has involved in a distributed deadlock step s1-finish: COMMIT; @@ -273,7 +273,7 @@ check_distributed_deadlocks t step s2-insert-ref-11: <... completed> step s1-insert-ref-10: <... completed> -error in steps deadlock-checker-call s2-insert-ref-11 s1-insert-ref-10: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s2-insert-ref-11 s1-insert-ref-10: ERROR: canceling the transaction since it has involved in a distributed deadlock step s1-finish: COMMIT; @@ -314,7 +314,7 @@ check_distributed_deadlocks t step s2-update-1: <... completed> step s1-insert-ref-10: <... completed> -error in steps deadlock-checker-call s2-update-1 s1-insert-ref-10: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s2-update-1 s1-insert-ref-10: ERROR: canceling the transaction since it has involved in a distributed deadlock step s1-finish: COMMIT; @@ -364,7 +364,7 @@ check_distributed_deadlocks t step s2-update-3: <... completed> step s3-update-1: <... completed> -error in steps deadlock-checker-call s2-update-3 s3-update-1: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s2-update-3 s3-update-1: ERROR: canceling the transaction since it has involved in a distributed deadlock step s3-finish: COMMIT; @@ -418,7 +418,7 @@ check_distributed_deadlocks t step s3-update-2: <... completed> step s2-update-3: <... completed> -error in steps deadlock-checker-call s3-update-2 s2-update-3: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s3-update-2 s2-update-3: ERROR: canceling the transaction since it has involved in a distributed deadlock step s3-finish: COMMIT; @@ -475,7 +475,7 @@ check_distributed_deadlocks t step s3-update-2: <... completed> step s2-update-3: <... completed> -error in steps deadlock-checker-call s3-update-2 s2-update-3: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s3-update-2 s2-update-3: ERROR: canceling the transaction since it has involved in a distributed deadlock step s3-finish: COMMIT; @@ -534,7 +534,7 @@ check_distributed_deadlocks t step s2-update-3: <... completed> step s3-update-2: <... completed> -error in steps deadlock-checker-call s2-update-3 s3-update-2: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s2-update-3 s3-update-2: ERROR: canceling the transaction since it has involved in a distributed deadlock step s3-finish: COMMIT; @@ -591,7 +591,7 @@ check_distributed_deadlocks t step s4-update-1: <... completed> step s1-update-4: <... completed> -error in steps deadlock-checker-call s4-update-1 s1-update-4: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s4-update-1 s1-update-4: ERROR: canceling the transaction since it has involved in a distributed deadlock step s1-finish: COMMIT; @@ -609,7 +609,7 @@ check_distributed_deadlocks t step s3-update-2: <... completed> step s2-update-3: <... completed> -error in steps deadlock-checker-call s3-update-2 s2-update-3: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s3-update-2 s2-update-3: ERROR: canceling the transaction since it has involved in a distributed deadlock step s2-finish: COMMIT; @@ -680,7 +680,7 @@ check_distributed_deadlocks t step s1-update-5: <... completed> step s5-update-1: <... completed> -error in steps deadlock-checker-call s1-update-5 s5-update-1: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s1-update-5 s5-update-1: ERROR: canceling the transaction since it has involved in a distributed deadlock step s1-finish: COMMIT; @@ -765,7 +765,7 @@ check_distributed_deadlocks t step s2-update-2: <... completed> step s3-update-3: <... completed> -error in steps deadlock-checker-call s2-update-2 s3-update-3: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s2-update-2 s3-update-3: ERROR: canceling the transaction since it has involved in a distributed deadlock step s6-finish: COMMIT; @@ -851,7 +851,7 @@ check_distributed_deadlocks t step s5-update-6: <... completed> step s6-update-5: <... completed> -error in steps deadlock-checker-call s5-update-6 s6-update-5: ERROR: distributed deadlock detected and to resolve the deadlock this transaction is cancelled +error in steps deadlock-checker-call s5-update-6 s6-update-5: ERROR: canceling the transaction since it has involved in a distributed deadlock step s5-finish: COMMIT; diff --git a/src/test/regress/expected/multi_view.out b/src/test/regress/expected/multi_view.out index a1a5822dc..2438fabf7 100644 --- a/src/test/regress/expected/multi_view.out +++ b/src/test/regress/expected/multi_view.out @@ -798,6 +798,7 @@ SELECT et.* FROM recent_10_users JOIN events_table et USING(user_id) ORDER BY et (10 rows) RESET citus.subquery_pushdown; +VACUUM ANALYZE users_table; -- explain tests EXPLAIN (COSTS FALSE) SELECT user_id FROM recent_selected_users GROUP BY 1 ORDER BY 1; QUERY PLAN diff --git a/src/test/regress/sql/multi_view.sql b/src/test/regress/sql/multi_view.sql index 05dab5fd8..347c2ee37 100644 --- a/src/test/regress/sql/multi_view.sql +++ b/src/test/regress/sql/multi_view.sql @@ -375,6 +375,8 @@ SELECT et.* FROM recent_10_users JOIN events_table et USING(user_id) ORDER BY et RESET citus.subquery_pushdown; +VACUUM ANALYZE users_table; + -- explain tests EXPLAIN (COSTS FALSE) SELECT user_id FROM recent_selected_users GROUP BY 1 ORDER BY 1;