From 3a1ff0eae5a4e2bb8a23aadd24a8c1c6525cab46 Mon Sep 17 00:00:00 2001
From: paragjain <paragikjain786@gmail.com>
Date: Sat, 13 Jul 2024 08:51:18 +0000
Subject: [PATCH] removing flakyness

---
 src/test/regress/bin/normalize.sed        | 1 +
 src/test/regress/expected/merge_vcore.out | 9 +++++----
 src/test/regress/sql/merge_vcore.sql      | 7 ++++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/test/regress/bin/normalize.sed b/src/test/regress/bin/normalize.sed
index fb51bdc33..2dc5d6e88 100644
--- a/src/test/regress/bin/normalize.sed
+++ b/src/test/regress/bin/normalize.sed
@@ -32,6 +32,7 @@ s/"t2_[0-9]+"/"t2_xxxxxxx"/g
 # shard table names for MERGE tests
 s/merge_schema\.([_a-z0-9]+)_40[0-9]+ /merge_schema.\1_xxxxxxx /g
 s/pgmerge_schema\.([_a-z0-9]+)_40[0-9]+ /pgmerge_schema.\1_xxxxxxx /g
+s/merge_vcore_schema\.([_a-z0-9]+)_40[0-9]+ /pgmerge_schema.\1_xxxxxxx /g
 
 # shard table names for multi_subquery
 s/ keyval(1|2|ref)_[0-9]+ / keyval\1_xxxxxxx /g
diff --git a/src/test/regress/expected/merge_vcore.out b/src/test/regress/expected/merge_vcore.out
index 64d50079b..03f6f8820 100644
--- a/src/test/regress/expected/merge_vcore.out
+++ b/src/test/regress/expected/merge_vcore.out
@@ -6,15 +6,15 @@ SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15
 \q
 \endif
 -- MERGE command performs a join from data_source to target_table_name
-DROP SCHEMA IF EXISTS merge_schema CASCADE;
-NOTICE:  schema "merge_schema" does not exist, skipping
+DROP SCHEMA IF EXISTS merge_vcore_schema CASCADE;
+NOTICE:  schema "merge_vcore_schema" does not exist, skipping
 --MERGE INTO target
 --USING source
 --WHEN NOT MATCHED
 --WHEN MATCHED AND <condition>
 --WHEN MATCHED
-CREATE SCHEMA merge_schema;
-SET search_path TO merge_schema;
+CREATE SCHEMA merge_vcore_schema;
+SET search_path TO merge_vcore_schema;
 SET citus.shard_count TO 4;
 SET citus.next_shard_id TO 4000000;
 SET citus.explain_all_tasks TO true;
@@ -478,3 +478,4 @@ WHEN MATCHED THEN DO NOTHING;
 
 DROP TABLE IF EXISTS source;
 DROP TABLE IF EXISTS target;
+DROP SCHEMA IF EXISTS merge_vcore_schema CASCADE;
diff --git a/src/test/regress/sql/merge_vcore.sql b/src/test/regress/sql/merge_vcore.sql
index 77ee81e8d..1f0982f03 100644
--- a/src/test/regress/sql/merge_vcore.sql
+++ b/src/test/regress/sql/merge_vcore.sql
@@ -7,15 +7,15 @@ SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15
 \endif
 
 -- MERGE command performs a join from data_source to target_table_name
-DROP SCHEMA IF EXISTS merge_schema CASCADE;
+DROP SCHEMA IF EXISTS merge_vcore_schema CASCADE;
 --MERGE INTO target
 --USING source
 --WHEN NOT MATCHED
 --WHEN MATCHED AND <condition>
 --WHEN MATCHED
 
-CREATE SCHEMA merge_schema;
-SET search_path TO merge_schema;
+CREATE SCHEMA merge_vcore_schema;
+SET search_path TO merge_vcore_schema;
 SET citus.shard_count TO 4;
 SET citus.next_shard_id TO 4000000;
 SET citus.explain_all_tasks TO true;
@@ -311,3 +311,4 @@ WHEN MATCHED THEN DO NOTHING;
 
 DROP TABLE IF EXISTS source;
 DROP TABLE IF EXISTS target;
+DROP SCHEMA IF EXISTS merge_vcore_schema CASCADE;