From 4d4d9414184c772358bf2a9ab5024ccdd94a2ebe Mon Sep 17 00:00:00 2001 From: Nitish Upreti Date: Wed, 14 Sep 2022 14:59:28 -0700 Subject: [PATCH] Reindent --- .../connection/connection_management.c | 3 ++- .../distributed/operations/shard_cleaner.c | 18 +++++++++++------- .../distributed/operations/shard_split.c | 3 ++- .../transaction/worker_transaction.c | 11 +++++++---- .../distributed/connection_management.h | 2 +- src/include/distributed/worker_transaction.h | 3 ++- 6 files changed, 25 insertions(+), 15 deletions(-) diff --git a/src/backend/distributed/connection/connection_management.c b/src/backend/distributed/connection/connection_management.c index 2de821983..04d124948 100644 --- a/src/backend/distributed/connection/connection_management.c +++ b/src/backend/distributed/connection/connection_management.c @@ -248,7 +248,7 @@ GetNodeUserDatabaseConnection(uint32 flags, const char *hostname, int32 port, * GetLocalConnectionForSubtransaction establishes a localhost connection. * To avoid creating excessive connections, we try to reuse an existing connection. */ -MultiConnection* +MultiConnection * GetLocalConnectionForSubtransactionAsUser(char *userName) { int connectionFlag = OUTSIDE_TRANSACTION; @@ -258,6 +258,7 @@ GetLocalConnectionForSubtransactionAsUser(char *userName) userName, get_database_name( MyDatabaseId)); + /* Don't cache connection for the lifetime of the entire session. */ connection->forceCloseAtTransactionEnd = true; diff --git a/src/backend/distributed/operations/shard_cleaner.c b/src/backend/distributed/operations/shard_cleaner.c index e58c5a953..6e6f6f8bb 100644 --- a/src/backend/distributed/operations/shard_cleaner.c +++ b/src/backend/distributed/operations/shard_cleaner.c @@ -670,9 +670,10 @@ InsertCleanupRecordInSubtransaction(CleanupObject objectType, nodeGroupId, policy); - MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser(CitusExtensionOwnerName()); + MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser( + CitusExtensionOwnerName()); SendCommandListToWorkerOutsideTransactionWithConnection(connection, - list_make1(command->data)); + list_make1(command->data)); } @@ -690,9 +691,10 @@ DeleteCleanupRecordByRecordIdOutsideTransaction(uint64 recordId) PG_DIST_CLEANUP, recordId); - MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser(CitusExtensionOwnerName()); + MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser( + CitusExtensionOwnerName()); SendCommandListToWorkerOutsideTransactionWithConnection(connection, - list_make1(command->data)); + list_make1(command->data)); } @@ -754,9 +756,11 @@ TryDropShardOutsideTransaction(OperationId operationId, char *qualifiedTableName dropQuery->data); /* remove the shard from the node */ - MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser(CitusExtensionOwnerName()); - bool success = SendOptionalCommandListToWorkerOutsideTransactionWithConnection(connection, - dropCommandList); + MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser( + CitusExtensionOwnerName()); + bool success = SendOptionalCommandListToWorkerOutsideTransactionWithConnection( + connection, + dropCommandList); return success; } diff --git a/src/backend/distributed/operations/shard_split.c b/src/backend/distributed/operations/shard_split.c index f12d14f80..0f4c9d997 100644 --- a/src/backend/distributed/operations/shard_split.c +++ b/src/backend/distributed/operations/shard_split.c @@ -2245,7 +2245,8 @@ GetNextShardIdForSplitChild() appendStringInfo(nextValueCommand, "SELECT nextval(%s);", quote_literal_cstr( "pg_catalog.pg_dist_shardid_seq")); - MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser(CitusExtensionOwnerName()); + MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser( + CitusExtensionOwnerName()); PGresult *result = NULL; int queryResult = ExecuteOptionalRemoteCommand(connection, nextValueCommand->data, &result); diff --git a/src/backend/distributed/transaction/worker_transaction.c b/src/backend/distributed/transaction/worker_transaction.c index 7b0e037d1..256147493 100644 --- a/src/backend/distributed/transaction/worker_transaction.c +++ b/src/backend/distributed/transaction/worker_transaction.c @@ -357,7 +357,7 @@ SendCommandListToWorkerOutsideTransaction(const char *nodeName, int32 nodePort, */ void SendCommandListToWorkerOutsideTransactionWithConnection(MultiConnection *workerConnection, - List *commandList) + List *commandList) { MarkRemoteTransactionCritical(workerConnection); RemoteTransactionBegin(workerConnection); @@ -456,7 +456,8 @@ SendMetadataCommandListToWorkerListInCoordinatedTransaction(List *workerNodeList * */ bool -SendOptionalCommandListToWorkerOutsideTransactionWithConnection(MultiConnection *workerConnection, List *commandList) +SendOptionalCommandListToWorkerOutsideTransactionWithConnection( + MultiConnection *workerConnection, List *commandList) { if (PQstatus(workerConnection->pgConn) != CONNECTION_OK) { @@ -490,6 +491,7 @@ SendOptionalCommandListToWorkerOutsideTransactionWithConnection(MultiConnection return !failed; } + /* * SendOptionalCommandListToWorkerOutsideTransaction sends the given command * list to the given worker in a single transaction that is outside of the @@ -505,8 +507,9 @@ SendOptionalCommandListToWorkerOutsideTransaction(const char *nodeName, int32 no MultiConnection *workerConnection = GetNodeUserDatabaseConnection(connectionFlags, nodeName, nodePort, nodeUser, NULL); - bool failed = SendOptionalCommandListToWorkerOutsideTransactionWithConnection(workerConnection, - commandList); + bool failed = SendOptionalCommandListToWorkerOutsideTransactionWithConnection( + workerConnection, + commandList); CloseConnection(workerConnection); return !failed; diff --git a/src/include/distributed/connection_management.h b/src/include/distributed/connection_management.h index 2587b311c..f862cd40f 100644 --- a/src/include/distributed/connection_management.h +++ b/src/include/distributed/connection_management.h @@ -289,7 +289,7 @@ extern MultiConnection * StartNodeConnection(uint32 flags, const char *hostname, extern MultiConnection * GetNodeUserDatabaseConnection(uint32 flags, const char *hostname, int32 port, const char *user, const char *database); -extern MultiConnection* GetLocalConnectionForSubtransactionAsUser(char* userName); +extern MultiConnection * GetLocalConnectionForSubtransactionAsUser(char *userName); extern MultiConnection * StartNodeUserDatabaseConnection(uint32 flags, const char *hostname, int32 port, diff --git a/src/include/distributed/worker_transaction.h b/src/include/distributed/worker_transaction.h index a9a93e48e..aa137b76b 100644 --- a/src/include/distributed/worker_transaction.h +++ b/src/include/distributed/worker_transaction.h @@ -62,7 +62,8 @@ extern bool SendOptionalCommandListToWorkerOutsideTransaction(const char *nodeNa List *commandList); extern bool SendOptionalCommandListToWorkerOutsideTransactionWithConnection( MultiConnection *workerConnection, - List *commandList); + List * + commandList); extern bool SendOptionalMetadataCommandListToWorkerInCoordinatedTransaction(const char *nodeName, int32 nodePort,