Tests and fix for issue #254 (RunContainer.contains(ArrayContainer)) #255
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
…map#254 1. Change termination test to ir <runCount from ir <= runCount to avoid index overflow. 2. Change result expresson to ia == arrayContainer.getCardinality(). Previous expression checked for ia <= cardinality (which would always be true), and ir <= runCount (which only worked if there was unused entries at the end of the valuesLength array. Signed-off-by: Simon Spero <sesuncedu@gmail.com>
| @@ -808,7 +808,7 @@ protected boolean contains(ArrayContainer arrayContainer) { | |||
| return false; | |||
| } | |||
| int ia = 0, ir = 0; | |||
| while(ia < arrayContainer.getCardinality() && ir <= runCount) { | |||
| while(ia < arrayContainer.getCardinality() && ir < runCount) { | |||
| int start = getValue(ir); | |||
There was a problem hiding this comment.
There is actually yet another error here: this should be
int start = Util.toIntUnsigned(getValue(ir));
|
Good catch. There is another error in the method you are patching, perhaps you could add that fix in too while you are at it? |
| @@ -808,7 +808,7 @@ protected boolean contains(ArrayContainer arrayContainer) { | |||
| return false; | |||
| } | |||
| int ia = 0, ir = 0; | |||
| while(ia < arrayContainer.getCardinality() && ir <= runCount) { | |||
| while(ia < arrayContainer.getCardinality() && ir < runCount) { | |||
| int start = getValue(ir); | |||
| int stop = start + toIntUnsigned(getLength(ir)); | |||
| if(arrayContainer.content[ia] < start) { | |||
There was a problem hiding this comment.
There's another one here; we should be storing arrayContainer.content[ia] in an int variable:
int value = Util.toIntUnsigned(arrayContainer.content[ia]);
if (value < start) {
...
} else if (value > stop) {
...```Signed-off-by: Simon Spero <sesuncedu@gmail.com>
|
LGTM |
|
Taking into account @richardstartin 's review... merging... |
Smallhi
pushed a commit
to Smallhi/RoaringBitmap
that referenced
this pull request
Jun 14, 2021
…yContainer)) (RoaringBitmap#255) * Tests demonstrating RunContainer::contains bug mentioned in issue RoaringBitmap#254 * Fixing Bug in RunContainer::contains as mentioned in issue RoaringBitmap#254 1. Change termination test to ir <runCount from ir <= runCount to avoid index overflow. 2. Change result expresson to ia == arrayContainer.getCardinality(). Previous expression checked for ia <= cardinality (which would always be true), and ir <= runCount (which only worked if there was unused entries at the end of the valuesLength array. Signed-off-by: Simon Spero <sesuncedu@gmail.com> * Convert range start and value from array container to unsigned ints. Signed-off-by: Simon Spero <sesuncedu@gmail.com>
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.
Legal-Meta - I didn't notice I didn't have sign-off set when I committed the change to the test case, but by signing off on the substantive fix, and by submitting this pull request, it is my express intent to grant any and all rights necessary to incorporate these changes into the existing codebase, and that I am legally entitled to grant such rights under the laws of the United States of America and the State of North Carolina.
/s/ Simon Spero