cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From brandonwilli...@apache.org
Subject git commit: Fix row key population with old-style mapred interface. Patch by Ben Kempe, reviewed by brandonwilliams for CASSANDRA-4834
Date Tue, 06 Nov 2012 12:24:56 GMT
Updated Branches:
  refs/heads/cassandra-1.1 77ee3109e -> d909fb4fa


Fix row key population with old-style mapred interface.
Patch by Ben Kempe, reviewed by brandonwilliams for CASSANDRA-4834


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d909fb4f
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d909fb4f
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d909fb4f

Branch: refs/heads/cassandra-1.1
Commit: d909fb4faf7de41b3cf19f19b48f962ab0e6fb32
Parents: 77ee310
Author: Brandon Williams <brandonwilliams@apache.org>
Authored: Tue Nov 6 06:23:15 2012 -0600
Committer: Brandon Williams <brandonwilliams@apache.org>
Committed: Tue Nov 6 06:23:15 2012 -0600

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/d909fb4f/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 c662932..83e436b 100644
--- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
@@ -483,7 +483,7 @@ public class ColumnFamilyRecordReader extends RecordReader<ByteBuffer,
SortedMap
                 return endOfData();
 
             Pair<ByteBuffer, SortedMap<ByteBuffer, IColumn>> next = wideColumns.next();
-            lastColumn = next.right.values().iterator().next().name();
+            lastColumn = next.right.values().iterator().next().name().duplicate();
 
             maybeIncreaseRowCounter(next);
             return next;
@@ -556,7 +556,7 @@ public class ColumnFamilyRecordReader extends RecordReader<ByteBuffer,
SortedMap
         if (this.nextKeyValue())
         {
             key.clear();
-            key.put(this.getCurrentKey());
+            key.put(this.getCurrentKey().duplicate());
             key.flip();
 
             value.clear();


Mime
View raw message