Merge 8872f46e8d into 38fea7fe66

src/backend/distributed/planner/multi_router_planner.c

@@ -2665,6 +2665,13 @@ RouterQueryJob(Query *query, Task *task, List *placementList)
 	job->requiresMasterEvaluation = requiresMasterEvaluation;
 	job->deferredPruning = deferredPruning;
 
+	/*
+	 * Router query jobs do not require jobQuery's target list. Setting it to NIL
+	 * enables us not to serialize/de-serialize while the query is passed to the
+	 * executor. This improves planning times significantly.
+	 */
+	job->jobQuery->targetList = NIL;
+
 	return job;
 }