From d93b46559ea65253797993e640eb4930ae77c637 Mon Sep 17 00:00:00 2001
From: Burak Velioglu <buvelio@microsoft.com>
Date: Thu, 20 Jan 2022 01:02:58 +0300
Subject: [PATCH] Rename metadata to node metadata on multiple points

---
 .../distributed/metadata/metadata_sync.c      | 22 +++++++++----------
 src/include/distributed/metadata_sync.h       |  8 +++----
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/backend/distributed/metadata/metadata_sync.c b/src/backend/distributed/metadata/metadata_sync.c
index cbe1b6526..1849b6c0f 100644
--- a/src/backend/distributed/metadata/metadata_sync.c
+++ b/src/backend/distributed/metadata/metadata_sync.c
@@ -1996,8 +1996,8 @@ DetachPartitionCommandList(void)
 		return NIL;
 	}
 
-	detachPartitionCommandList = lcons(DISABLE_DDL_PROPAGATION,
-									   detachPartitionCommandList);
+	detachPartitionCommandList =
+		lcons(DISABLE_DDL_PROPAGATION, detachPartitionCommandList);
 
 	/*
 	 * We probably do not need this but as an extra precaution, we are enabling
@@ -2019,13 +2019,13 @@ DetachPartitionCommandList(void)
  * since updates on the pg_dist_node metadata must be rollbacked if anything
  * goes wrong.
  */
-static MetadataSyncResult
+static NodeMetadataSyncResult
 SyncNodeMetadataToNodes(void)
 {
-	MetadataSyncResult result = METADATA_SYNC_SUCCESS;
+	NodeMetadataSyncResult result = NODE_METADATA_SYNC_SUCCESS;
 	if (!IsCoordinator())
 	{
-		return METADATA_SYNC_SUCCESS;
+		return NODE_METADATA_SYNC_SUCCESS;
 	}
 
 	/*
@@ -2035,7 +2035,7 @@ SyncNodeMetadataToNodes(void)
 	 */
 	if (!ConditionalLockRelationOid(DistNodeRelationId(), RowExclusiveLock))
 	{
-		return METADATA_SYNC_FAILED_LOCK;
+		return NODE_METADATA_SYNC_FAILED_LOCK;
 	}
 
 	List *syncedWorkerList = NIL;
@@ -2051,7 +2051,7 @@ SyncNodeMetadataToNodes(void)
 				ereport(WARNING, (errmsg("failed to sync metadata to %s:%d",
 										 workerNode->workerName,
 										 workerNode->workerPort)));
-				result = METADATA_SYNC_FAILED_SYNC;
+				result = NODE_METADATA_SYNC_FAILED_SYNC;
 			}
 			else
 			{
@@ -2072,7 +2072,7 @@ SyncNodeMetadataToNodes(void)
 		if (!nodeUpdated->metadataSynced)
 		{
 			/* set the result to FAILED to trigger the sync again */
-			result = METADATA_SYNC_FAILED_SYNC;
+			result = NODE_METADATA_SYNC_FAILED_SYNC;
 		}
 	}
 
@@ -2126,11 +2126,11 @@ SyncNodeMetadataToNodesMain(Datum main_arg)
 		{
 			UseCoordinatedTransaction();
 
-			MetadataSyncResult result = SyncNodeMetadataToNodes();
-			syncedAllNodes = (result == METADATA_SYNC_SUCCESS);
+			NodeMetadataSyncResult result = SyncNodeMetadataToNodes();
+			syncedAllNodes = (result == NODE_METADATA_SYNC_SUCCESS);
 
 			/* we use LISTEN/NOTIFY to wait for metadata syncing in tests */
-			if (result != METADATA_SYNC_FAILED_LOCK)
+			if (result != NODE_METADATA_SYNC_FAILED_LOCK)
 			{
 				Async_Notify(METADATA_SYNC_CHANNEL, NULL);
 			}
diff --git a/src/include/distributed/metadata_sync.h b/src/include/distributed/metadata_sync.h
index bfdc8f506..96d8a0533 100644
--- a/src/include/distributed/metadata_sync.h
+++ b/src/include/distributed/metadata_sync.h
@@ -22,10 +22,10 @@ extern int MetadataSyncRetryInterval;
 
 typedef enum
 {
-	METADATA_SYNC_SUCCESS = 0,
-	METADATA_SYNC_FAILED_LOCK = 1,
-	METADATA_SYNC_FAILED_SYNC = 2
-} MetadataSyncResult;
+	NODE_METADATA_SYNC_SUCCESS = 0,
+	NODE_METADATA_SYNC_FAILED_LOCK = 1,
+	NODE_METADATA_SYNC_FAILED_SYNC = 2
+} NodeMetadataSyncResult;
 
 /* Functions declarations for metadata syncing */
 extern void SyncNodeMetadataToNode(const char *nodeNameString, int32 nodePort);