Resolve conflicts in src/backend/optimizer/plan/planner.c#2576
Open
RekGRpth wants to merge 1 commit into
Open
Conversation
1) Commit 1375422 in src/backend/optimizer/plan/planner.c in the standard_planner function removed the assertion for the rootResultRelations field, while earlier commit e180c8a had already added an assertion in the same location. 2) Commit 41efb83 in src/backend/optimizer/plan/planner.c in the subquery_planner function added initialization for the hasPseudoConstantQuals and hasAlternativeSubPlans fields, while earlier commits 6b0e52b and 7efe320 had already added initialization for the upd_del_replicated_table and config fields in the same location. 3) Commit 62e221e in the src/backend/optimizer/plan/planner.c file in the create_one_window_path function added support for incremental sorting, although it is temporarily disabled in the GPDB.
silent-observer
approved these changes
May 25, 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
2 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 1375422 in src/backend/optimizer/plan/planner.c in the
standard_planner function removed the assertion for the
rootResultRelations field, while earlier commit e180c8a had already
added an assertion in the same location.
Commit 41efb83 in src/backend/optimizer/plan/planner.c in the
subquery_planner function added initialization for the
hasPseudoConstantQuals and hasAlternativeSubPlans fields, while earlier
commits 6b0e52b and 7efe320 had already added initialization for the
upd_del_replicated_table and config fields in the same location.
Commit 62e221e in the src/backend/optimizer/plan/planner.c file in
the create_one_window_path function added support for incremental
sorting, although it is temporarily disabled in the GPDB.