Resolve conflicts in src/backend/optimizer/path/costsize.c#2575
Merged
Conversation
1) Commit a90c950 in src/backend/optimizer/path/costsize.c changed the comment and calculation of nrows in the clamp_row_est function, while earlier commit 6b0e52b had already moved the clamp_row_est function to src/include/optimizer/cost.h. 2) Commit a90c950 in src/backend/optimizer/path/costsize.c in the final_cost_nestloop function removed isnan(outer_path_rows) from the conditions, while earlier commit c5f6dbb had already added the conditional setting of numsegments to the same location.
silent-observer
previously approved these changes
May 22, 2026
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 a90c950 in src/backend/optimizer/path/costsize.c changed the
comment and calculation of nrows in the clamp_row_est function, while
earlier commit 6b0e52b had already moved the clamp_row_est function to
src/include/optimizer/cost.h.
Commit a90c950 in src/backend/optimizer/path/costsize.c in the
final_cost_nestloop function removed isnan(outer_path_rows) from the
conditions, while earlier commit c5f6dbb had already added the
conditional setting of numsegments to the same location.