WIP

src/backend/distributed/connection/connection_management.c

@@ -63,7 +63,6 @@ static void FreeConnParamsHashEntryFields(ConnParamsHashEntry *entry);
 static void AfterXactHostConnectionHandling(ConnectionHashEntry *entry, bool isCommit);
 static bool ShouldShutdownConnection(MultiConnection *connection, const int
 									 cachedConnectionCount);
-static void ResetConnection(MultiConnection *connection);
 static bool RemoteTransactionIdle(MultiConnection *connection);
 static int EventSetSizeForConnectionList(List *connections);
 
@@ -252,15 +251,9 @@ MultiConnection *
 GetLocalConnectionForSubtransactionAsUser(char *userName)
 {
 	int connectionFlag = OUTSIDE_TRANSACTION;
-	MultiConnection *connection = GetNodeUserDatabaseConnection(connectionFlag,
+	MultiConnection *connection =
-																LocalHostName,
+		GetNodeUserDatabaseConnection(connectionFlag, LocalHostName, PostPortNumber,
-																PostPortNumber,
+									  userName, get_database_name(MyDatabaseId));
-																userName,
-																get_database_name(
-																	MyDatabaseId));
-
-	/* Don't cache connection for the lifetime of the entire session. */
-	connection->forceCloseAtTransactionEnd = true;
 
 	return connection;
 }
@@ -1467,6 +1460,9 @@ AfterXactHostConnectionHandling(ConnectionHashEntry *entry, bool isCommit)
 			 */
 			ResetConnection(connection);
 
+			UnclaimConnection(connection);
+
+
 			cachedConnectionCount++;
 		}
 	}
@@ -1508,7 +1504,7 @@ ShouldShutdownConnection(MultiConnection *connection, const int cachedConnection
  * ResetConnection preserves the given connection for later usage by
  * resetting its states.
  */
-static void
+void
 ResetConnection(MultiConnection *connection)
 {
 	/* reset per-transaction state */
@@ -1517,8 +1513,6 @@ ResetConnection(MultiConnection *connection)
 
 	/* reset copy state */
 	connection->copyBytesWrittenSinceLastFlush = 0;
-
-	UnclaimConnection(connection);
 }
 
 

src/backend/distributed/operations/shard_cleaner.c

@@ -670,8 +670,8 @@ InsertCleanupRecordInSubtransaction(CleanupObject objectType,
 					 nodeGroupId,
 					 policy);
 
-	MultiConnection *connection = GetLocalConnectionForSubtransactionAsUser(
+	MultiConnection *connection =
-		CitusExtensionOwnerName());
+		GetLocalConnectionForSubtransactionAsUser(CitusExtensionOwnerName());
 	SendCommandListToWorkerOutsideTransactionWithConnection(connection,
 															list_make1(command->data));
 }
@@ -761,8 +761,6 @@ TryDropShardOutsideTransaction(OperationId operationId, char *qualifiedTableName
 																	  nodeName, nodePort,
 																	  CurrentUserName(),
 																	  NULL);
-	workerConnection->forceCloseAtTransactionEnd = true;
-
 	bool success = SendOptionalCommandListToWorkerOutsideTransactionWithConnection(
 		workerConnection,
 		dropCommandList);

src/backend/distributed/operations/shard_split.c

@@ -1015,11 +1015,12 @@ static void
 CreateObjectOnPlacement(List *objectCreationCommandList,
 						WorkerNode *workerPlacementNode)
 {
-	char *currentUser = CurrentUserName();
+	MultiConnection *c =
-	SendCommandListToWorkerOutsideTransaction(workerPlacementNode->workerName,
+		GetNodeUserDatabaseConnection(OUTSIDE_TRANSACTION,
+									  workerPlacementNode->workerName,
 									  workerPlacementNode->workerPort,
-											  currentUser,
+									  NULL, NULL);
-											  objectCreationCommandList);
+	SendCommandListToWorkerOutsideTransactionWithConnection(c, objectCreationCommandList);
 }
 
 

src/backend/distributed/replication/multi_logical_replication.c

@@ -1150,11 +1150,15 @@ CreatePartitioningHierarchy(List *logicalRepTargetList)
 				 * parallel, so create them sequentially. Also attaching partition
 				 * is a quick operation, so it is fine to execute sequentially.
 				 */
-				SendCommandListToWorkerOutsideTransaction(
+
+				MultiConnection *c =
+					GetNodeUserDatabaseConnection(OUTSIDE_TRANSACTION,
 												  target->superuserConnection->hostname,
 												  target->superuserConnection->port,
-					tableOwner,
+												  tableOwner, NULL);
-					list_make1(attachPartitionCommand));
+				SendCommandListToWorkerOutsideTransactionWithConnection(c, list_make1(
+																			attachPartitionCommand));
+
 				MemoryContextReset(localContext);
 			}
 		}
@@ -1587,7 +1591,7 @@ DropUser(MultiConnection *connection, char *username)
 		connection,
 		list_make2(
 			"SET LOCAL citus.enable_ddl_propagation TO OFF;",
-			psprintf("DROP USER IF EXISTS %s",
+			psprintf("DROP USER IF EXISTS %s;",
 					 quote_identifier(username))));
 }
 

src/backend/distributed/transaction/remote_transaction.c

@@ -766,18 +766,9 @@ CloseRemoteTransaction(struct MultiConnection *connection)
 		/* XXX: Should we error out for a critical transaction? */
 
 		dlist_delete(&connection->transactionNode);
+	}
 
-		/*
+	ResetConnection(connection);
-		 * If the transaction was completed, we have now cleaned it up, so we
-		 * can reset the state to REMOTE_TRANS_NOT_STARTED. This allows us to
-		 * start a new transaction without running into errors.
-		 */
-		if (transaction->transactionState == REMOTE_TRANS_ABORTED ||
-			transaction->transactionState == REMOTE_TRANS_COMMITTED)
-		{
-			transaction->transactionState = REMOTE_TRANS_NOT_STARTED;
-		}
-	}
 }
 
 

src/include/distributed/connection_management.h

@@ -303,6 +303,7 @@ extern MultiConnection * ConnectionAvailableToNode(char *hostName, int nodePort,
 extern void CloseConnection(MultiConnection *connection);
 extern void ShutdownAllConnections(void);
 extern void ShutdownConnection(MultiConnection *connection);
+extern void ResetConnection(MultiConnection *connection);
 
 /* dealing with a connection */
 extern void FinishConnectionListEstablishment(List *multiConnectionList);