From ab78ab82a60b28b881092cb6151e1b0a0005c1e5 Mon Sep 17 00:00:00 2001
From: Jelte Fennema <github-tech@jeltef.nl>
Date: Mon, 19 Sep 2022 16:43:58 +0200
Subject: [PATCH] Simplification

---
 .../connection/connection_management.c         | 18 +-----------------
 .../transaction/remote_transaction.c           |  7 ++++++-
 .../distributed/connection_management.h        |  1 -
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/src/backend/distributed/connection/connection_management.c b/src/backend/distributed/connection/connection_management.c
index 699ed87f2..4d105e8b9 100644
--- a/src/backend/distributed/connection/connection_management.c
+++ b/src/backend/distributed/connection/connection_management.c
@@ -1458,7 +1458,7 @@ AfterXactHostConnectionHandling(ConnectionHashEntry *entry, bool isCommit)
 			/*
 			 * reset healthy session lifespan connections.
 			 */
-			ResetConnection(connection);
+			CloseRemoteTransaction(connection);
 
 			UnclaimConnection(connection);
 
@@ -1500,22 +1500,6 @@ ShouldShutdownConnection(MultiConnection *connection, const int cachedConnection
 }
 
 
-/*
- * ResetConnection preserves the given connection for later usage by
- * resetting its states.
- */
-void
-ResetConnection(MultiConnection *connection)
-{
-	/* reset per-transaction state */
-	ResetRemoteTransaction(connection);
-	ResetShardPlacementAssociation(connection);
-
-	/* reset copy state */
-	connection->copyBytesWrittenSinceLastFlush = 0;
-}
-
-
 /*
  * RemoteTransactionIdle function returns true if we manually
  * set flag on run_commands_on_session_level_connection_to_node to true to
diff --git a/src/backend/distributed/transaction/remote_transaction.c b/src/backend/distributed/transaction/remote_transaction.c
index 3a8ebbe07..700fcee8e 100644
--- a/src/backend/distributed/transaction/remote_transaction.c
+++ b/src/backend/distributed/transaction/remote_transaction.c
@@ -768,7 +768,12 @@ CloseRemoteTransaction(struct MultiConnection *connection)
 		dlist_delete(&connection->transactionNode);
 	}
 
-	ResetConnection(connection);
+	/* reset per-transaction state */
+	ResetRemoteTransaction(connection);
+	ResetShardPlacementAssociation(connection);
+
+	/* reset copy state */
+	connection->copyBytesWrittenSinceLastFlush = 0;
 }
 
 
diff --git a/src/include/distributed/connection_management.h b/src/include/distributed/connection_management.h
index 84bf13447..f862cd40f 100644
--- a/src/include/distributed/connection_management.h
+++ b/src/include/distributed/connection_management.h
@@ -303,7 +303,6 @@ 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);