Resolve conflicts in src/backend/storage/file/buffile.c#2587
Merged
Conversation
1) Commit 808e13b in src/backend/storage/file/buffile.c added a new conditional error message to the BufFileSeek function. However, earlier commit 5028054 had already done the same, but with incorrect indentation, and also added a conditional call to the BufFileFlush function. 2) Commit 808e13b added a new function BufFileTruncateShared to src/backend/storage/file/buffile.c, while earlier GPDB-specific commits had already added the functions BufFileGetFilename, BufFileSuspend, BufFileResume, BufFilePledgeSequential, BufFileStartCompression, BufFileDumpCompressedBuffer, BufFileEndCompression, BufFileLoadCompressedBuffer in the same location.
silent-observer
approved these changes
May 26, 2026
bimboterminator1
approved these changes
May 29, 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 808e13b in src/backend/storage/file/buffile.c added a new
conditional error message to the BufFileSeek function. However, earlier
commit 5028054 had already done the same, but with incorrect
indentation, and also added a conditional call to the BufFileFlush
function.
Commit 808e13b added a new function BufFileTruncateShared to
src/backend/storage/file/buffile.c, while earlier GPDB-specific commits
had already added the functions BufFileGetFilename, BufFileSuspend,
BufFileResume, BufFilePledgeSequential, BufFileStartCompression,
BufFileDumpCompressedBuffer, BufFileEndCompression,
BufFileLoadCompressedBuffer in the same location.