Potential fix for issues #7782, #7783

citusdata · Jan 16, 2025 · 56df115 · 56df115
1 parent fa8e867
commit 56df115
Showing 1 changed file with 16 additions and 0 deletions.
diff --git a/src/backend/distributed/planner/distributed_planner.c b/src/backend/distributed/planner/distributed_planner.c
@@ -272,6 +272,22 @@ distributed_planner(Query *parse,
 			planContext.plan = standard_planner(planContext.query, NULL,
 												planContext.cursorOptions,
 												planContext.boundParams);
+
+			if (needsDistributedPlanning)
+			{
+				List *rtesPostPlan = ExtractRangeTableEntryList(planContext.query);
+				if (list_length(rtesPostPlan) < list_length(rangeTableList))
+				{
+					bool fDistributedTable = false;
+
+					/* range table entries have been reduced by planner, possibly by constant folding. */
+					needsDistributedPlanning = ListContainsDistributedTableRTE(
+						rtesPostPlan,
+						&
+						fDistributedTable);
+				}
+			}
+
 			if (needsDistributedPlanning)
 			{
 				result = PlanDistributedStmt(&planContext, rteIdCounter);