Move the patch a bit later in RouterJob()

citusdata · Dec 23, 2024 · 0b434dc · 0b434dc
1 parent 1cf93c1
commit 0b434dc
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/backend/distributed/planner/distributed_planner.c b/src/backend/distributed/planner/distributed_planner.c
@@ -217,14 +217,6 @@ distributed_planner(Query *parse,
 
 		planContext.originalQuery = copyObject(parse);
 
-		/*
-		 * We may need to reorder parts of the planner tree we are receiving here.
-		 * We expect to produce an SQL query text but our tree has been optimized by
-		 * PostgreSL rewriter already...
-		 * FIXME is there conditions to reduce the number of calls ?
-		 */
-		RebuildParserTreeFromPlannerTree(planContext.originalQuery);
-
 		if (!fastPathRouterQuery)
 		{
 			/*

diff --git a/src/backend/distributed/planner/multi_router_planner.c b/src/backend/distributed/planner/multi_router_planner.c
@@ -1869,6 +1869,13 @@ RouterJob(Query *originalQuery, PlannerRestrictionContext *plannerRestrictionCon
 	}
 	else
 	{
+		/*
+		 * We may need to reorder parts of the planner tree we are receiving here.
+		 * We expect to produce an SQL query text but our tree has been optimized by
+		 * PostgreSL rewriter already...
+		 * FIXME is there conditions to reduce the number of calls ?
+		 */
+		RebuildParserTreeFromPlannerTree(originalQuery);
 		(*planningError) = PlanRouterQuery(originalQuery, plannerRestrictionContext,
 										   &placementList, &shardId, &relationShardList,
 										   &prunedShardIntervalListList,