Fix wide row counter deserialization. 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/edf9e0e1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/edf9e0e1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/edf9e0e1 Branch: refs/heads/trunk Commit: edf9e0e1695b89b085453ef1de9bef3a69e23b56 Parents: 5b1c28c Author: Brandon Williams <[email protected]> Authored: Tue Apr 24 13:26:01 2012 -0500 Committer: Brandon Williams <[email protected]> Committed: Tue Apr 24 13:28:19 2012 -0500 ---------------------------------------------------------------------- .../cassandra/hadoop/ColumnFamilyRecordReader.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/edf9e0e1/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 9623a63..29d6c8a 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java @@ -497,7 +497,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); }
