Resolve conflicts in src/backend/executor/execMain.c#2572
Merged
Conversation
1) Commit 1375422 in src/backend/executor/execMain.c removed the conditional initialization of ResultRelInfo in the InitPlan function, while the earlier commit 6b0e52b had already added a comment before this same location. 2) Commit 1375422 in src/backend/executor/execMain.c separated part of the ExecEndPlan function into a new function, ExecCloseResultRelations, while the earlier commit 6b0e52b had already reversed the loop for calling ExecCloseIndices in this same location.
silent-observer
approved these changes
May 25, 2026
3) Commit a04daa9 removed the es_result_relation_info field from the EState structure in src/include/nodes/execnodes.h. Remove it in GPDB-specific locations. 4) Commit 1375422 removed the es_num_result_relations field from the EState structure in src/include/nodes/execnodes.h, replacing it with the new es_opened_result_relations field. Replace it in GPDB-specific locations.
silent-observer
approved these changes
May 28, 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 1375422 in src/backend/executor/execMain.c removed the
conditional initialization of ResultRelInfo in the InitPlan function,
while the earlier commit 6b0e52b had already added a comment before
this same location.
Commit 1375422 in src/backend/executor/execMain.c separated part of
the ExecEndPlan function into a new function, ExecCloseResultRelations,
while the earlier commit 6b0e52b had already reversed the loop for
calling ExecCloseIndices in this same location.
Commit a04daa9 removed the es_result_relation_info field from the
EState structure in src/include/nodes/execnodes.h. Remove it in
GPDB-specific locations.
Commit 1375422 removed the es_num_result_relations field from the
EState structure in src/include/nodes/execnodes.h, replacing it with
the new es_opened_result_relations field. Replace it in GPDB-specific
locations.