From 37026dc3513b615c8e813955f479d394fc40af49 Mon Sep 17 00:00:00 2001
From: Metin Doslu <metin@citusdata.com>
Date: Mon, 8 May 2017 17:07:03 +0300
Subject: [PATCH] Add truncate first isolation tests

---
 .../expected/isolation_drop_shards.out        | 80 +++++++++++++++++++
 .../regress/specs/isolation_drop_shards.spec  | 15 +++-
 2 files changed, 92 insertions(+), 3 deletions(-)

diff --git a/src/test/regress/expected/isolation_drop_shards.out b/src/test/regress/expected/isolation_drop_shards.out
index ba571371a..d007f502c 100644
--- a/src/test/regress/expected/isolation_drop_shards.out
+++ b/src/test/regress/expected/isolation_drop_shards.out
@@ -160,3 +160,83 @@ step s2-drop-all-shards: <... completed>
 master_drop_all_shards
 
 0              
+
+starting permutation: s1-begin s1-truncate s2-truncate s1-commit
+?column?       
+
+1              
+step s1-begin: 
+	BEGIN;
+
+step s1-truncate: 
+	TRUNCATE append_table;
+
+step s2-truncate: 
+	TRUNCATE append_table;
+ <waiting ...>
+step s1-commit: 
+	COMMIT;
+
+step s2-truncate: <... completed>
+
+starting permutation: s1-begin s1-truncate s2-apply-delete-command s1-commit
+?column?       
+
+1              
+step s1-begin: 
+	BEGIN;
+
+step s1-truncate: 
+	TRUNCATE append_table;
+
+step s2-apply-delete-command: 
+	SELECT master_apply_delete_command('DELETE FROM append_table');
+ <waiting ...>
+step s1-commit: 
+	COMMIT;
+
+step s2-apply-delete-command: <... completed>
+master_apply_delete_command
+
+0              
+
+starting permutation: s1-begin s1-truncate s2-drop-all-shards s1-commit
+?column?       
+
+1              
+step s1-begin: 
+	BEGIN;
+
+step s1-truncate: 
+	TRUNCATE append_table;
+
+step s2-drop-all-shards: 
+	SELECT master_drop_all_shards('append_table', 'public', 'append_table');
+ <waiting ...>
+step s1-commit: 
+	COMMIT;
+
+step s2-drop-all-shards: <... completed>
+master_drop_all_shards
+
+0              
+
+starting permutation: s1-begin s1-truncate s2-select s1-commit
+?column?       
+
+1              
+step s1-begin: 
+	BEGIN;
+
+step s1-truncate: 
+	TRUNCATE append_table;
+
+step s2-select: 
+	SELECT * FROM append_table;
+ <waiting ...>
+step s1-commit: 
+	COMMIT;
+
+step s2-select: <... completed>
+test_id        data           
+
diff --git a/src/test/regress/specs/isolation_drop_shards.spec b/src/test/regress/specs/isolation_drop_shards.spec
index e57523718..fd9fce2d7 100644
--- a/src/test/regress/specs/isolation_drop_shards.spec
+++ b/src/test/regress/specs/isolation_drop_shards.spec
@@ -20,6 +20,11 @@ step "s1-begin"
 	BEGIN;
 }
 
+step "s1-truncate"
+{
+	TRUNCATE append_table;
+}
+
 step "s1-apply-delete-command"
 {
 	SELECT master_apply_delete_command('DELETE FROM append_table');
@@ -62,10 +67,14 @@ permutation "s1-begin" "s1-drop-all-shards" "s2-apply-delete-command" "s1-commit
 permutation "s1-begin" "s1-drop-all-shards" "s2-drop-all-shards" "s1-commit"
 permutation "s1-begin" "s1-drop-all-shards" "s2-select" "s1-commit"
 
+# We can't verify master_apply_delete_command + SELECT since it blocks on the
+# the workers, but this is not visible on the master, meaning the isolation
+# test cannot proceed.
 permutation "s1-begin" "s1-apply-delete-command" "s2-truncate" "s1-commit"
 permutation "s1-begin" "s1-apply-delete-command" "s2-apply-delete-command" "s1-commit"
 permutation "s1-begin" "s1-apply-delete-command" "s2-drop-all-shards" "s1-commit"
 
-# We can't verify master_apply_delete_command + SELECT since it blocks on the
-# the workers, but this is not visible on the master, meaning the isolation
-# test cannot proceed.
+permutation "s1-begin" "s1-truncate" "s2-truncate" "s1-commit"
+permutation "s1-begin" "s1-truncate" "s2-apply-delete-command" "s1-commit"
+permutation "s1-begin" "s1-truncate" "s2-drop-all-shards" "s1-commit"
+permutation "s1-begin" "s1-truncate" "s2-select" "s1-commit"