Repository: cassandra Updated Branches: refs/heads/cassandra-2.0 2424dd133 -> 92f753957
Minor clarification/simplification in IndexedSliceReader Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/92f75395 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/92f75395 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/92f75395 Branch: refs/heads/cassandra-2.0 Commit: 92f753957325413e2aba67f36b4305fb0316b501 Parents: 2424dd1 Author: Sylvain Lebresne <sylv...@datastax.com> Authored: Wed Jan 14 14:11:41 2015 +0100 Committer: Sylvain Lebresne <sylv...@datastax.com> Committed: Wed Jan 14 14:11:41 2015 +0100 ---------------------------------------------------------------------- .../apache/cassandra/db/columniterator/IndexedSliceReader.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/92f75395/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java index ac48fc0..4409484 100644 --- a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java +++ b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java @@ -333,7 +333,6 @@ class IndexedSliceReader extends AbstractIterator<OnDiskAtom> implements OnDiskA // can be mistakenly added this way. if (reversed && !prefetched.isEmpty()) { - boolean gotSome = false; // Avoids some comparison when we know it's not useful boolean inSlice = false; @@ -349,7 +348,6 @@ class IndexedSliceReader extends AbstractIterator<OnDiskAtom> implements OnDiskA if (prefetchedCol instanceof RangeTombstone) { blockColumns.addLast(prefetched.poll()); - gotSome = true; continue; } @@ -367,7 +365,6 @@ class IndexedSliceReader extends AbstractIterator<OnDiskAtom> implements OnDiskA else if (inSlice || isColumnBeforeSliceFinish(prefetchedCol)) { blockColumns.addLast(prefetched.poll()); - gotSome = true; inSlice = true; } // if col is after slice, ignore @@ -376,7 +373,7 @@ class IndexedSliceReader extends AbstractIterator<OnDiskAtom> implements OnDiskA prefetched.poll(); } } - if (gotSome) + if (!blockColumns.isEmpty()) return true; } try