diff --git a/src/backend/distributed/commands/multi_copy.c b/src/backend/distributed/commands/multi_copy.c index 4141bf5fd..7d5370389 100644 --- a/src/backend/distributed/commands/multi_copy.c +++ b/src/backend/distributed/commands/multi_copy.c @@ -2228,7 +2228,7 @@ CitusCopyDestReceiverStartup(DestReceiver *dest, int operation, if (cacheEntry->replicationModel == REPLICATION_MODEL_2PC || MultiShardCommitProtocol == COMMIT_PROTOCOL_2PC) { - CoordinatedTransactionShouldUse2PC(); + Use2PCForCoordinatedTransaction(); } /* define how tuples will be serialised */ diff --git a/src/backend/distributed/executor/adaptive_executor.c b/src/backend/distributed/executor/adaptive_executor.c index 6e2182b1e..6bfcbe753 100644 --- a/src/backend/distributed/executor/adaptive_executor.c +++ b/src/backend/distributed/executor/adaptive_executor.c @@ -1255,7 +1255,7 @@ StartDistributedExecution(DistributedExecution *execution) if (xactProperties->requires2PC) { - CoordinatedTransactionShouldUse2PC(); + Use2PCForCoordinatedTransaction(); } /* @@ -3542,7 +3542,7 @@ Activate2PCIfModifyingTransactionExpandsToNewNode(WorkerSession *session) * just opened, which means we're now going to make modifications * over multiple connections. Activate 2PC! */ - CoordinatedTransactionShouldUse2PC(); + Use2PCForCoordinatedTransaction(); } } diff --git a/src/backend/distributed/executor/local_executor.c b/src/backend/distributed/executor/local_executor.c index a37e85fea..d17bfb6f0 100644 --- a/src/backend/distributed/executor/local_executor.c +++ b/src/backend/distributed/executor/local_executor.c @@ -263,7 +263,7 @@ ExecuteLocalTaskListExtended(List *taskList, * queries are also ReadOnly, our 2PC logic is smart enough to skip sending * PREPARE to those connections. */ - CoordinatedTransactionShouldUse2PC(); + Use2PCForCoordinatedTransaction(); } LogLocalCommand(task); diff --git a/src/backend/distributed/operations/delete_protocol.c b/src/backend/distributed/operations/delete_protocol.c index 3ee3752b7..a175d741a 100644 --- a/src/backend/distributed/operations/delete_protocol.c +++ b/src/backend/distributed/operations/delete_protocol.c @@ -325,7 +325,7 @@ DropShards(Oid relationId, char *schemaName, char *relationName, */ if (MultiShardCommitProtocol == COMMIT_PROTOCOL_2PC) { - CoordinatedTransactionShouldUse2PC(); + Use2PCForCoordinatedTransaction(); } List *dropTaskList = DropTaskList(relationId, schemaName, relationName, diff --git a/src/backend/distributed/transaction/transaction_management.c b/src/backend/distributed/transaction/transaction_management.c index 93d6351b1..88b820c0e 100644 --- a/src/backend/distributed/transaction/transaction_management.c +++ b/src/backend/distributed/transaction/transaction_management.c @@ -101,7 +101,7 @@ MemoryContext CommitContext = NULL; * do 2PC on the remote connections that did a modification. * * As a variable name ShouldCoordinatedTransactionUse2PC could - * be improved. We use CoordinatedTransactionShouldUse2PC() as the + * be improved. We use Use2PCForCoordinatedTransaction() as the * public API function, hence couldn't come up with a better name * for the underlying variable at the moment. */ @@ -190,14 +190,14 @@ InCoordinatedTransaction(void) /* - * CoordinatedTransactionShouldUse2PC() signals that the current coordinated + * Use2PCForCoordinatedTransaction() signals that the current coordinated * transaction should use 2PC to commit. * * Note that even if 2PC is enabled, it is only used for connections that make * modification (DML or DDL). */ void -CoordinatedTransactionShouldUse2PC(void) +Use2PCForCoordinatedTransaction(void) { Assert(InCoordinatedTransaction()); diff --git a/src/backend/distributed/transaction/worker_transaction.c b/src/backend/distributed/transaction/worker_transaction.c index b8422bfcc..891c01e76 100644 --- a/src/backend/distributed/transaction/worker_transaction.c +++ b/src/backend/distributed/transaction/worker_transaction.c @@ -96,7 +96,7 @@ SendCommandToWorkerAsUser(const char *nodeName, int32 nodePort, const char *node uint32 connectionFlags = 0; UseCoordinatedTransaction(); - CoordinatedTransactionShouldUse2PC(); + Use2PCForCoordinatedTransaction(); MultiConnection *transactionConnection = GetNodeUserDatabaseConnection( connectionFlags, nodeName, @@ -404,7 +404,7 @@ SendCommandToWorkersParamsInternal(TargetWorkerSet targetWorkerSet, const char * List *workerNodeList = TargetWorkerSetNodeList(targetWorkerSet, ShareLock); UseCoordinatedTransaction(); - CoordinatedTransactionShouldUse2PC(); + Use2PCForCoordinatedTransaction(); /* open connections in parallel */ WorkerNode *workerNode = NULL; diff --git a/src/include/distributed/transaction_management.h b/src/include/distributed/transaction_management.h index ecee5eeee..fdb6be1b7 100644 --- a/src/include/distributed/transaction_management.h +++ b/src/include/distributed/transaction_management.h @@ -111,7 +111,7 @@ extern bool TransactionModifiedNodeMetadata; */ extern void UseCoordinatedTransaction(void); extern bool InCoordinatedTransaction(void); -extern void CoordinatedTransactionShouldUse2PC(void); +extern void Use2PCForCoordinatedTransaction(void); extern bool GetCoordinatedTransactionShouldUse2PC(void); extern bool IsMultiStatementTransaction(void); extern void EnsureDistributedTransactionId(void);