Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Semigroup and semantic tests for union and regular Entrys #546

Merged
merged 3 commits into from
Jan 29, 2025

Conversation

jorisdral
Copy link
Collaborator

@jorisdral jorisdral commented Jan 23, 2025

This is a follow-up to #536, suggesting some changes that came up while reading the PR

Copy link
Collaborator

@mheinzel mheinzel left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice!

test/Test/Database/LSMTree/Internal/Entry.hs Outdated Show resolved Hide resolved
test/Test/Database/LSMTree/Internal/Merge.hs Outdated Show resolved Hide resolved
@jorisdral jorisdral force-pushed the jdral/union-entry-semigroup branch 3 times, most recently from 605e963 to 5f1411e Compare January 24, 2025 10:48
@jorisdral jorisdral force-pushed the jdral/union-entry-semigroup branch 4 times, most recently from 4962d8d to 2ea1734 Compare January 29, 2025 12:06
@jorisdral jorisdral changed the base branch from main to jdral/normal-union January 29, 2025 12:06
@jorisdral jorisdral force-pushed the jdral/union-entry-semigroup branch from 2ea1734 to 2697942 Compare January 29, 2025 12:09
@jorisdral jorisdral changed the title Test that Entry forms a Semigroup with combineUnion Semigroup and semantic tests for union and regular Entrys Jan 29, 2025
It was shrinking both fields of the `BlobSpan` at the same time, though it's
arguably better to shrink only the one or the other in a single shrinker step.
It is similar to `prop_MergeDistributes`, and we'll test the semantics of
`combineUnion` separately.
We also update `combineUnion` to convert `Mupdate`s into `Insert`s
unconditionally. This was already specified by the haddocks on `combineUnion`,
but we were not doing this in cases where the left or right entry was a
`Delete`.
@jorisdral jorisdral force-pushed the jdral/union-entry-semigroup branch from 2697942 to afb675d Compare January 29, 2025 13:35
Base automatically changed from jdral/normal-union to main January 29, 2025 18:00
@jorisdral jorisdral added this pull request to the merge queue Jan 29, 2025
Merged via the queue into main with commit 87549dd Jan 29, 2025
27 checks passed
@jorisdral jorisdral deleted the jdral/union-entry-semigroup branch January 29, 2025 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants