Skip to content

CNDB-15608 port KeyRangeConcatIteratorTest refactoring #2268

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

Merged
k-rus merged 2 commits into from
Mar 16, 2026
Merged

CNDB-15608 port KeyRangeConcatIteratorTest refactoring #2268

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8dea03d
CNDB-15608 port KeyRangeConcatIteratorTest refactoring
k-rus Mar 12, 2026
6d48435
Fix indentation of the following line to affected
k-rus Mar 13, 2026
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
1 change: 1 addition & 0 deletions src/java/org/apache/cassandra/index/sai/iterators/KeyRangeConcatIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
*/
public class KeyRangeConcatIterator extends KeyRangeIterator
{
public static final String MUST_BE_SORTED_ERROR = "RangeIterator must be sorted, previous max: %s, next min: %s";
private final Iterator<KeyRangeIterator> ranges;
private KeyRangeIterator currentRange;
private final List<KeyRangeIterator> toRelease;
Expand Down
2 changes: 1 addition & 1 deletion src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIterator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ public void update(KeyRangeIterator range)
}
else if (tokenCount > 0 && max.compareTo(range.getMinimum()) > 0)
{
throw new IllegalArgumentException("KeyRangeIterator must be sorted, previous max: " + max + ", next min: " + range.getMinimum());
throw new IllegalArgumentException(String.format(KeyRangeConcatIterator.MUST_BE_SORTED_ERROR, max, range.getMinimum()));
}

max = range.getMaximum();
Expand Down
2 changes: 1 addition & 1 deletion test/unit/org/apache/cassandra/index/sai/iterators/AbstractKeyRangeIteratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@

public class AbstractKeyRangeIteratorTest extends SaiRandomizedTest
{
private static final PrimaryKey.Factory TEST_PRIMARY_KEY_FACTORY = SAIUtil.currentVersion().onDiskFormat()
static final PrimaryKey.Factory TEST_PRIMARY_KEY_FACTORY = SAIUtil.currentVersion().onDiskFormat()
.newPrimaryKeyFactory(new ClusteringComparator(LongType.instance));
Comment thread
k-rus marked this conversation as resolved.
Outdated

protected long[] arr(long... longArray)
Expand Down
52 changes: 20 additions & 32 deletions test/unit/org/apache/cassandra/index/sai/iterators/KeyRangeConcatIteratorTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,54 +23,35 @@

import org.junit.Test;

import org.apache.cassandra.dht.Murmur3Partitioner;
import org.apache.cassandra.utils.Pair;

import static org.apache.cassandra.index.sai.iterators.LongIterator.convert;
import static org.assertj.core.api.Assertions.assertThatThrownBy;

public class KeyRangeConcatIteratorTest extends AbstractKeyRangeIteratorTest
{
@Test
public void testValidation()
{
try
{
buildConcat(build(1L, 4L), build(2L, 3L));
fail("Flows for a merging concatenation must not contain one another.");
}
catch (IllegalArgumentException ignored)
{
}
// Iterators being merged via concatanation must not include each other
assertThatThrownBy(() -> buildConcat(build(1L, 4L), build(2L, 3L))).isInstanceOf(IllegalArgumentException.class)
.hasMessage(createErrorMessage(4, 2));

try
{
buildConcat(build(1L, 4L), build(2L, 5L));
fail("Minimum for flow must not be included in exclusive range of previous flow.");
}
catch (IllegalArgumentException ignored)
{
}
// Iterators being merged via concatanation must not overlap
assertThatThrownBy(() -> buildConcat(build(1L, 4L), build(2L, 5L))).isInstanceOf(IllegalArgumentException.class)
.hasMessage(createErrorMessage(4, 2));

// allow min boundary included
KeyRangeIterator concat = buildConcat(build(1L, 4L), build(4L, 5L));
assertEquals(convert(1L, 4L, 4L, 5L), convert(concat));

try
{
buildConcat(build(1L, 4L), build(0L, 3L));
fail("Maximum for flow must not be included in exclusive range of previous flow.");
}
catch (IllegalArgumentException ignored)
{
}
assertThatThrownBy(() -> buildConcat(build(1L, 4L), build(0L, 3L))).isInstanceOf(IllegalArgumentException.class)
.hasMessage(createErrorMessage(4, 0));

try
{
buildConcat(build(2L, 4L), build(0L, 1L));
fail("Flows for merging concatenation must be sorted.");
}
catch (IllegalArgumentException ignored)
{
}
// Iterators being merged via concatanation must be sorted
assertThatThrownBy(() -> buildConcat(build(2L, 4L), build(0L, 1L))).isInstanceOf(IllegalArgumentException.class)
.hasMessage(createErrorMessage(4, 0));

// with empty flow
concat = buildConcat(build(), build(0L, 1L));
Expand Down Expand Up @@ -439,4 +420,11 @@ private KeyRangeIterator.Builder getConcatBuilder()
{
return KeyRangeConcatIterator.builder();
}

private String createErrorMessage(int max, int min)
{
return String.format(KeyRangeConcatIterator.MUST_BE_SORTED_ERROR,
TEST_PRIMARY_KEY_FACTORY.createTokenOnly(new Murmur3Partitioner.LongToken(max)),
TEST_PRIMARY_KEY_FACTORY.createTokenOnly(new Murmur3Partitioner.LongToken(min)));
}
}
Loading