diff --git a/src/backend/distributed/relay/relay_event_utility.c b/src/backend/distributed/relay/relay_event_utility.c index 7dd118c64..3ea3ff800 100644 --- a/src/backend/distributed/relay/relay_event_utility.c +++ b/src/backend/distributed/relay/relay_event_utility.c @@ -720,7 +720,15 @@ shard_name(PG_FUNCTION_ARGS) schemaId = get_rel_namespace(relationId); schemaName = get_namespace_name(schemaId); - qualifiedName = quote_qualified_identifier(schemaName, relationName); + + if (strncmp(schemaName, "public", NAMEDATALEN) == 0) + { + qualifiedName = (char *) quote_identifier(relationName); + } + else + { + qualifiedName = quote_qualified_identifier(schemaName, relationName); + } PG_RETURN_TEXT_P(cstring_to_text(qualifiedName)); } diff --git a/src/test/regress/expected/isolation_add_node_vs_reference_table_operations.out b/src/test/regress/expected/isolation_add_node_vs_reference_table_operations.out index 9be4b855c..2dd019e1e 100644 --- a/src/test/regress/expected/isolation_add_node_vs_reference_table_operations.out +++ b/src/test/regress/expected/isolation_add_node_vs_reference_table_operations.out @@ -187,7 +187,7 @@ step s2-print-index-count: SELECT nodeport, success, result FROM - run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''') + run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; @@ -227,7 +227,7 @@ step s2-print-index-count: SELECT nodeport, success, result FROM - run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''') + run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; @@ -413,7 +413,7 @@ step s2-print-index-count: SELECT nodeport, success, result FROM - run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''') + run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; @@ -450,7 +450,7 @@ step s2-print-index-count: SELECT nodeport, success, result FROM - run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''') + run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; diff --git a/src/test/regress/expected/isolation_add_node_vs_reference_table_operations_0.out b/src/test/regress/expected/isolation_add_node_vs_reference_table_operations_0.out index 46485aa09..9d01ce635 100644 --- a/src/test/regress/expected/isolation_add_node_vs_reference_table_operations_0.out +++ b/src/test/regress/expected/isolation_add_node_vs_reference_table_operations_0.out @@ -187,7 +187,7 @@ step s2-print-index-count: SELECT nodeport, success, result FROM - run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''') + run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; @@ -227,7 +227,7 @@ step s2-print-index-count: SELECT nodeport, success, result FROM - run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''') + run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; @@ -412,7 +412,7 @@ step s2-print-index-count: SELECT nodeport, success, result FROM - run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''') + run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; @@ -449,7 +449,7 @@ step s2-print-index-count: SELECT nodeport, success, result FROM - run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''') + run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; diff --git a/src/test/regress/expected/isolation_copy_placement_vs_modification.out b/src/test/regress/expected/isolation_copy_placement_vs_modification.out index 523f87f80..4954647b7 100644 --- a/src/test/regress/expected/isolation_copy_placement_vs_modification.out +++ b/src/test/regress/expected/isolation_copy_placement_vs_modification.out @@ -245,7 +245,7 @@ step s2-print-index-count: SELECT nodeport, success, result FROM - run_command_on_placements('test_copy_placement_vs_modification', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''') + run_command_on_placements('test_copy_placement_vs_modification', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; @@ -486,7 +486,7 @@ step s2-print-index-count: SELECT nodeport, success, result FROM - run_command_on_placements('test_copy_placement_vs_modification', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''') + run_command_on_placements('test_copy_placement_vs_modification', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; diff --git a/src/test/regress/expected/multi_modifying_xacts.out b/src/test/regress/expected/multi_modifying_xacts.out index 2abe0706a..bb92f57af 100644 --- a/src/test/regress/expected/multi_modifying_xacts.out +++ b/src/test/regress/expected/multi_modifying_xacts.out @@ -1386,18 +1386,18 @@ JOIN USING (shardid) ORDER BY id; - id | shard_name | nodename | nodeport -----+----------------------+-----------+---------- - 1 | public.users_1200022 | localhost | 57637 - 2 | public.users_1200025 | localhost | 57638 - 3 | public.users_1200023 | localhost | 57638 - 4 | public.users_1200023 | localhost | 57638 - 5 | public.users_1200022 | localhost | 57637 - 6 | public.users_1200024 | localhost | 57637 - 7 | public.users_1200023 | localhost | 57638 - 8 | public.users_1200022 | localhost | 57637 - 9 | public.users_1200025 | localhost | 57638 - 10 | public.users_1200022 | localhost | 57637 + id | shard_name | nodename | nodeport +----+---------------+-----------+---------- + 1 | users_1200022 | localhost | 57637 + 2 | users_1200025 | localhost | 57638 + 3 | users_1200023 | localhost | 57638 + 4 | users_1200023 | localhost | 57638 + 5 | users_1200022 | localhost | 57637 + 6 | users_1200024 | localhost | 57637 + 7 | users_1200023 | localhost | 57638 + 8 | users_1200022 | localhost | 57637 + 9 | users_1200025 | localhost | 57638 + 10 | users_1200022 | localhost | 57637 (10 rows) END; diff --git a/src/test/regress/expected/multi_name_lengths.out b/src/test/regress/expected/multi_name_lengths.out index 9211a8e27..6534ee92b 100644 --- a/src/test/regress/expected/multi_name_lengths.out +++ b/src/test/regress/expected/multi_name_lengths.out @@ -39,9 +39,9 @@ SELECT shard_name(NULL, 666666); SELECT shard_name(0, 666666); ERROR: object_name does not reference a valid relation SELECT shard_name('too_long_12345678901234567890123456789012345678901234567890'::regclass, 666666); - shard_name ------------------------------------------------------------------------- - public.too_long_12345678901234567890123456789012345678_e0119164_666666 + shard_name +----------------------------------------------------------------- + too_long_12345678901234567890123456789012345678_e0119164_666666 (1 row) SELECT shard_name('too_long_12345678901234567890123456789012345678901234567890'::regclass, NULL); @@ -316,9 +316,9 @@ SELECT master_create_worker_shards(U&'elephant_!0441!043B!043E!043D!0441!043B!04 SELECT shard_name(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, min(shardid)) 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; - shard_name ----------------------------------------------------------- - public."elephant_слонслонслонсло_c8b737c2_2250000000002" + shard_name +--------------------------------------------------- + "elephant_слонслонслонсло_c8b737c2_2250000000002" (1 row) \c - - - :worker_1_port diff --git a/src/test/regress/specs/isolation_add_node_vs_reference_table_operations.spec b/src/test/regress/specs/isolation_add_node_vs_reference_table_operations.spec index ab85e952b..44c2d04a4 100644 --- a/src/test/regress/specs/isolation_add_node_vs_reference_table_operations.spec +++ b/src/test/regress/specs/isolation_add_node_vs_reference_table_operations.spec @@ -86,7 +86,7 @@ step "s2-print-index-count" SELECT nodeport, success, result FROM - run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''') + run_command_on_placements('test_reference_table', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; } diff --git a/src/test/regress/specs/isolation_copy_placement_vs_modification.spec b/src/test/regress/specs/isolation_copy_placement_vs_modification.spec index 8ab9fe84b..230e808f4 100644 --- a/src/test/regress/specs/isolation_copy_placement_vs_modification.spec +++ b/src/test/regress/specs/isolation_copy_placement_vs_modification.spec @@ -104,7 +104,7 @@ step "s2-print-index-count" SELECT nodeport, success, result FROM - run_command_on_placements('test_copy_placement_vs_modification', 'select count(*) from pg_indexes WHERE schemaname || ''.'' || tablename = ''%s''') + run_command_on_placements('test_copy_placement_vs_modification', 'select count(*) from pg_indexes WHERE tablename = ''%s''') ORDER BY nodeport; }