From 4b14347fc321cf51f8dc774e0fa78d0c04998a50 Mon Sep 17 00:00:00 2001
From: Hadi Moshayedi <hadi@moshayedi.net>
Date: Mon, 13 Jan 2020 17:17:44 -0800
Subject: [PATCH] Tests for DML followed by insert/select repartition

---
 .../expected/insert_select_repartition.out    | 74 ++++++++++++++++++-
 .../regress/sql/insert_select_repartition.sql | 35 ++++++++-
 2 files changed, 107 insertions(+), 2 deletions(-)

diff --git a/src/test/regress/expected/insert_select_repartition.out b/src/test/regress/expected/insert_select_repartition.out
index 68d1f9271..1107aa8a3 100644
--- a/src/test/regress/expected/insert_select_repartition.out
+++ b/src/test/regress/expected/insert_select_repartition.out
@@ -305,7 +305,7 @@ SELECT * FROM target_table ORDER BY a;
 (4 rows)
 
 --
--- repartitioned INSERT/SELECT followed by other DML in stame transaction
+-- repartitioned INSERT/SELECT followed/preceded by other DML in same transaction
 --
 -- case 1. followed by DELETE
 TRUNCATE target_table;
@@ -406,5 +406,77 @@ SELECT * FROM target_table ORDER BY a;
  -1 | {1,2,3}
 (8 rows)
 
+-- case 5. preceded by DELETE
+TRUNCATE target_table;
+BEGIN;
+DELETE FROM target_table;
+INSERT INTO target_table SELECT mapped_key, c FROM source_table;
+END;
+SELECT * FROM target_table ORDER BY a;
+ a  |    b
+---------------------------------------------------------------------
+ -4 | {3}
+ -3 | {}
+ -2 | {4,6}
+ -1 | {1,2,3}
+(4 rows)
+
+-- case 6. preceded by UPDATE
+TRUNCATE target_table;
+BEGIN;
+UPDATE target_table SET b=array_append(b, a);
+INSERT INTO target_table SELECT mapped_key, c FROM source_table;
+END;
+SELECT * FROM target_table ORDER BY a;
+ a  |    b
+---------------------------------------------------------------------
+ -4 | {3}
+ -3 | {}
+ -2 | {4,6}
+ -1 | {1,2,3}
+(4 rows)
+
+-- case 7. preceded by multi-row INSERT
+TRUNCATE target_table;
+BEGIN;
+INSERT INTO target_table VALUES (-5, ARRAY[10,11]), (-6, ARRAY[11,12]), (-7, ARRAY[999]);
+INSERT INTO target_table SELECT mapped_key, c FROM source_table;
+END;
+SELECT * FROM target_table ORDER BY a;
+ a  |    b
+---------------------------------------------------------------------
+ -7 | {999}
+ -6 | {11,12}
+ -5 | {10,11}
+ -4 | {3}
+ -3 | {}
+ -2 | {4,6}
+ -1 | {1,2,3}
+(7 rows)
+
+-- case 8. preceded by distributed INSERT/SELECT
+TRUNCATE target_table;
+INSERT INTO target_table SELECT mapped_key, c FROM source_table;
+BEGIN;
+INSERT INTO target_table SELECT * FROM target_table;
+INSERT INTO target_table SELECT mapped_key, c FROM source_table;
+END;
+SELECT * FROM target_table ORDER BY a;
+ a  |    b
+---------------------------------------------------------------------
+ -4 | {3}
+ -4 | {3}
+ -4 | {3}
+ -3 | {}
+ -3 | {}
+ -3 | {}
+ -2 | {4,6}
+ -2 | {4,6}
+ -2 | {4,6}
+ -1 | {1,2,3}
+ -1 | {1,2,3}
+ -1 | {1,2,3}
+(12 rows)
+
 SET client_min_messages TO WARNING;
 DROP SCHEMA insert_select_repartition CASCADE;
diff --git a/src/test/regress/sql/insert_select_repartition.sql b/src/test/regress/sql/insert_select_repartition.sql
index db6cee7dd..6d296cf68 100644
--- a/src/test/regress/sql/insert_select_repartition.sql
+++ b/src/test/regress/sql/insert_select_repartition.sql
@@ -145,7 +145,7 @@ RESET client_min_messages;
 SELECT * FROM target_table ORDER BY a;
 
 --
--- repartitioned INSERT/SELECT followed by other DML in stame transaction
+-- repartitioned INSERT/SELECT followed/preceded by other DML in same transaction
 --
 
 -- case 1. followed by DELETE
@@ -184,5 +184,38 @@ INSERT INTO target_table SELECT * FROM target_table;
 END;
 SELECT * FROM target_table ORDER BY a;
 
+-- case 5. preceded by DELETE
+TRUNCATE target_table;
+BEGIN;
+DELETE FROM target_table;
+INSERT INTO target_table SELECT mapped_key, c FROM source_table;
+END;
+SELECT * FROM target_table ORDER BY a;
+
+-- case 6. preceded by UPDATE
+TRUNCATE target_table;
+BEGIN;
+UPDATE target_table SET b=array_append(b, a);
+INSERT INTO target_table SELECT mapped_key, c FROM source_table;
+END;
+SELECT * FROM target_table ORDER BY a;
+
+-- case 7. preceded by multi-row INSERT
+TRUNCATE target_table;
+BEGIN;
+INSERT INTO target_table VALUES (-5, ARRAY[10,11]), (-6, ARRAY[11,12]), (-7, ARRAY[999]);
+INSERT INTO target_table SELECT mapped_key, c FROM source_table;
+END;
+SELECT * FROM target_table ORDER BY a;
+
+-- case 8. preceded by distributed INSERT/SELECT
+TRUNCATE target_table;
+INSERT INTO target_table SELECT mapped_key, c FROM source_table;
+BEGIN;
+INSERT INTO target_table SELECT * FROM target_table;
+INSERT INTO target_table SELECT mapped_key, c FROM source_table;
+END;
+SELECT * FROM target_table ORDER BY a;
+
 SET client_min_messages TO WARNING;
 DROP SCHEMA insert_select_repartition CASCADE;