From d076b43000a3771027fe4fc5adc7f7640bab6ae5 Mon Sep 17 00:00:00 2001
From: EmelSimsek <emelhasdal@gmail.com>
Date: Tue, 17 Oct 2023 16:28:28 +0300
Subject: [PATCH] Rename GUC

---
 src/backend/distributed/shared_library_init.c |  6 +++---
 src/backend/distributed/utils/maintenanced.c  | 12 ++++++------
 src/include/distributed/maintenanced.h        |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/backend/distributed/shared_library_init.c b/src/backend/distributed/shared_library_init.c
index 442958f57..886950f98 100644
--- a/src/backend/distributed/shared_library_init.c
+++ b/src/backend/distributed/shared_library_init.c
@@ -481,7 +481,7 @@ _PG_init(void)
 #endif
 
 	InitializeMaintenanceDaemon();
-	InitializeMaintenanceDaemonForAdminDB();
+	InitializeMaintenanceDaemonForMainDb();
 
 	/* initialize coordinated transaction management */
 	InitializeTransactionManagement();
@@ -1024,10 +1024,10 @@ RegisterCitusConfigVariables(void)
 		NULL, NULL, NULL);
 
 	DefineCustomStringVariable(
-		"citus.controldb_name",
+		"citus.main_db",
 		gettext_noop("Which database is designated as the controldb"),
 		NULL,
-		&ControlDbName,
+		&MainDb,
 		"",
 		PGC_POSTMASTER,
 		GUC_STANDARD,
diff --git a/src/backend/distributed/utils/maintenanced.c b/src/backend/distributed/utils/maintenanced.c
index 3953d3437..5d1456fbd 100644
--- a/src/backend/distributed/utils/maintenanced.c
+++ b/src/backend/distributed/utils/maintenanced.c
@@ -99,7 +99,7 @@ int Recover2PCInterval = 60000;
 int DeferShardDeleteInterval = 15000;
 int BackgroundTaskQueueCheckInterval = 5000;
 int MaxBackgroundTaskExecutors = 4;
-char *ControlDbName = "";
+char *MainDb = "";
 
 /* config variables for metadata sync timeout */
 int MetadataSyncInterval = 60000;
@@ -141,15 +141,15 @@ InitializeMaintenanceDaemon(void)
 
 
 /*
- * InitializeMaintenanceDaemonForAdminDB is called in _PG_Init
+ * InitializeMaintenanceDaemonForMainDb is called in _PG_Init
  * at which stage we are not in a transaction or have databaseOid
  */
 void
-InitializeMaintenanceDaemonForAdminDB(void)
+InitializeMaintenanceDaemonForMainDb(void)
 {
-	if (strcmp(ControlDbName, "") == 0)
+	if (strcmp(MainDb, "") == 0)
 	{
-		elog(LOG, "There is no designated control database.");
+		elog(LOG, "There is no designated main database.");
 		return;
 	}
 
@@ -341,7 +341,7 @@ CitusMaintenanceDaemonMain(Datum main_arg)
 
 	if (databaseOid == 0)
 	{
-		char *databaseName = ControlDbName;
+		char *databaseName = MainDb;
 
 		BackgroundWorkerInitializeConnection(databaseName, NULL, 0);
 
diff --git a/src/include/distributed/maintenanced.h b/src/include/distributed/maintenanced.h
index 29027e918..07387a7fd 100644
--- a/src/include/distributed/maintenanced.h
+++ b/src/include/distributed/maintenanced.h
@@ -20,7 +20,7 @@
 
 /* config variable for */
 extern double DistributedDeadlockDetectionTimeoutFactor;
-extern char *ControlDbName;
+extern char *MainDb;
 
 extern void StopMaintenanceDaemon(Oid databaseId);
 extern void TriggerNodeMetadataSync(Oid databaseId);
@@ -28,7 +28,7 @@ extern void InitializeMaintenanceDaemon(void);
 extern size_t MaintenanceDaemonShmemSize(void);
 extern void MaintenanceDaemonShmemInit(void);
 extern void InitializeMaintenanceDaemonBackend(void);
-extern void InitializeMaintenanceDaemonForAdminDB(void);
+extern void InitializeMaintenanceDaemonForMainDb(void);
 extern bool LockCitusExtension(void);
 
 extern PGDLLEXPORT void CitusMaintenanceDaemonMain(Datum main_arg);