external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add functions to manage target entries and synchronize column names in distributed planning

m3hm3t/pg18_column_fix
Mehmet Yilmaz 2025-07-31 12:26:19 +00:00
parent 83d3eb65c8
commit 1debbbf501
1 changed files with 82 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
src/backend/distributed/planner/multi_physical_planner.c
View File

@ -241,6 +241,10 @@ static bool IsImproperForDeparseRelabelTypeNode(Node *inputNode);
static bool IsImproperForDeparseCoerceViaIONode(Node *inputNode); static bool IsImproperForDeparseCoerceViaIONode(Node *inputNode);
static CollateExpr * RelabelTypeToCollateExpr(RelabelType *relabelType); static CollateExpr * RelabelTypeToCollateExpr(RelabelType *relabelType);
static void RenameAnonymousTargetEntries(List *targetList);
static RangeTblEntry * FindRemoteQueryRTE(List *rtable);
static void SyncErefColnamesWithTargetList(RangeTblEntry *rte, List *targetList);
/* /*
* CreatePhysicalDistributedPlan is the entry point for physical plan generation. The * CreatePhysicalDistributedPlan is the entry point for physical plan generation. The
@ -607,10 +611,23 @@ BuildJobQuery(MultiNode *multiNode, List *dependentJobList)
targetList = QueryTargetList(multiNode); targetList = QueryTargetList(multiNode);
} }
RenameAnonymousTargetEntries(targetList);
/* build the join tree and the range table list */ /* build the join tree and the range table list */
List *rangeTableList = BaseRangeTableList(multiNode); List *rangeTableList = BaseRangeTableList(multiNode);
Node *joinRoot = QueryJoinTree(multiNode, dependentJobList, &rangeTableList); Node *joinRoot = QueryJoinTree(multiNode, dependentJobList, &rangeTableList);
/* ---- keep alias list in sync so deparser uses the same names */
RangeTblEntry *remoteRTE = FindRemoteQueryRTE(rangeTableList);
if (remoteRTE != NULL)
{
SyncErefColnamesWithTargetList(remoteRTE, targetList);
}
/* ------------------------------------------------------------ */
/* update the column attributes for target entries */ /* update the column attributes for target entries */
if (updateColumnAttributes) if (updateColumnAttributes)
{ {
@ -696,6 +713,71 @@ BuildJobQuery(MultiNode *multiNode, List *dependentJobList)
} }
#include <string.h> /* strcmp */
#include "utils/builtins.h" /* psprintf */
#include "nodes/makefuncs.h" /* makeString */
/* ------------------------------------------------------------------ */
/* RenameAnonymousTargetEntries */
/* ------------------------------------------------------------------ */
static void
RenameAnonymousTargetEntries(List *targetList)
{
ListCell *lc;
int anon = 0;
foreach(lc, targetList)
{
TargetEntry *tle = (TargetEntry *) lfirst(lc);
if (tle->resname == NULL ||
strcmp(tle->resname, "?column?") == 0)
{
anon++;
tle->resname = psprintf("column%d", anon);
}
}
}
/* ------------------------------------------------------------------ */
/* FindRemoteQueryRTE: return the only CITUS_RTE_REMOTE_QUERY entry */
/* ------------------------------------------------------------------ */
static RangeTblEntry *
FindRemoteQueryRTE(List *rtable)
{
ListCell *lc;
foreach(lc, rtable)
{
RangeTblEntry *rte = (RangeTblEntry *) lfirst(lc);
if (GetRangeTblKind(rte) == CITUS_RTE_REMOTE_QUERY)
{
return rte;
}
}
return NULL; /* should never happen */
}
/* ------------------------------------------------------------------ */
/* SyncErefColnamesWithTargetList */
/* ------------------------------------------------------------------ */
static void
SyncErefColnamesWithTargetList(RangeTblEntry *rte, List *targetList)
{
List *newNames = NIL;
ListCell *lc;
foreach(lc, targetList)
{
TargetEntry *tle = lfirst_node(TargetEntry, lc);
newNames = lappend(newNames, makeString(pstrdup(tle->resname)));
}
rte->eref->colnames = newNames;
}
/* /*
* BaseRangeTableList returns the list of range table entries for base tables in * BaseRangeTableList returns the list of range table entries for base tables in
* the query. These base tables stand in contrast to derived tables generated by * the query. These base tables stand in contrast to derived tables generated by