From 4dab78a55a4a152e4eb8584579a5df102bcab4aa Mon Sep 17 00:00:00 2001 From: Burak Velioglu Date: Mon, 17 Jan 2022 16:40:50 +0300 Subject: [PATCH] Minor updates --- .../distributed/metadata/metadata_sync.c | 4 ++-- ...icate_reference_tables_to_coordinator.spec | 23 ++++++++++++++----- 2 files changed, 19 insertions(+), 8 deletions(-) diff --git a/src/backend/distributed/metadata/metadata_sync.c b/src/backend/distributed/metadata/metadata_sync.c index 242ba7dd4..3cf6c8719 100644 --- a/src/backend/distributed/metadata/metadata_sync.c +++ b/src/backend/distributed/metadata/metadata_sync.c @@ -251,7 +251,7 @@ SyncNodeMetadataToNode(const char *nodeNameString, int32 nodePort) * visible on all connections used by the transaction, meaning we can only use 1 * connection per node. */ -void +static void EnsureSequentialModeMetadataOperations(void) { if (!IsTransactionBlock()) @@ -445,7 +445,7 @@ ShouldSyncTableMetadataInternal(bool hashDistributed, bool citusTableWithNoDistK * SyncNodeMetadataSnapshotToNode does the following: * 1. Sets the localGroupId on the worker so the worker knows which tuple in * pg_dist_node represents itself. - * 2. Recreates the distributed metadata on the given worker. + * 2. Recreates the node metadata on the given worker. * If raiseOnError is true, it errors out if synchronization fails. */ static bool diff --git a/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec b/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec index ea51574dc..b2dd5dad3 100644 --- a/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec +++ b/src/test/regress/spec/isolation_replicate_reference_tables_to_coordinator.spec @@ -1,12 +1,23 @@ setup { - //SELECT citus_internal.replace_isolation_tester_func(); - //SELECT citus_internal.refresh_isolation_tester_prepared_statement(); + SELECT citus_internal.replace_isolation_tester_func(); + SELECT citus_internal.refresh_isolation_tester_prepared_statement(); + + SELECT master_add_node('localhost', 57636); + + CREATE TABLE ref_table(a int primary key); + SELECT create_reference_table('ref_table'); + INSERT INTO ref_table VALUES (1), (3), (5), (7); + + CREATE TABLE dist_table(a int, b int); + SELECT create_distributed_table('dist_table', 'a'); } teardown { - // SELECT citus_internal.restore_isolation_tester_func(); + SELECT citus_internal.restore_isolation_tester_func(); + DROP TABLE ref_table, dist_table; + SELECT master_remove_node('localhost', 57636); } session "s1" @@ -112,12 +123,12 @@ step "deadlock-checker-call" // verify that locks on the placement of the reference table on the coordinator is // taken into account when looking for distributed deadlocks -// permutation "s1-begin" "s2-begin" "s1-update-dist-table" "s2-lock-ref-table-placement-on-coordinator" "s1-lock-ref-table-placement-on-coordinator" "s2-update-dist-table" "deadlock-checker-call" "s1-end" "s2-end" +permutation "s1-begin" "s2-begin" "s1-update-dist-table" "s2-lock-ref-table-placement-on-coordinator" "s1-lock-ref-table-placement-on-coordinator" "s2-update-dist-table" "deadlock-checker-call" "s1-end" "s2-end" // verify that *_dist_stat_activity() functions return the correct result when query // has a task on the coordinator. -// permutation "s1-begin" "s2-begin" "s1-update-ref-table" "s2-sleep" "s2-view-dist" "s2-view-worker" "s2-end" "s1-end" +permutation "s1-begin" "s2-begin" "s1-update-ref-table" "s2-sleep" "s2-view-dist" "s2-view-worker" "s2-end" "s1-end" // verify that get_*_active_transactions() functions return the correct result when // the query has a task on the coordinator. -// permutation "s1-begin" "s2-begin" "s1-update-ref-table" "s2-active-transactions" "s1-end" "s2-end" +permutation "s1-begin" "s2-begin" "s1-update-ref-table" "s2-active-transactions" "s1-end" "s2-end"