Rename Merge.Level to MergeType and extend with MergeUnion enum value #524
Conversation
This file contains 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
dcoutts
requested review from
jorisdral,
mheinzel,
recursion-ninja and
wenkokke
as code owners
In Test.Database.LSMTree.Internal.Snapshot.Codec, import the general Database.LSMTree.Extras.Generators and use several of the arbitrary instances from there. Remove ones that were duplicates, and remove overlapping instances.
This follows the naming scheme from the prototype. This just adds the new enum (and renames) but does not introduce any new merging behaviour yet, and the new MergeUnion value is not used (except in snapshot (de)serialisation).
dcoutts
force-pushed
the
dcoutts/merging-tree
branch
from
3e3cc52 to
64cd6d7
Compare
mheinzel
reviewed
Jan 13, 2025
mheinzel
reviewed
Jan 13, 2025
Comment on lines
+199
to
201
| mergeWriteBuffers mergeType = | ||
| (if mergeType == MergeLastLevel then Map.filter (not . isDelete) else id) | ||
| . Map.unionsWith (Entry.combine mappendValues) |
There was a problem hiding this comment.
This will also need to handle MergeUnion differently, maybe add a TODO so we don't forget.
mheinzel
reviewed
Jan 13, 2025
| mergeWriteBuffers level = | ||
| (if level == Merge.LastLevel then Map.filter (not . isDelete) else id) | ||
| mergeWriteBuffers mergeType = | ||
| (if mergeType == MergeLastLevel then Map.filter (not . isDelete) else id) |
There was a problem hiding this comment.
I think this is where the test failure comes from. Union merges also drop Deletes (https://github.com/IntersectMBO/lsm-tree/pull/524/files#diff-fa33669ac986142f1cd163910716d90a92851522d036426f451e3cd069b0e5e2R393).
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Prep for merging trees.