Skip to content

CASSANDRA-21602 Fix bug with NormalizedRanges.Intersects #5059

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.

Sign up for GitHub

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

Open
alanwang67 wants to merge 1 commit into
base: trunk
Choose a base branch
from
Open

CASSANDRA-21602 Fix bug with NormalizedRanges.Intersects #5059

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/java/org/apache/cassandra/dht/NormalizedRanges.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,12 +48,12 @@ public class NormalizedRanges<T extends RingPosition<T>> extends AbstractList<Ra
boolean rangeRightIsMin = range.right.isMinimum();
boolean keyIsMinimum = key.isMinimum();

if (keyIsMinimum & rangeRightIsMin)
return 0;
if (keyIsMinimum)
return rangeRightIsMin ? 0 : -1;

int lc = key.compareTo(range.left);
int rc = key.compareTo(range.right);
if ((lc < 0 & !keyIsMinimum) | lc == 0) return 1;
if (lc <= 0) return 1;
if (rc > 0 & !rangeRightIsMin) return -1;
return 0;
};
Expand Down
19 changes: 19 additions & 0 deletions test/unit/org/apache/cassandra/dht/RangeTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -860,6 +860,25 @@ else if (ii > 80 && ii <= 90)
assertEquals(emptyList(), maxLongRange.subtract(ranges));
}

@Test
@UseMurmur3Partitioner
public void testNormalizedRangesWithMinToken()
{
Token min = t(Long.MIN_VALUE);

for (NormalizedRanges<Token> ranges : ImmutableList.of(
normalizedRanges(ImmutableList.of(r(Long.MIN_VALUE, Long.MIN_VALUE))),
normalizedRanges(ImmutableList.of(r(Long.MIN_VALUE, 100))),
normalizedRanges(ImmutableList.of(r(100, Long.MIN_VALUE))),
normalizedRanges(ImmutableList.of(r(-500, -100), r(100, 500))),
normalizedRanges(ImmutableList.of(r(Long.MIN_VALUE, -100), r(100, 500))),
normalizedRanges(ImmutableList.of(r(Long.MIN_VALUE, -100), r(100, Long.MIN_VALUE))),
normalizedRanges(ImmutableList.of(r(100, 500)))))
{
assertEquals(Range.isInRanges(min, ranges), ranges.intersects(min));
}
}

@Test
public void testExpensiveChecksBurn()
{
Expand Down