Updated Branches: refs/heads/cassandra-1.1.0 c67153282 -> 18ff31dc8
Fix wide counter row access in CFRR. Patch by Marco Cova, reviewed by brandonwilliams for CASSANDRA-4181 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/18ff31dc Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/18ff31dc Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/18ff31dc Branch: refs/heads/cassandra-1.1.0 Commit: 18ff31dc889635db502dd791df68adebfa7d24ae Parents: c671532 Author: Brandon Williams <brandonwilli...@apache.org> Authored: Mon Apr 23 14:02:55 2012 -0500 Committer: Brandon Williams <brandonwilli...@apache.org> Committed: Mon Apr 23 14:02:55 2012 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/18ff31dc/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 9459d5a..f4a2a7b 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java @@ -501,7 +501,8 @@ public class ColumnFamilyRecordReader extends RecordReader<ByteBuffer, SortedMap if (columns.hasNext()) { ColumnOrSuperColumn cosc = columns.next(); - ImmutableSortedMap<ByteBuffer, IColumn> map = ImmutableSortedMap.of(cosc.column.name, unthriftifySimple(cosc.column)); + IColumn column = unthriftify(cosc); + ImmutableSortedMap<ByteBuffer, IColumn> map = ImmutableSortedMap.of(column.name(), column); return Pair.<ByteBuffer, SortedMap<ByteBuffer, IColumn>>create(currentRow.key, map); }