This is an automated email from the ASF dual-hosted git repository.
maedhroz pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/cassandra.git
commit b57181032d39cb16ee1c0968b5c4d6f79fa2e2d3
Author: Jonathan Ellis <jbel...@datastax.com>
AuthorDate: Mon Jul 17 14:23:09 2023 +0200
Fix KeyRangeIntersectionIterator count
patch by Jonathan Ellis; reviewed by Andrés de la Peña
---
.../iterators/KeyRangeIntersectionIterator.java | 12 ++++++++++-
.../index/sai/iterators/KeyRangeIterator.java | 23 ++++++++++++++++------
.../KeyRangeIntersectionIteratorTest.java | 6 +++---
3 files changed, 31 insertions(+), 10 deletions(-)
diff --git
a/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIterator.java
b/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIterator.java
index f5bca7948b..63f273a2a5 100644
---
a/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIterator.java
+++
b/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIterator.java
@@ -249,6 +249,8 @@ public class KeyRangeIntersectionIterator extends
KeyRangeIterator
private static class IntersectionStatistics extends
KeyRangeIterator.Builder.Statistics
{
+ private boolean empty = true;
+
@Override
public void update(KeyRangeIterator range)
{
@@ -256,7 +258,15 @@ public class KeyRangeIntersectionIterator extends
KeyRangeIterator
min = nullSafeMax(min, range.getMinimum());
// maximum of the intersection is the smallest maximum of
individual iterators
max = nullSafeMin(max, range.getMaximum());
- count += range.getCount();
+ if (empty)
+ {
+ empty = false;
+ count = range.getCount();
+ }
+ else
+ {
+ count = Math.min(count, range.getCount());
+ }
}
}
diff --git
a/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIterator.java
b/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIterator.java
index f8bd38291b..84bf36bd59 100644
--- a/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIterator.java
+++ b/src/java/org/apache/cassandra/index/sai/iterators/KeyRangeIterator.java
@@ -18,10 +18,10 @@
package org.apache.cassandra.index.sai.iterators;
import java.io.Closeable;
-import java.util.List;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Preconditions;
+import com.google.common.collect.Iterables;
import org.apache.cassandra.index.sai.utils.PrimaryKey;
import org.apache.cassandra.utils.AbstractGuavaIterator;
@@ -29,6 +29,8 @@ import org.apache.cassandra.utils.AbstractGuavaIterator;
/**
* An abstract implementation of {@link AbstractGuavaIterator} that supports
the building and management of
* concatanation, union and intersection iterators.
+ *
+ * Only certain methods are designed to be overriden. The others are marked
private or final.
*/
public abstract class KeyRangeIterator extends
AbstractGuavaIterator<PrimaryKey> implements Closeable
{
@@ -81,7 +83,8 @@ public abstract class KeyRangeIterator extends
AbstractGuavaIterator<PrimaryKey>
*
* @param nextKey value to skip the iterator forward until matching
*
- * @return The next current key after the skip was performed
+ * @return The key skipped to, which will be the key returned by the
+ * next call to {@link #next()}, i.e., we are "peeking" at the next key as
part of the skip.
*/
public final PrimaryKey skipTo(PrimaryKey nextKey)
{
@@ -106,14 +109,22 @@ public abstract class KeyRangeIterator extends
AbstractGuavaIterator<PrimaryKey>
return recomputeNext();
}
+ /**
+ * Skip to nextKey.
+ *
+ * That is, implementations should set up the iterator state such that
+ * calling computeNext() will return nextKey if present,
+ * or the first one after it if not present.
+ */
protected abstract void performSkipTo(PrimaryKey nextKey);
- protected PrimaryKey recomputeNext()
+ private PrimaryKey recomputeNext()
{
return tryToComputeNext() ? peek() : endOfData();
}
- protected boolean tryToComputeNext()
+ @Override
+ protected final boolean tryToComputeNext()
{
boolean hasNext = super.tryToComputeNext();
current = hasNext ? next : getMaximum();
@@ -159,9 +170,9 @@ public abstract class KeyRangeIterator extends
AbstractGuavaIterator<PrimaryKey>
return statistics.count;
}
- public Builder add(List<KeyRangeIterator> ranges)
+ public Builder add(Iterable<KeyRangeIterator> ranges)
{
- if (ranges == null || ranges.isEmpty())
+ if (ranges == null || Iterables.isEmpty(ranges))
return this;
ranges.forEach(this::add);
diff --git
a/test/unit/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIteratorTest.java
b/test/unit/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIteratorTest.java
index 5e23ce093a..f650ab2724 100644
---
a/test/unit/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIteratorTest.java
+++
b/test/unit/org/apache/cassandra/index/sai/iterators/KeyRangeIntersectionIteratorTest.java
@@ -145,14 +145,14 @@ public class KeyRangeIntersectionIteratorTest extends
AbstractKeyRangeIteratorTe
builder.add(new LongIterator(new long[]{7L, 8L, 9L}));
assertEquals(9L, builder.getMaximum().token().getLongValue());
- assertEquals(9L, builder.getCount());
+ assertEquals(3L, builder.getCount());
KeyRangeIterator tokens = builder.build();
assertNotNull(tokens);
assertEquals(7L, tokens.getMinimum().token().getLongValue());
assertEquals(9L, tokens.getMaximum().token().getLongValue());
- assertEquals(9L, tokens.getCount());
+ assertEquals(3L, tokens.getCount());
assertEquals(convert(9L), convert(builder.build()));
}
@@ -173,7 +173,7 @@ public class KeyRangeIntersectionIteratorTest extends
AbstractKeyRangeIteratorTe
assertEquals(6L, builder.getMinimum().token().getLongValue());
assertEquals(6L, builder.getMaximum().token().getLongValue());
- assertEquals(9L, builder.getCount());
+ assertEquals(3L, builder.getCount());
assertEquals(3L, builder.rangeCount());
assertFalse(builder.isDisjoint());
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org
For additional commands, e-mail: commits-h...@cassandra.apache.org
