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

Merge cb2f4c5aaf into 0d848debf0

pull/8023/merge
Mehmet YILMAZ 2025-06-19 12:28:07 +02:00 committed by GitHub
parent 0d848debf0 cb2f4c5aaf
commit f448f45ba3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/backend/distributed/deparser/ruleutils_18.c
View File

@ -795,6 +795,11 @@ set_rtable_names(deparse_namespace *dpns, List *parent_namespaces,
/* Unnamed join has no refname */ /* Unnamed join has no refname */
refname = NULL; refname = NULL;
} }
else if (rte->rtekind == RTE_GROUP)
{
/* Use the name of the group */
refname = NULL;
}
else else
{ {
/* Otherwise use whatever the parser assigned */ /* Otherwise use whatever the parser assigned */
@ -1191,8 +1196,9 @@ set_relation_column_names(deparse_namespace *dpns, RangeTblEntry *rte,
* real_colnames[] will be indexed by physical column number, with NULL * real_colnames[] will be indexed by physical column number, with NULL
* entries for dropped columns. * entries for dropped columns.
*/ */
if (rte->rtekind == RTE_RELATION || if ((rte->rtekind == RTE_RELATION ||
GetRangeTblKind(rte) == CITUS_RTE_SHARD) GetRangeTblKind(rte) == CITUS_RTE_SHARD) &&
OidIsValid(rte->relid))
{ {
/* Relation --- look to the system catalogs for up-to-date info */ /* Relation --- look to the system catalogs for up-to-date info */
Relation rel; Relation rel;
@ -1215,6 +1221,28 @@ set_relation_column_names(deparse_namespace *dpns, RangeTblEntry *rte,
} }
relation_close(rel, AccessShareLock); relation_close(rel, AccessShareLock);
} }
else if (GetRangeTblKind(rte) == CITUS_RTE_SHARD)
{
/* shard RTE without relid (pulled-up clone in PG18) */
/* use the column aliases already stored in rte->eref->colnames */
ncolumns = list_length(rte->eref->colnames);
real_colnames = (char **) palloc0(ncolumns * sizeof(char *));
for (i = 0; i < ncolumns; i++)
real_colnames[i] = pstrdup(strVal(list_nth(rte->eref->colnames, i)));
/* keep changed_any / has_anonymous defaults */
}
else if (rte->rtekind == RTE_GROUP)
{
/* ----- synthetic PG 18 RTE for GROUP BY / HAVING ----- */
ncolumns = list_length(rte->eref->colnames);
real_colnames = (char **) palloc0(ncolumns * sizeof(char *));
for (i = 0; i < ncolumns; i++)
real_colnames[i] = pstrdup(strVal(list_nth(rte->eref->colnames, i)));
}
else else
{ {
/* Otherwise get the column names from eref or expandRTE() */ /* Otherwise get the column names from eref or expandRTE() */