formatting
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/813553be Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/813553be Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/813553be Branch: refs/heads/cassandra-1.1 Commit: 813553bea9d1145cca671d61737bc9673315b8f0 Parents: 4f0237a Author: Jonathan Ellis <jbel...@apache.org> Authored: Tue Jul 31 10:44:13 2012 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Tue Jul 31 10:44:13 2012 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 12 +++++------- 1 files changed, 5 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/813553be/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java index b84eb85..5d0ac72 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java @@ -302,22 +302,20 @@ public class ColumnFamilyRecordReader extends RecordReader<ByteBuffer, SortedMap KeySlice lastRow = rows.get(rows.size() - 1); ByteBuffer rowkey = lastRow.key; startToken = partitioner.getTokenFactory().toString(partitioner.getToken(rowkey)); - + // remove ghosts when fetching all columns if (isEmptyPredicate) { Iterator<KeySlice> it = rows.iterator(); - - while(it.hasNext()) + while (it.hasNext()) { KeySlice ks = it.next(); - if (ks.getColumnsSize() == 0) { - it.remove(); + it.remove(); } } - + // all ghosts, spooky if (rows.isEmpty()) { @@ -325,7 +323,7 @@ public class ColumnFamilyRecordReader extends RecordReader<ByteBuffer, SortedMap return; } } - + // reset to iterate through this new batch i = 0; }