Merge branch 'release-13.0' into colm/issue_7890

citusdata · Feb 18, 2025 · c280f26 · c280f26
2 parents be5fe8b + 8f3d9de
commit c280f26
Show file tree

Hide file tree

Showing 5 changed files with 677 additions and 34 deletions.
diff --git a/src/backend/distributed/planner/query_pushdown_planning.c b/src/backend/distributed/planner/query_pushdown_planning.c
@@ -2097,6 +2097,16 @@ CreateSubqueryTargetListAndAdjustVars(List *columnList)
 		 */
 		column->varno = 1;
 		column->varattno = resNo;
+
+		/*
+		 * 1 subquery means there is one range table entry so with Postgres 16+ we need
+		 * to ensure that column's varnullingrels - the set of join rels that can null
+		 * the var - is empty. Otherwise, when given the query, the Postgres planner
+		 * may attempt to access a non-existent range table and segfault, as in #7787.
+		 */
+#if PG_VERSION_NUM >= PG_VERSION_16
+		column->varnullingrels = NULL;
+#endif
 	}
 
 	return subqueryTargetEntryList;