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

adding some more changes

pull/7659/head
paragjain 2024-09-12 07:29:31 +00:00
parent 92191f0461
commit 7f956af9e6
4 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/backend/distributed/planner/merge_planner.c
View File

@ -857,11 +857,8 @@ ConvertRelationRTEIntoSubquery(Query *mergeQuery, RangeTblEntry *sourceRte,
/* set the FROM expression to the subquery */ /* set the FROM expression to the subquery */
newRangeTableRef->rtindex = SINGLE_RTE_INDEX; newRangeTableRef->rtindex = SINGLE_RTE_INDEX;
sourceResultsQuery->jointree = makeFromExpr(list_make1(newRangeTableRef), NULL); sourceResultsQuery->jointree = makeFromExpr(list_make1(newRangeTableRef), NULL);
bool isMergeQuery = true;
sourceResultsQuery->targetList = sourceResultsQuery->targetList =
CreateAllTargetListForRelation(sourceRte->relid, requiredAttributes, CreateFilteredTargetListForRelation(sourceRte->relid, requiredAttributes);
isMergeQuery);
List *restrictionList = List *restrictionList =
GetRestrictInfoListForRelation(sourceRte, plannerRestrictionContext); GetRestrictInfoListForRelation(sourceRte, plannerRestrictionContext);
List *copyRestrictionList = copyObject(restrictionList); List *copyRestrictionList = copyObject(restrictionList);

12
src/backend/distributed/planner/query_colocation_checker.c
View File

@ -45,8 +45,6 @@
static RangeTblEntry * AnchorRte(Query *subquery); static RangeTblEntry * AnchorRte(Query *subquery);
static List * UnionRelationRestrictionLists(List *firstRelationList, static List * UnionRelationRestrictionLists(List *firstRelationList,
List *secondRelationList); List *secondRelationList);
static List * CreateFilteredTargetListForRelation(Oid relationId,
List *requiredAttributes);
static List * CreateDummyTargetList(Oid relationId, List *requiredAttributes); static List * CreateDummyTargetList(Oid relationId, List *requiredAttributes);
static TargetEntry * CreateTargetEntryForColumn(Form_pg_attribute attributeTuple, Index static TargetEntry * CreateTargetEntryForColumn(Form_pg_attribute attributeTuple, Index
rteIndex, rteIndex,
@ -325,14 +323,13 @@ WrapRteRelationIntoSubquery(RangeTblEntry *rteRelation,
* as a NULL column. * as a NULL column.
*/ */
List * List *
CreateAllTargetListForRelation(Oid relationId, List *requiredAttributes, bool CreateAllTargetListForRelation(Oid relationId, List *requiredAttributes)
isMergeQuery)
{ {
Relation relation = relation_open(relationId, AccessShareLock); Relation relation = relation_open(relationId, AccessShareLock);
int numberOfAttributes = RelationGetNumberOfAttributes(relation); int numberOfAttributes = RelationGetNumberOfAttributes(relation);
List *targetList = NIL; List *targetList = NIL;
int colAppendIdx = 1; int varAttrNo = 1;
for (int attrNum = 1; attrNum <= numberOfAttributes; attrNum++) for (int attrNum = 1; attrNum <= numberOfAttributes; attrNum++)
{ {
@ -362,9 +359,8 @@ CreateAllTargetListForRelation(Oid relationId, List *requiredAttributes, bool
} }
else else
{ {
int varAttNum = isMergeQuery ? attrNum : colAppendIdx++;
TargetEntry *targetEntry = TargetEntry *targetEntry =
CreateTargetEntryForColumn(attributeTuple, SINGLE_RTE_INDEX, varAttNum, CreateTargetEntryForColumn(attributeTuple, SINGLE_RTE_INDEX, varAttrNo++,
resNo); resNo);
targetList = lappend(targetList, targetEntry); targetList = lappend(targetList, targetEntry);
} }
@ -380,7 +376,7 @@ CreateAllTargetListForRelation(Oid relationId, List *requiredAttributes, bool
* only the required columns of the given relation. If there is not required * only the required columns of the given relation. If there is not required
* columns then a dummy NULL column is put as the only entry. * columns then a dummy NULL column is put as the only entry.
*/ */
static List * List *
CreateFilteredTargetListForRelation(Oid relationId, List *requiredAttributes) CreateFilteredTargetListForRelation(Oid relationId, List *requiredAttributes)
{ {
Relation relation = relation_open(relationId, AccessShareLock); Relation relation = relation_open(relationId, AccessShareLock);

4
src/backend/distributed/planner/recursive_planning.c
View File

@ -1768,10 +1768,8 @@ ReplaceRTERelationWithRteSubquery(RangeTblEntry *rangeTableEntry,
Query *subquery = WrapRteRelationIntoSubquery(rangeTableEntry, requiredAttrNumbers, Query *subquery = WrapRteRelationIntoSubquery(rangeTableEntry, requiredAttrNumbers,
perminfo); perminfo);
bool isMergeQuery = false;
List *outerQueryTargetList = CreateAllTargetListForRelation(rangeTableEntry->relid, List *outerQueryTargetList = CreateAllTargetListForRelation(rangeTableEntry->relid,
requiredAttrNumbers, requiredAttrNumbers);
isMergeQuery);
List *restrictionList = List *restrictionList =
GetRestrictInfoListForRelation(rangeTableEntry, GetRestrictInfoListForRelation(rangeTableEntry,

5
src/include/distributed/query_colocation_checker.h
View File

@ -38,7 +38,8 @@ extern bool SubqueryColocated(Query *subquery, ColocatedJoinChecker *context);
extern Query * WrapRteRelationIntoSubquery(RangeTblEntry *rteRelation, extern Query * WrapRteRelationIntoSubquery(RangeTblEntry *rteRelation,
List *requiredAttributes, List *requiredAttributes,
RTEPermissionInfo *perminfo); RTEPermissionInfo *perminfo);
extern List * CreateAllTargetListForRelation(Oid relationId, List *requiredAttributes, extern List * CreateAllTargetListForRelation(Oid relationId, List *requiredAttributes);
bool isMergeQuery); extern List * CreateFilteredTargetListForRelation(Oid relationId,
List *requiredAttributes);
#endif /* QUERY_COLOCATION_CHECKER_H */ #endif /* QUERY_COLOCATION_CHECKER_H */