You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by xe...@apache.org on 2016/02/23 08:36:55 UTC
cassandra git commit: fix OnDiskIndexTest to properly treat empty
ranges
Repository: cassandra
Updated Branches:
refs/heads/trunk 5edd148c2 -> 5a4ff9045
fix OnDiskIndexTest to properly treat empty ranges
patch by xedin; reviewed by jkni for CASSANDRA-11205
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a4ff904
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a4ff904
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a4ff904
Branch: refs/heads/trunk
Commit: 5a4ff90456ae36fb1e289ae06cd5d8bec96ed233
Parents: 5edd148
Author: Pavel Yaskevich <xe...@apache.org>
Authored: Mon Feb 22 16:43:14 2016 -0800
Committer: Pavel Yaskevich <xe...@apache.org>
Committed: Mon Feb 22 23:31:02 2016 -0800
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java | 7 +++++++
2 files changed, 8 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a4ff904/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 2c856ce..f66d959 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.4
+ * fix OnDiskIndexTest to properly treat empty ranges (CASSANDRA-11205)
* fix TrackerTest to handle new notifications (CASSANDRA-11178)
* add SASI validation for partitioner and complex columns (CASSANDRA-11169)
* Add caching of encrypted credentials in PasswordAuthenticator (CASSANDRA-7715)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a4ff904/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java b/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java
index 5e6b8b0..6353155 100644
--- a/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java
+++ b/test/unit/org/apache/cassandra/index/sasi/disk/OnDiskIndexTest.java
@@ -697,6 +697,13 @@ public class OnDiskIndexTest
{
RangeIterator<Long, Token> tokens = onDiskIndex.search(expressionFor(start, true, end, false));
+ // no results should be produced only if range is empty
+ if (tokens == null)
+ {
+ Assert.assertEquals(0, end - start);
+ return;
+ }
+
int keyCount = 0;
Long lastToken = null;
while (tokens.hasNext())