Resolve conflicts in src/backend/access/transam/multixact.c and xlog.c#2564
Open
silent-observer wants to merge 1 commit into
Open
Resolve conflicts in src/backend/access/transam/multixact.c and xlog.c#2564silent-observer wants to merge 1 commit into
silent-observer wants to merge 1 commit into
Conversation
Commit dee663f removed ShutdownMultiXact, which had an extra empty line in GPDB code. It also removed several other Shutdown* functions, and replaced SimpleLruFlush with SimpleLruWriteAll. Apply the same changes to DistributedLog functions as well: remove Shutdown and replace the use of SimpleLruFlush.
RekGRpth
approved these changes
May 22, 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 dee663f removed ShutdownMultiXact
which had an extra empty line in GPDB code. It also removed several other
Shutdown* functions, and replaced SimpleLruFlush with SimpleLruWriteAll.
Apply the same changes to DistributedLog functions as well: remove Shutdown
and replace the use of SimpleLruFlush.