Resolve conflicts in heapam.h, heapam_visibility.c and pruneheap.c#2441
Open
RekGRpth wants to merge 2 commits intosync-14x-b12from
Open
Resolve conflicts in heapam.h, heapam_visibility.c and pruneheap.c#2441RekGRpth wants to merge 2 commits intosync-14x-b12from
RekGRpth wants to merge 2 commits intosync-14x-b12from
Conversation
1) Commit dc7420c added a definition of the new function HeapTupleSatisfiesVacuumHorizon to src/include/access/heapam.h and changed the second argument in HeapTupleIsSurelyDead. However, an earlier commit 19cd1cf already added the third argument, Relation rel, to the function and moved the definition of the function XidInMVCCSnapshot to src/include/utils/snapmgr.h. 2) Commit dc7420c in src/backend/access/heap/heapam_visibility.c rewrote the HeapTupleSatisfiesNonVacuumable function to use the new HeapTupleSatisfiesVacuumHorizon function. However, the earlier commit 19cd1cf had already added the first argument, Relation, to the HeapTupleSatisfiesVacuum function. 3) Commit dc7420c in src/backend/access/heap/pruneheap.c in the heap_prune_chain function replaced the call to the HeapTupleSatisfiesVacuum function with a call to the new heap_prune_satisfies_vacuum function. However, the earlier commit 19cd1cf had already added the first argument, Relation, to the HeapTupleSatisfiesVacuum function.
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
1 participant
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 dc7420c added a definition of the new function
HeapTupleSatisfiesVacuumHorizon to src/include/access/heapam.h and
changed the second argument in HeapTupleIsSurelyDead. However, an
earlier commit 19cd1cf already added the third argument, Relation rel,
to the function and moved the definition of the function
XidInMVCCSnapshot to src/include/utils/snapmgr.h.
Commit dc7420c in src/backend/access/heap/heapam_visibility.c
rewrote the HeapTupleSatisfiesNonVacuumable function to use the new
HeapTupleSatisfiesVacuumHorizon function. However, the earlier commit
19cd1cf had already added the first argument, Relation, to the
HeapTupleSatisfiesVacuum function.
Commit dc7420c in src/backend/access/heap/pruneheap.c in the
heap_prune_chain function replaced the call to the
HeapTupleSatisfiesVacuum function with a call to the new
heap_prune_satisfies_vacuum function. However, the earlier commit
19cd1cf had already added the first argument, Relation, to the
HeapTupleSatisfiesVacuum function.