From 8f60737619dcd570e92687e7aa0de381907ed525 Mon Sep 17 00:00:00 2001
From: Heikki Linnakangas <hlinnakangas@pivotal.io>
Date: Fri, 11 Aug 2017 09:13:35 +0300
Subject: [PATCH] Remove unused fields from interconnect structs.

---
 src/backend/cdb/dispatcher/cdbconn.c           | 1 -
 src/backend/cdb/dispatcher/test/cdbgang_test.c | 2 --
 src/backend/cdb/motion/ic_udpifc.c             | 6 ++----
 src/include/cdb/cdbconn.h                      | 1 -
 src/include/cdb/cdbinterconnect.h              | 7 -------
 5 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/src/backend/cdb/dispatcher/cdbconn.c b/src/backend/cdb/dispatcher/cdbconn.c
index 5ceab06b2f..b016f04ec1 100644
--- a/src/backend/cdb/dispatcher/cdbconn.c
+++ b/src/backend/cdb/dispatcher/cdbconn.c
@@ -240,7 +240,6 @@ void cdbconn_initSegmentDescriptor(SegmentDatabaseDescriptor *segdbDesc,
 	segdbDesc->conn = NULL;
 	segdbDesc->motionListener = 0;
 	segdbDesc->backendPid = 0;
-	segdbDesc->myAgent = NULL;
 
 	/*whoami*/
 	segdbDesc->whoami = NULL;
diff --git a/src/backend/cdb/dispatcher/test/cdbgang_test.c b/src/backend/cdb/dispatcher/test/cdbgang_test.c
index e2ef08a195..cbb62acbae 100644
--- a/src/backend/cdb/dispatcher/test/cdbgang_test.c
+++ b/src/backend/cdb/dispatcher/test/cdbgang_test.c
@@ -175,7 +175,6 @@ static void test__createWriterGang(void **state)
 		assert_int_equal(segdb->errcode, 0);
 		assert_int_equal(segdb->error_message.len, 0);
 		assert_int_equal(segdb->motionListener, motionListener);
-		assert_int_equal(segdb->myAgent, NULL);
 		assert_int_equal(segdb->segindex, i);
 
 		validateCdbInfo(segdb->segment_database_info, segdb->segindex);
@@ -225,7 +224,6 @@ static void test__createReaderGang(void **state)
 		assert_int_equal(segdb->errcode, 0);
 		assert_int_equal(segdb->error_message.len, 0);
 		assert_int_equal(segdb->motionListener, motionListener);
-		assert_int_equal(segdb->myAgent, NULL);
 		assert_int_equal(segdb->segindex, i);
 
 		validateCdbInfo(segdb->segment_database_info, segdb->segindex);
diff --git a/src/backend/cdb/motion/ic_udpifc.c b/src/backend/cdb/motion/ic_udpifc.c
index 4a8a6ee058..6c1a087a72 100644
--- a/src/backend/cdb/motion/ic_udpifc.c
+++ b/src/backend/cdb/motion/ic_udpifc.c
@@ -2663,8 +2663,6 @@ startOutgoingUDPConnections(ChunkTransportState *transportStates,
 			conn->state = mcsSetupOutgoingConnection;
 			conn->route = i++;
 
-			conn->waitEOS = false;
-
 			(*pOutgoingCount)++;
 		}
 
@@ -6600,7 +6598,7 @@ dumpConnections(ChunkTransportStateEntry *pEntry, const char *fname)
 		fprintf(ofile, "conns[%d] motNodeId=%d: remoteContentId=%d pid=%d sockfd=%d remote=%s local=%s "
 				"capacity=%d sentSeq=%d receivedAckSeq=%d consumedSeq=%d rtt=" UINT64_FORMAT
 				" dev=" UINT64_FORMAT " deadlockCheckBeginTime=" UINT64_FORMAT " route=%d msgSize=%d msgPos=%p"
-				" recvBytes=%d tupleCount=%d waitEOS=%d stillActive=%d stopRequested=%d "
+				" recvBytes=%d tupleCount=%d stillActive=%d stopRequested=%d "
 				"state=%d\n",
 				 i, pEntry->motNodeId,
 				 conn->remoteContentId,
@@ -6610,7 +6608,7 @@ dumpConnections(ChunkTransportStateEntry *pEntry, const char *fname)
 				 conn->localHostAndPort,
 				 conn->capacity, conn->sentSeq, conn->receivedAckSeq, conn->consumedSeq,
 				 conn->rtt, conn->dev, conn->deadlockCheckBeginTime, conn->route, conn->msgSize, conn->msgPos,
-				 conn->recvBytes, conn->tupleCount, conn->waitEOS, conn->stillActive, conn->stopRequested,
+				 conn->recvBytes, conn->tupleCount, conn->stillActive, conn->stopRequested,
 				 conn->state);
 		fprintf(ofile, "conn_info [%s: seq %d extraSeq %d]: motNodeId %d, crc %d len %d "
 				"srcContentId %d dstDesContentId %d "
diff --git a/src/include/cdb/cdbconn.h b/src/include/cdb/cdbconn.h
index f07bbd4904..90454400de 100644
--- a/src/include/cdb/cdbconn.h
+++ b/src/include/cdb/cdbconn.h
@@ -57,7 +57,6 @@ typedef struct SegmentDatabaseDescriptor
     uint32		            motionListener; /* interconnect listener port */
     int4					backendPid;
     char                   *whoami;         /* QE identifier for msgs */
-    struct SegmentDatabaseDescriptor * myAgent;
 
 } SegmentDatabaseDescriptor;
 
diff --git a/src/include/cdb/cdbinterconnect.h b/src/include/cdb/cdbinterconnect.h
index 3b4a89ecc9..d3aa5ae5be 100644
--- a/src/include/cdb/cdbinterconnect.h
+++ b/src/include/cdb/cdbinterconnect.h
@@ -235,9 +235,6 @@ struct MotionConn
 
 	int			tupleCount;
 
-	/* indicate whether main thread is waiting EOS ack on this connection */
-	bool waitEOS;
-
 	bool		stillActive;
 	bool		stopRequested;
 
@@ -246,7 +243,6 @@ struct MotionConn
 	uint64		wakeup_ms;
 
 	struct icpkthdr		conn_info;
-	bool		isMirror;
 
     struct CdbProcess  *cdbProc;
     int			remoteContentId;
@@ -274,9 +270,6 @@ struct MotionConn
 	uint64 stat_max_resent;
 	uint64 stat_count_dropped;
 
-	/* Indicate whether an EOS is received and acked. */
-	bool eosAcked;
-
 	/*
 	 * used by the sender.
 	 *
-- 
GitLab