From ac07d33a291ce13b796381e317d209dd2d54ab02 Mon Sep 17 00:00:00 2001
From: Marco Slot <marco.slot@microsoft.com>
Date: Wed, 24 Aug 2022 19:24:27 +0200
Subject: [PATCH] Remove unused reduceQuery from physical planning (#6221)

Co-authored-by: Marco Slot <marco.slot@gmail.com>
---
 .../planner/multi_physical_planner.c          | 20 +++++++------------
 .../distributed/utils/citus_copyfuncs.c       |  1 -
 .../distributed/utils/citus_outfuncs.c        |  1 -
 .../distributed/multi_physical_planner.h      |  1 -
 4 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/src/backend/distributed/planner/multi_physical_planner.c b/src/backend/distributed/planner/multi_physical_planner.c
index c664e782f..f909b48ce 100644
--- a/src/backend/distributed/planner/multi_physical_planner.c
+++ b/src/backend/distributed/planner/multi_physical_planner.c
@@ -490,6 +490,10 @@ RangePartitionJoinBaseRelationId(MultiJoin *joinNode)
 	{
 		partitionNode = (MultiPartition *) rightChildNode;
 	}
+	else
+	{
+		Assert(false);
+	}
 
 	Index baseTableId = partitionNode->splitPointTableId;
 	MultiTable *baseTable = FindTableNode((MultiNode *) joinNode, baseTableId);
@@ -575,12 +579,7 @@ BuildJobQuery(MultiNode *multiNode, List *dependentJobList)
 		Job *job = (Job *) linitial(dependentJobList);
 		if (CitusIsA(job, MapMergeJob))
 		{
-			MapMergeJob *mapMergeJob = (MapMergeJob *) job;
 			isRepartitionJoin = true;
-			if (mapMergeJob->reduceQuery)
-			{
-				updateColumnAttributes = false;
-			}
 		}
 	}
 
@@ -4671,18 +4670,13 @@ MergeTaskList(MapMergeJob *mapMergeJob, List *mapTaskList, uint32 taskIdIndex)
 	for (uint32 partitionId = initialPartitionId; partitionId < partitionCount;
 		 partitionId++)
 	{
-		Task *mergeTask = NULL;
 		List *mapOutputFetchTaskList = NIL;
 		ListCell *mapTaskCell = NULL;
 		uint32 mergeTaskId = taskIdIndex;
 
-		Query *reduceQuery = mapMergeJob->reduceQuery;
-		if (reduceQuery == NULL)
-		{
-			/* create logical merge task (not executed, but useful for bookkeeping) */
-			mergeTask = CreateBasicTask(jobId, mergeTaskId, MERGE_TASK,
-										"<merge>");
-		}
+		/* create logical merge task (not executed, but useful for bookkeeping) */
+		Task *mergeTask = CreateBasicTask(jobId, mergeTaskId, MERGE_TASK,
+										  "<merge>");
 		mergeTask->partitionId = partitionId;
 		taskIdIndex++;
 
diff --git a/src/backend/distributed/utils/citus_copyfuncs.c b/src/backend/distributed/utils/citus_copyfuncs.c
index 605732b65..1e7f5f02b 100644
--- a/src/backend/distributed/utils/citus_copyfuncs.c
+++ b/src/backend/distributed/utils/citus_copyfuncs.c
@@ -198,7 +198,6 @@ CopyNodeMapMergeJob(COPYFUNC_ARGS)
 
 	copyJobInfo(&newnode->job, &from->job);
 
-	COPY_NODE_FIELD(reduceQuery);
 	COPY_SCALAR_FIELD(partitionType);
 	COPY_NODE_FIELD(partitionColumn);
 	COPY_SCALAR_FIELD(partitionCount);
diff --git a/src/backend/distributed/utils/citus_outfuncs.c b/src/backend/distributed/utils/citus_outfuncs.c
index c0748ede7..8c53ca103 100644
--- a/src/backend/distributed/utils/citus_outfuncs.c
+++ b/src/backend/distributed/utils/citus_outfuncs.c
@@ -401,7 +401,6 @@ OutMapMergeJob(OUTFUNC_ARGS)
 	WRITE_NODE_TYPE("MAPMERGEJOB");
 
 	OutJobFields(str, (Job *) node);
-	WRITE_NODE_FIELD(reduceQuery);
 	WRITE_ENUM_FIELD(partitionType, PartitionType);
 	WRITE_NODE_FIELD(partitionColumn);
 	WRITE_UINT_FIELD(partitionCount);
diff --git a/src/include/distributed/multi_physical_planner.h b/src/include/distributed/multi_physical_planner.h
index 484c8f517..a20085958 100644
--- a/src/include/distributed/multi_physical_planner.h
+++ b/src/include/distributed/multi_physical_planner.h
@@ -160,7 +160,6 @@ typedef struct Job
 typedef struct MapMergeJob
 {
 	Job job;
-	Query *reduceQuery;
 	PartitionType partitionType;
 	Var *partitionColumn;
 	uint32 partitionCount;