Updated Branches: refs/heads/trunk 15d607568 -> f66b9eb27
Remove dead ColumnSlice.NavigatableMapIterator Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f66b9eb2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f66b9eb2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f66b9eb2 Branch: refs/heads/trunk Commit: f66b9eb27d88e6f438d4e9d4d4bb8885f78c7bf1 Parents: 15d6075 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Feb 13 03:10:27 2014 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Feb 13 03:10:27 2014 +0300 ---------------------------------------------------------------------- .../apache/cassandra/db/filter/ColumnSlice.java | 49 -------------------- 1 file changed, 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f66b9eb2/src/java/org/apache/cassandra/db/filter/ColumnSlice.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/ColumnSlice.java b/src/java/org/apache/cassandra/db/filter/ColumnSlice.java index f5ea49a..02a5a0c 100644 --- a/src/java/org/apache/cassandra/db/filter/ColumnSlice.java +++ b/src/java/org/apache/cassandra/db/filter/ColumnSlice.java @@ -138,55 +138,6 @@ public class ColumnSlice } } - public static class NavigableMapIterator extends AbstractIterator<Cell> - { - private final NavigableMap<CellName, Cell> map; - private final ColumnSlice[] slices; - - private int idx = 0; - private Iterator<Cell> currentSlice; - - public NavigableMapIterator(NavigableMap<CellName, Cell> map, ColumnSlice[] slices) - { - this.map = map; - this.slices = slices; - } - - protected Cell computeNext() - { - if (currentSlice == null) - { - if (idx >= slices.length) - return endOfData(); - - ColumnSlice slice = slices[idx++]; - // Note: we specialize the case of start == "" and finish = "" because it is slightly more efficient, but also they have a specific - // meaning (namely, they always extend to the beginning/end of the range). - if (slice.start.isEmpty()) - { - if (slice.finish.isEmpty()) - currentSlice = map.values().iterator(); - else - currentSlice = map.headMap(new FakeCellName(slice.finish), true).values().iterator(); - } - else if (slice.finish.isEmpty()) - { - currentSlice = map.tailMap(new FakeCellName(slice.start), true).values().iterator(); - } - else - { - currentSlice = map.subMap(new FakeCellName(slice.start), true, new FakeCellName(slice.finish), true).values().iterator(); - } - } - - if (currentSlice.hasNext()) - return currentSlice.next(); - - currentSlice = null; - return computeNext(); - } - } - public static class NavigableSetIterator extends AbstractIterator<Cell> { private final NavigableSet<Cell> set;
