Enable merging of LocalVocabs
#1310
Merged
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
There are still some issues with the tests, but overall, this should work.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## master #1310 +/- ##
==========================================
+ Coverage 88.33% 88.38% +0.04%
==========================================
Files 313 313
Lines 28428 28444 +16
Branches 3133 3138 +5
==========================================
+ Hits 25111 25139 +28
+ Misses 2176 2168 -8
+ Partials 1141 1137 -4 ☔ View full report in Codecov by Sentry. |
…cal-vocab # Conflicts: # test/LocalVocabTest.cpp
hannahbast
requested changes
Apr 10, 2024
hannahbast
requested changes
Apr 10, 2024
hannahbast
requested changes
Apr 11, 2024
hannahbast
approved these changes
Apr 11, 2024
|
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.
So far, operations with more than one operand (like joins) required that at most one operand had a non-empty local vocabulary. The reason was simply to avoid the need for merging two or more local vocabularies and the corresponding hassle of having to rewrite the local vocab indexes in one or more of the operand result tables.
Now local vocab IDs are actually pointers to 16-byte aligned strings (after removing the datatype bits, which cost 4 bits in precision, hence the 16-byte alignment). Each
LocalVocabnow maintains sets of such pointers and when two or moreLocalVocabs are merged, we simply merge the respective sets. When comparing two local vocab IDs, the pointers are dereferenced.This fixes #1242.