Updated Branches: refs/heads/trunk 39e5a080d -> 8bd1c1f86
remove dead assignments Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/8bd1c1f8 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/8bd1c1f8 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/8bd1c1f8 Branch: refs/heads/trunk Commit: 8bd1c1f86e875a34cf717c95706a29955fd6d2bd Parents: 39e5a08 Author: Dave Brosius <[email protected]> Authored: Wed Aug 22 23:16:16 2012 -0400 Committer: Dave Brosius <[email protected]> Committed: Wed Aug 22 23:16:16 2012 -0400 ---------------------------------------------------------------------- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 8 +------- 1 files changed, 1 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/8bd1c1f8/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 7c86774..c23f290 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java @@ -122,7 +122,7 @@ public class ColumnFamilyRecordReader extends RecordReader<ByteBuffer, SortedMap byte[] start = predicate.getSlice_range().getStart(); if ((start != null) && (start.length > 0)) return false; - + byte[] finish = predicate.getSlice_range().getFinish(); if ((finish != null) && (finish.length > 0)) return false; @@ -359,11 +359,6 @@ 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) { @@ -426,7 +421,6 @@ public class ColumnFamilyRecordReader extends RecordReader<ByteBuffer, SortedMap return; KeyRange keyRange; - ByteBuffer startColumn; if (totalRead == 0) { String startToken = split.getStartToken();
