merge from 1.2
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a104d90 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a104d90 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a104d90 Branch: refs/heads/trunk Commit: 4a104d904b809f071ca52b1d8ea3da9fa57ea392 Parents: 5d821a1 9793d6f Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Apr 25 18:01:38 2013 -0500 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Apr 25 18:01:38 2013 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a104d90/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java index 3764503,a987519..412e57d --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java @@@ -482,8 -460,8 +482,8 @@@ public class ColumnFamilyRecordReader e if (rows == null) return endOfData(); - Pair<ByteBuffer, SortedMap<ByteBuffer, IColumn>> next = wideColumns.next(); + Pair<ByteBuffer, SortedMap<ByteBuffer, Column>> next = wideColumns.next(); - lastColumn = next.right.values().iterator().next().name(); + lastColumn = next.right.values().iterator().next().name().duplicate(); maybeIncreaseRowCounter(next); return next;
