Resolve conflicts in src/backend/optimizer/plan/subselect.c#2579
Merged
Conversation
Commit d6c08e2 in the file src/backend/optimizer/plan/subselect.c in the make_subplan and subplan_is_hashable functions changed work_mem to hash_mem, and commit 41efb83 in the file src/backend/optimizer/plan/subselect.c in the make_subplan function changed the call to the subplan_is_hashable function to call a new function subpath_is_hashable, and also moved the call to the create_plan function under the condition, while the early commit 6b0e52b had already added the PlannerInfo *root argument and its use to the subplan_is_hashable function, and other early GPDB-specific commits had already added initialization of the curSlice and flow fields. Add a similar PlannerInfo *root argument to the subpath_is_hashable function and move the initialization of the curSlice and flow fields under the condition.
silent-observer
approved these changes
May 25, 2026
KnightMurloc
approved these changes
May 28, 2026
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Commit d6c08e2 in the file src/backend/optimizer/plan/subselect.c in
the make_subplan and subplan_is_hashable functions changed work_mem to
hash_mem, and commit 41efb83 in the file
src/backend/optimizer/plan/subselect.c in the make_subplan function
changed the call to the subplan_is_hashable function to call a new
function subpath_is_hashable, and also moved the call to the
create_plan function under the condition, while the early commit
6b0e52b had already added the PlannerInfo *root argument and its use to
the subplan_is_hashable function, and other early GPDB-specific commits
had already added initialization of the curSlice and flow fields. Add a
similar PlannerInfo *root argument to the subpath_is_hashable function
and move the initialization of the curSlice and flow fields under the
condition.