cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [1/6] cassandra git commit: Filter keys searcher results by target range
Date Tue, 02 Feb 2016 15:49:56 GMT
Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 b21df5b70 -> f51e98399
  refs/heads/cassandra-3.3 f70c35385 -> c5feeda6a
  refs/heads/trunk 0a83e6aa8 -> eef0ddfab


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/cassandra-3.0
Commit: f51e98399ea3b78bdea81c6fb8bd62fda14af43c
Parents: b21df5b
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Mon Feb 1 21:01:26 2016 +0000
Committer: Sam Tunnicliffe <sam@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,


Mime
View raw message