From 8a866a3d5e5adc3e81dd49cb85e316a7ad934d36 Mon Sep 17 00:00:00 2001
From: Sameer Awasekar <saawasek@microsoft.com>
Date: Thu, 4 Aug 2022 18:22:01 +0530
Subject: [PATCH] Fix review comments

---
 .../distributed/connection/connection_management.c       | 1 +
 src/backend/distributed/operations/shard_split.c         | 9 ---------
 .../distributed/replication/multi_logical_replication.c  | 2 +-
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/backend/distributed/connection/connection_management.c b/src/backend/distributed/connection/connection_management.c
index 1f1910317..577378803 100644
--- a/src/backend/distributed/connection/connection_management.c
+++ b/src/backend/distributed/connection/connection_management.c
@@ -1475,6 +1475,7 @@ ShouldShutdownConnection(MultiConnection *connection, const int cachedConnection
 		   connection->forceCloseAtTransactionEnd ||
 		   PQstatus(connection->pgConn) != CONNECTION_OK ||
 		   !RemoteTransactionIdle(connection) ||
+		   connection->requiresReplication ||
 		   (MaxCachedConnectionLifetime >= 0 &&
 			MillisecondsToTimeout(connection->connectionEstablishmentStart,
 								  MaxCachedConnectionLifetime) <= 0);
diff --git a/src/backend/distributed/operations/shard_split.c b/src/backend/distributed/operations/shard_split.c
index 35b20ef70..b69792514 100644
--- a/src/backend/distributed/operations/shard_split.c
+++ b/src/backend/distributed/operations/shard_split.c
@@ -234,15 +234,6 @@ ErrorIfCannotSplitShardExtended(SplitOperation splitOperation,
 							   SplitTargetName[splitOperation])));
 	}
 
-	if (extern_IsColumnarTableAmTable(shardIntervalToSplit->relationId))
-	{
-		ereport(ERROR, (errcode(ERRCODE_FEATURE_NOT_SUPPORTED),
-						errmsg("Cannot %s %s as operation "
-							   "is not supported for Columnar tables.",
-							   SplitOperationName[splitOperation],
-							   SplitTargetName[splitOperation])));
-	}
-
 	uint32 relationReplicationFactor = TableShardReplicationFactor(
 		shardIntervalToSplit->relationId);
 	if (relationReplicationFactor > 1)
diff --git a/src/backend/distributed/replication/multi_logical_replication.c b/src/backend/distributed/replication/multi_logical_replication.c
index 0dee41ae8..472ca6c73 100644
--- a/src/backend/distributed/replication/multi_logical_replication.c
+++ b/src/backend/distributed/replication/multi_logical_replication.c
@@ -2109,7 +2109,7 @@ CreateShardSplitSubscription(MultiConnection *connection, char *sourceNodeName,
 															SHARD_SPLIT_SUBSCRIPTION_PREFIX)),
 					 quote_literal_cstr(conninfo->data),
 					 quote_identifier(publicationName),
-					 slotName);
+					 escape_param_str(slotName));
 
 	ExecuteCriticalRemoteCommand(connection, createSubscriptionCommand->data);
 	pfree(createSubscriptionCommand->data);