From 70e68d5312e1af0abcd5211a5bcfe1c530acd3f8 Mon Sep 17 00:00:00 2001
From: Halil Ozan Akgul <hozanakgul@gmail.com>
Date: Tue, 21 Dec 2021 14:19:10 +0300
Subject: [PATCH] Fix metadata sync fails on multi_name_lengths

---
 src/test/regress/expected/multi_name_lengths.out | 13 +++++++++----
 src/test/regress/multi_1_schedule                |  3 ---
 src/test/regress/sql/multi_name_lengths.sql      | 13 +++++++++----
 3 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/src/test/regress/expected/multi_name_lengths.out b/src/test/regress/expected/multi_name_lengths.out
index 5ef151042..e100ba7d8 100644
--- a/src/test/regress/expected/multi_name_lengths.out
+++ b/src/test/regress/expected/multi_name_lengths.out
@@ -219,8 +219,9 @@ NOTICE:  identifier "append_zero_shard_table_12345678901234567890123456789012345
 -- Verify that CREATE INDEX on already distributed table has proper shard names.
 CREATE INDEX tmp_idx_12345678901234567890123456789012345678901234567890 ON name_lengths(col2);
 \c - - :public_worker_1_host :worker_1_port
+SET citus.override_table_visibility TO FALSE;
 SELECT "relname", "Column", "Type", "Definition" FROM index_attrs WHERE
-    relname LIKE 'tmp_idx_%' ORDER BY 1 DESC, 2 DESC, 3 DESC, 4 DESC;
+    relname SIMILAR TO 'tmp_idx_%\_\d{6}' ORDER BY 1 DESC, 2 DESC, 3 DESC, 4 DESC;
                              relname                             | Column |  Type   | Definition
 ---------------------------------------------------------------------
  tmp_idx_123456789012345678901234567890123456789_5e470afa_225003 | col2   | integer | col2
@@ -237,8 +238,9 @@ ALTER INDEX tmp_idx_123456789012345678901234567890123456789012345678901234567890
 NOTICE:  identifier "tmp_idx_123456789012345678901234567890123456789012345678901234567890" will be truncated to "tmp_idx_1234567890123456789012345678901234567890123456789012345"
 NOTICE:  identifier "tmp_idx_newname_123456789012345678901234567890123456789012345678901234567890" will be truncated to "tmp_idx_newname_12345678901234567890123456789012345678901234567"
 \c - - :public_worker_1_host :worker_1_port
+SET citus.override_table_visibility TO FALSE;
 SELECT "relname", "Column", "Type", "Definition" FROM index_attrs WHERE
-    relname LIKE 'tmp_idx_%' ORDER BY 1 DESC, 2 DESC, 3 DESC, 4 DESC;
+    relname SIMILAR TO 'tmp_idx_%\_\d{6}' ORDER BY 1 DESC, 2 DESC, 3 DESC, 4 DESC;
                              relname                             | Column |  Type   | Definition
 ---------------------------------------------------------------------
  tmp_idx_newname_1234567890123456789012345678901_c54e849b_225003 | col2   | integer | col2
@@ -337,6 +339,7 @@ SELECT create_distributed_table('sneaky_name_lengths', 'col1', 'hash');
 (1 row)
 
 \c - - :public_worker_1_host :worker_1_port
+SET citus.override_table_visibility TO FALSE;
 SELECT c1.relname AS unique_index_name
 FROM pg_class c1
     JOIN pg_index i ON i.indexrelid = c1.oid
@@ -369,6 +372,7 @@ SELECT create_distributed_table('too_long_12345678901234567890123456789012345678
 (1 row)
 
 \c - - :public_worker_1_host :worker_1_port
+SET citus.override_table_visibility TO FALSE;
 \dt *225000000000*
                                       List of relations
  Schema |                              Name                               | Type  |  Owner
@@ -401,7 +405,8 @@ WHERE logicalrelid = U&'elephant_!0441!043B!043E!043D!0441!043B!043E!043D!0441!0
 (1 row)
 
 \c - - :public_worker_1_host :worker_1_port
-\dt public.elephant_*
+SET citus.override_table_visibility TO FALSE;
+\dt public.elephant_*[0-9]+
                               List of relations
  Schema |                      Name                       | Type  |  Owner
 ---------------------------------------------------------------------
@@ -409,7 +414,7 @@ WHERE logicalrelid = U&'elephant_!0441!043B!043E!043D!0441!043B!043E!043D!0441!0
  public | elephant_слонслонслонсло_c8b737c2_2250000000003 | table | postgres
 (2 rows)
 
-\di public.elephant_*
+\di public.elephant_*[0-9]+
                                                        List of relations
  Schema |                      Name                       | Type  |  Owner   |                      Table
 ---------------------------------------------------------------------
diff --git a/src/test/regress/multi_1_schedule b/src/test/regress/multi_1_schedule
index 6f181b608..1f00ca06d 100644
--- a/src/test/regress/multi_1_schedule
+++ b/src/test/regress/multi_1_schedule
@@ -36,10 +36,7 @@ test: alter_database_owner
 test: multi_test_catalog_views
 test: multi_table_ddl
 test: multi_sequence_default
-test: check_mx
-test: turn_mx_off
 test: multi_name_lengths
-test: turn_mx_on
 test: multi_name_resolution
 test: multi_metadata_access
 test: multi_metadata_attributes
diff --git a/src/test/regress/sql/multi_name_lengths.sql b/src/test/regress/sql/multi_name_lengths.sql
index 3328572d4..df0a68f33 100644
--- a/src/test/regress/sql/multi_name_lengths.sql
+++ b/src/test/regress/sql/multi_name_lengths.sql
@@ -163,8 +163,9 @@ CREATE INDEX append_zero_shard_table_idx_123456789012345678901234567890123456789
 CREATE INDEX tmp_idx_12345678901234567890123456789012345678901234567890 ON name_lengths(col2);
 
 \c - - :public_worker_1_host :worker_1_port
+SET citus.override_table_visibility TO FALSE;
 SELECT "relname", "Column", "Type", "Definition" FROM index_attrs WHERE
-    relname LIKE 'tmp_idx_%' ORDER BY 1 DESC, 2 DESC, 3 DESC, 4 DESC;
+    relname SIMILAR TO 'tmp_idx_%\_\d{6}' ORDER BY 1 DESC, 2 DESC, 3 DESC, 4 DESC;
 \c - - :master_host :master_port
 
 -- Verify that a new index name > 63 characters is auto-truncated
@@ -175,8 +176,9 @@ CREATE INDEX tmp_idx_12345678901234567890123456789012345678901234567890123456789
 ALTER INDEX tmp_idx_123456789012345678901234567890123456789012345678901234567890 RENAME TO tmp_idx_newname_123456789012345678901234567890123456789012345678901234567890;
 
 \c - - :public_worker_1_host :worker_1_port
+SET citus.override_table_visibility TO FALSE;
 SELECT "relname", "Column", "Type", "Definition" FROM index_attrs WHERE
-    relname LIKE 'tmp_idx_%' ORDER BY 1 DESC, 2 DESC, 3 DESC, 4 DESC;
+    relname SIMILAR TO 'tmp_idx_%\_\d{6}' ORDER BY 1 DESC, 2 DESC, 3 DESC, 4 DESC;
 \c - - :master_host :master_port
 
 SET citus.shard_count TO 2;
@@ -236,6 +238,7 @@ CREATE TABLE sneaky_name_lengths (
 SELECT create_distributed_table('sneaky_name_lengths', 'col1', 'hash');
 
 \c - - :public_worker_1_host :worker_1_port
+SET citus.override_table_visibility TO FALSE;
 
 SELECT c1.relname AS unique_index_name
 FROM pg_class c1
@@ -263,6 +266,7 @@ CREATE TABLE too_long_12345678901234567890123456789012345678901234567890 (
 SELECT create_distributed_table('too_long_12345678901234567890123456789012345678901234567890', 'col1', 'hash');
 
 \c - - :public_worker_1_host :worker_1_port
+SET citus.override_table_visibility TO FALSE;
 \dt *225000000000*
 \c - - :master_host :master_port
 
@@ -283,8 +287,9 @@ FROM pg_dist_shard
 WHERE logicalrelid = U&'elephant_!0441!043B!043E!043D!0441!043B!043E!043D!0441!043B!043E!043D!0441!043B!043E!043D!0441!043B!043E!043D!0441!043B!043E!043D' UESCAPE '!'::regclass;
 
 \c - - :public_worker_1_host :worker_1_port
-\dt public.elephant_*
-\di public.elephant_*
+SET citus.override_table_visibility TO FALSE;
+\dt public.elephant_*[0-9]+
+\di public.elephant_*[0-9]+
 \c - - :master_host :master_port
 
 SET citus.shard_count TO 2;