mirror of https://github.com/citusdata/citus.git
Reindent
parent
17ae71fa8f
commit
4d4d941418
|
@ -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;
|
||||
|
||||
|
|
|
@ -670,7 +670,8 @@ InsertCleanupRecordInSubtransaction(CleanupObject objectType,
|
|||
nodeGroupId,
|
||||
policy);
|
||||
|
||||
MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser(CitusExtensionOwnerName());
|
||||
MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser(
|
||||
CitusExtensionOwnerName());
|
||||
SendCommandListToWorkerOutsideTransactionWithConnection(connection,
|
||||
list_make1(command->data));
|
||||
}
|
||||
|
@ -690,7 +691,8 @@ DeleteCleanupRecordByRecordIdOutsideTransaction(uint64 recordId)
|
|||
PG_DIST_CLEANUP,
|
||||
recordId);
|
||||
|
||||
MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser(CitusExtensionOwnerName());
|
||||
MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser(
|
||||
CitusExtensionOwnerName());
|
||||
SendCommandListToWorkerOutsideTransactionWithConnection(connection,
|
||||
list_make1(command->data));
|
||||
}
|
||||
|
@ -754,8 +756,10 @@ TryDropShardOutsideTransaction(OperationId operationId, char *qualifiedTableName
|
|||
dropQuery->data);
|
||||
|
||||
/* remove the shard from the node */
|
||||
MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser(CitusExtensionOwnerName());
|
||||
bool success = SendOptionalCommandListToWorkerOutsideTransactionWithConnection(connection,
|
||||
MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser(
|
||||
CitusExtensionOwnerName());
|
||||
bool success = SendOptionalCommandListToWorkerOutsideTransactionWithConnection(
|
||||
connection,
|
||||
dropCommandList);
|
||||
|
||||
return success;
|
||||
|
|
|
@ -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);
|
||||
|
|
|
@ -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,7 +507,8 @@ SendOptionalCommandListToWorkerOutsideTransaction(const char *nodeName, int32 no
|
|||
MultiConnection *workerConnection = GetNodeUserDatabaseConnection(connectionFlags,
|
||||
nodeName, nodePort,
|
||||
nodeUser, NULL);
|
||||
bool failed = SendOptionalCommandListToWorkerOutsideTransactionWithConnection(workerConnection,
|
||||
bool failed = SendOptionalCommandListToWorkerOutsideTransactionWithConnection(
|
||||
workerConnection,
|
||||
commandList);
|
||||
CloseConnection(workerConnection);
|
||||
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue