external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

removing flakyness

pull/7643/head
paragjain 2024-07-13 08:51:18 +00:00
parent 9243b5992b
commit 3a1ff0eae5
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/test/regress/bin/normalize.sed
View File

@ -32,6 +32,7 @@ s/"t2_[0-9]+"/"t2_xxxxxxx"/g
# shard table names for MERGE tests # shard table names for MERGE tests
s/merge_schema\.([_a-z0-9]+)_40[0-9]+ /merge_schema.\1_xxxxxxx /g 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/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 # shard table names for multi_subquery
s/ keyval(1|2|ref)_[0-9]+ / keyval\1_xxxxxxx /g s/ keyval(1|2|ref)_[0-9]+ / keyval\1_xxxxxxx /g

9
src/test/regress/expected/merge_vcore.out
View File

@ -6,15 +6,15 @@ SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15
\q \q
\endif \endif
-- MERGE command performs a join from data_source to target_table_name -- 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;
NOTICE: schema "merge_schema" does not exist, skipping NOTICE: schema "merge_vcore_schema" does not exist, skipping
--MERGE INTO target --MERGE INTO target
--USING source --USING source
--WHEN NOT MATCHED --WHEN NOT MATCHED
--WHEN MATCHED AND <condition> --WHEN MATCHED AND <condition>
--WHEN MATCHED --WHEN MATCHED
CREATE SCHEMA merge_schema; CREATE SCHEMA merge_vcore_schema;
SET search_path TO merge_schema; SET search_path TO merge_vcore_schema;
SET citus.shard_count TO 4; SET citus.shard_count TO 4;
SET citus.next_shard_id TO 4000000; SET citus.next_shard_id TO 4000000;
SET citus.explain_all_tasks TO true; 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 source;
DROP TABLE IF EXISTS target; DROP TABLE IF EXISTS target;
DROP SCHEMA IF EXISTS merge_vcore_schema CASCADE;

7
src/test/regress/sql/merge_vcore.sql
View File

@ -7,15 +7,15 @@ SELECT substring(:'server_version', '\d+')::int >= 15 AS server_version_ge_15
\endif \endif
-- MERGE command performs a join from data_source to target_table_name -- 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 --MERGE INTO target
--USING source --USING source
--WHEN NOT MATCHED --WHEN NOT MATCHED
--WHEN MATCHED AND <condition> --WHEN MATCHED AND <condition>
--WHEN MATCHED --WHEN MATCHED
CREATE SCHEMA merge_schema; CREATE SCHEMA merge_vcore_schema;
SET search_path TO merge_schema; SET search_path TO merge_vcore_schema;
SET citus.shard_count TO 4; SET citus.shard_count TO 4;
SET citus.next_shard_id TO 4000000; SET citus.next_shard_id TO 4000000;
SET citus.explain_all_tasks TO true; 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 source;
DROP TABLE IF EXISTS target; DROP TABLE IF EXISTS target;
DROP SCHEMA IF EXISTS merge_vcore_schema CASCADE;