Repository: phoenix Updated Branches: refs/heads/master 64fdf840b -> d07fed5e9
PHOENIX-2774 MemStoreScanner and KeyValueStore should not be aware of KeyValueScanner (Churro Morales) Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d07fed5e Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d07fed5e Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d07fed5e Branch: refs/heads/master Commit: d07fed5e997cfcbf48e09516716a919d5e3315cb Parents: 64fdf84 Author: James Taylor <jtay...@salesforce.com> Authored: Mon Mar 28 10:39:15 2016 -0700 Committer: James Taylor <jtay...@salesforce.com> Committed: Mon Mar 28 10:39:15 2016 -0700 ---------------------------------------------------------------------- .../apache/phoenix/hbase/index/covered/data/IndexMemStore.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/d07fed5e/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/data/IndexMemStore.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/data/IndexMemStore.java b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/data/IndexMemStore.java index c7c5e3a..5b68fa2 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/data/IndexMemStore.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/hbase/index/covered/data/IndexMemStore.java @@ -31,7 +31,6 @@ import org.apache.hadoop.hbase.client.Scan; import org.apache.hadoop.hbase.regionserver.IndexKeyValueSkipListSet; import org.apache.hadoop.hbase.regionserver.MemStore; import org.apache.hadoop.hbase.util.Bytes; - import org.apache.phoenix.hbase.index.covered.KeyValueStore; import org.apache.phoenix.hbase.index.covered.LocalTableState; import org.apache.phoenix.hbase.index.scanner.ReseekableScanner; @@ -251,9 +250,7 @@ public class IndexMemStore implements KeyValueStore { * Unfortunately the Java API does not offer a method to get it. So we remember the last keys * we iterated to and restore the reseeked set to at least that point. */ - - KeyValue kv = KeyValueUtil.ensureKeyValue(key); - kvsetIt = kvsetAtCreation.tailSet(getHighest(kv, kvsetItRow)).iterator(); + kvsetIt = kvsetAtCreation.tailSet(getHighest(KeyValueUtil.ensureKeyValue(key), kvsetItRow)).iterator(); return seekInSubLists(); }