You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sa...@apache.org on 2016/02/02 16:49:58 UTC
[3/6] cassandra git commit: Filter keys searcher results by target
range
Filter keys searcher results by target range
Patch by Sam Tunnicliffe; reviewed by Sylvain Lebresne for
CASSANDRA-11104
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f51e9839
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f51e9839
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f51e9839
Branch: refs/heads/trunk
Commit: f51e98399ea3b78bdea81c6fb8bd62fda14af43c
Parents: b21df5b
Author: Sam Tunnicliffe <sa...@beobal.com>
Authored: Mon Feb 1 21:01:26 2016 +0000
Committer: Sam Tunnicliffe <sa...@beobal.com>
Committed: Tue Feb 2 15:27:08 2016 +0000
----------------------------------------------------------------------
CHANGES.txt | 1 +
.../org/apache/cassandra/index/internal/keys/KeysSearcher.java | 2 ++
2 files changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f51e9839/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index dcbce5b..ef0da4c 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.3
+ * Filter keys searcher results by target range (CASSANDRA-11104)
* Fix deserialization of legacy read commands (CASSANDRA-11087)
* Fix incorrect computation of deletion time in sstable metadata (CASSANDRA-11102)
* Avoid memory leak when collecting sstable metadata (CASSANDRA-11026)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/f51e9839/src/java/org/apache/cassandra/index/internal/keys/KeysSearcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/internal/keys/KeysSearcher.java b/src/java/org/apache/cassandra/index/internal/keys/KeysSearcher.java
index b60d2d9..f00bb27 100644
--- a/src/java/org/apache/cassandra/index/internal/keys/KeysSearcher.java
+++ b/src/java/org/apache/cassandra/index/internal/keys/KeysSearcher.java
@@ -86,6 +86,8 @@ public class KeysSearcher extends CassandraIndexSearcher
{
Row hit = indexHits.next();
DecoratedKey key = index.baseCfs.decorateKey(hit.clustering().get(0));
+ if (!command.selectsKey(key))
+ continue;
SinglePartitionReadCommand dataCmd = SinglePartitionReadCommand.create(isForThrift(),
index.baseCfs.metadata,