Updated Branches: refs/heads/trunk cd6aa2d1e -> 69d559a3b
Make Memtable.getEntyIterator() respect the cfs iterator Currently it assumes StorageSerive.getPartitioner(), which is not correct for 2i CFSs (LocalPartitioner) Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/65cd5801 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/65cd5801 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/65cd5801 Branch: refs/heads/trunk Commit: 65cd5801f53e2d9abe3cd9d557e39a425976cc6a Parents: cc10724 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Sun Aug 25 00:22:23 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Sun Aug 25 00:22:23 2013 +0300 ---------------------------------------------------------------------- src/java/org/apache/cassandra/db/Memtable.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/65cd5801/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java index b3ea3a2..3490a35 100644 --- a/src/java/org/apache/cassandra/db/Memtable.java +++ b/src/java/org/apache/cassandra/db/Memtable.java @@ -291,9 +291,9 @@ public class Memtable { return new Iterator<Map.Entry<DecoratedKey, AtomicSortedColumns>>() { - private Iterator<Map.Entry<RowPosition, AtomicSortedColumns>> iter = stopAt.isMinimum() - ? rows.tailMap(startWith).entrySet().iterator() - : rows.subMap(startWith, true, stopAt, true).entrySet().iterator(); + private Iterator<Map.Entry<RowPosition, AtomicSortedColumns>> iter = stopAt.isMinimum(cfs.partitioner) + ? rows.tailMap(startWith).entrySet().iterator() + : rows.subMap(startWith, true, stopAt, true).entrySet().iterator(); public boolean hasNext() {
