Resolve conflicts in src/backend/optimizer/plan/setrefs.c#2577
Merged
Conversation
1) Commit 41efb83 in src/backend/optimizer/plan/setrefs.c added a new field, num_exec, to the fix_join_expr_context structure. However, the earlier commit 6b0e52b had already added the fields, use_outer_tlist_for_matching_nonvars and use_inner_tlist_for_matching_nonvars, to the same location. 2) Commit 41efb83 in src/backend/optimizer/plan/setrefs.c added the num_exec argument to the initialization of the startOffset and endOffset fields in the fix_scan_expr function call. However, earlier GPDB-specific commits had already added GPDB-specific code to the same location. 3) Commit 41efb83 in src/backend/optimizer/plan/setrefs.c added the num_exec argument to the initialization of the indexqual field in the set_indexonlyscan_references function when calling the fix_scan_list macro. However, commit 598f4b0 had already added the initialization of the indexqualorig field to the same location. 4) Commit 41efb83 in src/backend/optimizer/plan/setrefs.c added the initialization of the num_exec field to the fix_join_expr function. However, commit 6b0e52b had already added the initialization of the use_outer_tlist_for_matching_nonvars and use_inner_tlist_for_matching_nonvars fields to the same location.
silent-observer
approved these changes
May 25, 2026
5) Commit 41efb83 added a new num_exec argument to the fix_scan_list macro in src/backend/optimizer/plan/setrefs.c. Add this in GPDB-specific locations. 6) Commit 41efb83 added a new double num_exec argument to the fix_upper_expr and fix_join_expr functions in src/backend/optimizer/plan/setrefs.c. Add this in GPDB-specific locations.
silent-observer
approved these changes
May 28, 2026
KnightMurloc
approved these changes
May 28, 2026
silent-observer
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 41efb83 in src/backend/optimizer/plan/setrefs.c added a new
field, num_exec, to the fix_join_expr_context structure. However, the
earlier commit 6b0e52b had already added the fields,
use_outer_tlist_for_matching_nonvars and
use_inner_tlist_for_matching_nonvars, to the same location.
Commit 41efb83 in src/backend/optimizer/plan/setrefs.c added the
num_exec argument to the initialization of the startOffset and
endOffset fields in the fix_scan_expr function call. However, earlier
GPDB-specific commits had already added GPDB-specific code to the same
location.
Commit 41efb83 in src/backend/optimizer/plan/setrefs.c added the
num_exec argument to the initialization of the indexqual field in the
set_indexonlyscan_references function when calling the fix_scan_list
macro. However, commit 598f4b0 had already added the initialization of
the indexqualorig field to the same location.
Commit 41efb83 in src/backend/optimizer/plan/setrefs.c added the
initialization of the num_exec field to the fix_join_expr function.
However, commit 6b0e52b had already added the initialization of the
use_outer_tlist_for_matching_nonvars and
use_inner_tlist_for_matching_nonvars fields to the same location.
Commit 41efb83 added a new num_exec argument to the fix_scan_list
macro in src/backend/optimizer/plan/setrefs.c. Add this in
GPDB-specific locations.
Commit 41efb83 added a new double num_exec argument to the
fix_upper_expr and fix_join_expr functions in
src/backend/optimizer/plan/setrefs.c. Add this in GPDB-specific
locations.