cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject [5/6] git commit: formatting
Date Tue, 31 Jul 2012 20:57:08 GMT
formatting


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1f556183
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1f556183
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1f556183

Branch: refs/heads/trunk
Commit: 1f556183bb7cbe499799d0b5ec3b79614f9eb91e
Parents: a958f2a
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Tue Jul 31 10:44:13 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Tue Jul 31 11:23:40 2012 -0500

----------------------------------------------------------------------
 .../cassandra/hadoop/ColumnFamilyRecordReader.java |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/1f556183/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 498b00c..4537332 100644
--- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
@@ -363,6 +363,11 @@ public class ColumnFamilyRecordReader extends RecordReader<ByteBuffer,
SortedMap
                     return;
                 }
 
+                // prepare for the next slice to be read
+                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)
                 {
@@ -372,7 +377,7 @@ public class ColumnFamilyRecordReader extends RecordReader<ByteBuffer,
SortedMap
                         KeySlice ks = it.next();
                         if (ks.getColumnsSize() == 0)
                         {
-                           it.remove();
+                            it.remove();
                         }
                     }
 


Mime
View raw message