cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject git commit: Fix wide row counter deserialization. Patch by Marco Cova, reviewed by brandonwilliams for CASSANDRA-4181
Date Tue, 24 Apr 2012 18:26:53 GMT
Updated Branches:
  refs/heads/cassandra-1.1 3c4fa12e1 -> 7daa6625a


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/7daa6625
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7daa6625
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7daa6625

Branch: refs/heads/cassandra-1.1
Commit: 7daa6625a19e7556e0514e7c46efe6dab0b9de14
Parents: 3c4fa12
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue Apr 24 13:26:01 2012 -0500
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Tue Apr 24 13:26:01 2012 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/7daa6625/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);
                     }
 


Mime
View raw message