Skip to content

Resolve conflicts in src/backend/optimizer/plan/subselect.c #2579

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

Merged
RekGRpth merged 1 commit into from
May 28, 2026
Merged

Resolve conflicts in src/backend/optimizer/plan/subselect.c #2579

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
34 changes: 11 additions & 23 deletions src/backend/optimizer/plan/subselect.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,12 +87,8 @@ static List *generate_subquery_params(PlannerInfo *root, List *tlist,
List **paramIds);
static Node *convert_testexpr_mutator(Node *node,
convert_testexpr_context *context);
<<<<<<< HEAD
static bool subplan_is_hashable(PlannerInfo *root, Plan *plan);
=======
static bool subplan_is_hashable(Plan *plan);
static bool subpath_is_hashable(Path *path);
>>>>>>> f81e97d0475cd4bc597adc23b665bd84fbf79a0d
static bool subpath_is_hashable(PlannerInfo *root, Path *path);
static bool testexpr_is_hashable(Node *testexpr, List *param_ids);
static bool test_opexpr_is_hashable(OpExpr *testexpr, List *param_ids);
static bool hash_ok_operator(OpExpr *expr);
Expand Down Expand Up @@ -477,27 +473,20 @@ make_subplan(PlannerInfo *root, Query *orig_subquery,
final_rel = fetch_upper_rel(subroot, UPPERREL_FINAL, NULL);
best_path = final_rel->cheapest_total_path;

<<<<<<< HEAD
subroot->curSlice = palloc0(sizeof(PlanSlice));
subroot->curSlice->gangType = GANGTYPE_UNALLOCATED;

plan = create_plan(subroot, best_path, subroot->curSlice);
/* Decorate the top node of the plan with a Flow node. */
plan->flow = cdbpathtoplan_create_flow(subroot, best_path->locus);

/* Now we can check if it'll fit in hash_mem */
/* XXX can we check this at the Path stage? */
if (subplan_is_hashable(root, plan))
=======
/* Now we can check if it'll fit in hash_mem */
if (subpath_is_hashable(best_path))
>>>>>>> f81e97d0475cd4bc597adc23b665bd84fbf79a0d
if (subpath_is_hashable(root, best_path))
{
SubPlan *hashplan;
AlternativeSubPlan *asplan;

subroot->curSlice = palloc0(sizeof(PlanSlice));
subroot->curSlice->gangType = GANGTYPE_UNALLOCATED;

/* OK, finish planning the ANY subquery */
plan = create_plan(subroot, best_path);
plan = create_plan(subroot, best_path, subroot->curSlice);
/* Decorate the top node of the plan with a Flow node. */
plan->flow = cdbpathtoplan_create_flow(subroot,
best_path->locus);

/* ... and convert to SubPlan format */
hashplan = castNode(SubPlan,
Expand Down Expand Up @@ -984,10 +973,9 @@ subplan_is_hashable(PlannerInfo *root, Plan *plan)
* Identical to subplan_is_hashable, but work from a Path for the subplan.
*/
static bool
subpath_is_hashable(Path *path)
subpath_is_hashable(PlannerInfo *root, Path *path)
{
double subquery_size;
int hash_mem = get_hash_mem();

/*
* The estimated size of the subquery result must fit in hash_mem. (Note:
Expand All @@ -997,7 +985,7 @@ subpath_is_hashable(Path *path)
*/
subquery_size = path->rows *
(MAXALIGN(path->pathtarget->width) + MAXALIGN(SizeofHeapTupleHeader));
if (subquery_size > hash_mem * 1024L)
if (subquery_size > global_work_mem(root))
return false;

return true;
Expand Down