From 02526f1bee59f189078991f96eaead35ec5b459e Mon Sep 17 00:00:00 2001 From: Burak Velioglu Date: Thu, 13 Jan 2022 01:01:47 +0300 Subject: [PATCH] Minor refactors --- src/backend/distributed/metadata/metadata_sync.c | 3 ++- src/include/distributed/metadata_sync.h | 2 -- src/test/regress/multi_1_schedule | 2 +- src/test/regress/multi_mx_schedule | 2 +- src/test/regress/sql/multi_metadata_sync.sql | 2 -- 5 files changed, 4 insertions(+), 7 deletions(-) diff --git a/src/backend/distributed/metadata/metadata_sync.c b/src/backend/distributed/metadata/metadata_sync.c index 1d90b3f1b..9fdf7b44c 100644 --- a/src/backend/distributed/metadata/metadata_sync.c +++ b/src/backend/distributed/metadata/metadata_sync.c @@ -82,7 +82,7 @@ /* managed via a GUC */ char *EnableManualMetadataChangesForUser = ""; - +static void EnsureSequentialModeMetadataOperations(void); static List * GetDistributedTableMetadataEvents(Oid relationId); static void EnsureObjectMetadataIsSane(int distributionArgumentIndex, int colocationId); @@ -101,6 +101,7 @@ static GrantStmt * GenerateGrantOnSchemaStmtForRights(Oid roleOid, char *permission, bool withGrantOption); +static void SetLocalEnableDependencyCreation(bool state); static char * GenerateSetRoleQuery(Oid roleOid); static void MetadataSyncSigTermHandler(SIGNAL_ARGS); static void MetadataSyncSigAlrmHandler(SIGNAL_ARGS); diff --git a/src/include/distributed/metadata_sync.h b/src/include/distributed/metadata_sync.h index 4814e7e70..7c66a787b 100644 --- a/src/include/distributed/metadata_sync.h +++ b/src/include/distributed/metadata_sync.h @@ -29,7 +29,6 @@ typedef enum /* Functions declarations for metadata syncing */ extern void StartMetadataSyncToNode(const char *nodeNameString, int32 nodePort); -extern void EnsureSequentialModeMetadataOperations(void); extern bool ClusterHasKnownMetadataWorkers(void); extern char * LocalGroupIdUpdateCommand(int32 groupId); extern bool ShouldSyncTableMetadata(Oid relationId); @@ -60,7 +59,6 @@ extern BackgroundWorkerHandle * SpawnSyncMetadataToNodes(Oid database, Oid owner extern void SyncMetadataToNodesMain(Datum main_arg); extern void SignalMetadataSyncDaemon(Oid database, int sig); extern bool ShouldInitiateMetadataSync(bool *lockFailure); -extern void SetLocalEnableDependencyCreation(bool state); extern List * SequenceDependencyCommandList(Oid relationId); extern List * DDLCommandsForSequence(Oid sequenceOid, char *ownerName); diff --git a/src/test/regress/multi_1_schedule b/src/test/regress/multi_1_schedule index 2fd4dbf19..fbcc34196 100644 --- a/src/test/regress/multi_1_schedule +++ b/src/test/regress/multi_1_schedule @@ -187,7 +187,7 @@ test: multi_repartition_udt multi_repartitioned_subquery_udf multi_subtransactio test: multi_modifying_xacts test: check_mx test: turn_mx_off -# test: multi_generate_ddl_commands multi_repair_shards +test: multi_generate_ddl_commands multi_repair_shards test: multi_create_shards test: turn_mx_on test: multi_transaction_recovery diff --git a/src/test/regress/multi_mx_schedule b/src/test/regress/multi_mx_schedule index d45fe8b4d..973c3bf05 100644 --- a/src/test/regress/multi_mx_schedule +++ b/src/test/regress/multi_mx_schedule @@ -15,7 +15,7 @@ # --- test: multi_extension test: multi_test_helpers multi_test_helpers_superuser -#test: multi_mx_node_metadata +test: multi_mx_node_metadata test: multi_cluster_management test: multi_mx_function_table_reference test: multi_test_catalog_views diff --git a/src/test/regress/sql/multi_metadata_sync.sql b/src/test/regress/sql/multi_metadata_sync.sql index 3d11ff14d..1a966c221 100644 --- a/src/test/regress/sql/multi_metadata_sync.sql +++ b/src/test/regress/sql/multi_metadata_sync.sql @@ -6,8 +6,6 @@ -- metadata changes to MX tables. -- Turn metadata sync off at first -\c - - - :master_port - SELECT stop_metadata_sync_to_node('localhost', :worker_1_port); SELECT stop_metadata_sync_to_node('localhost', :worker_2_port);