Skip to content

Resolve conflicts in src/backend/optimizer/plan/setrefs.c #2577

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RekGRpth wants to merge 1 commit into
base: sync-14x-b13
Choose a base branch
from
Open

Resolve conflicts in src/backend/optimizer/plan/setrefs.c #2577

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 6 additions & 22 deletions src/backend/optimizer/plan/setrefs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,9 @@ typedef struct
indexed_tlist *inner_itlist;
Index acceptable_rel;
int rtoffset;
<<<<<<< HEAD
bool use_outer_tlist_for_matching_nonvars;
bool use_inner_tlist_for_matching_nonvars;
=======
double num_exec;
>>>>>>> f81e97d0475cd4bc597adc23b665bd84fbf79a0d
} fix_join_expr_context;

typedef struct
Expand Down Expand Up @@ -1137,26 +1134,19 @@ set_plan_refs(PlannerInfo *root, Plan *plan, int rtoffset)
* in GPDB, we allow the ROWS/RANGE expressions to contain
* references to the subplan, so we have to use fix_upper_expr.
*/
<<<<<<< HEAD
if (wplan->startOffset || wplan->endOffset)
{
subplan_itlist =
build_tlist_index(plan->lefttree->targetlist);

wplan->startOffset =
fix_upper_expr(root, wplan->startOffset,
subplan_itlist, OUTER_VAR, rtoffset);
subplan_itlist, OUTER_VAR, rtoffset, 1);
wplan->endOffset =
fix_upper_expr(root, wplan->endOffset,
subplan_itlist, OUTER_VAR, rtoffset);
subplan_itlist, OUTER_VAR, rtoffset, 1);
pfree(subplan_itlist);
}
=======
wplan->startOffset =
fix_scan_expr(root, wplan->startOffset, rtoffset, 1);
wplan->endOffset =
fix_scan_expr(root, wplan->endOffset, rtoffset, 1);
>>>>>>> f81e97d0475cd4bc597adc23b665bd84fbf79a0d
}
break;
case T_Result:
Expand Down Expand Up @@ -1425,15 +1415,12 @@ set_indexonlyscan_references(PlannerInfo *root,
INDEX_VAR,
rtoffset,
NUM_EXEC_QUAL((Plan *) plan));
/* indexqual is already transformed to reference index columns */
<<<<<<< HEAD
plan->indexqual = fix_scan_list(root, plan->indexqual, rtoffset);
/* indexqualorig is already transformed to reference index columns */
plan->indexqualorig = fix_scan_list(root, plan->indexqualorig, rtoffset);
=======
plan->indexqualorig = fix_scan_list(root, plan->indexqualorig,
rtoffset, 1);
/* indexqual is already transformed to reference index columns */
plan->indexqual = fix_scan_list(root, plan->indexqual,
rtoffset, 1);
>>>>>>> f81e97d0475cd4bc597adc23b665bd84fbf79a0d
/* indexorderby is already transformed to reference index columns */
plan->indexorderby = fix_scan_list(root, plan->indexorderby,
rtoffset, 1);
Expand Down Expand Up @@ -3047,13 +3034,10 @@ fix_join_expr(PlannerInfo *root,
context.inner_itlist = inner_itlist;
context.acceptable_rel = acceptable_rel;
context.rtoffset = rtoffset;
<<<<<<< HEAD
context.use_outer_tlist_for_matching_nonvars = true;
context.use_inner_tlist_for_matching_nonvars = true;

=======
context.num_exec = num_exec;
>>>>>>> f81e97d0475cd4bc597adc23b665bd84fbf79a0d

return (List *) fix_join_expr_mutator((Node *) clauses, &context);
}

Expand Down