cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jbel...@apache.org
Subject [6/14] git commit: fix setting key length for old-style mapred api patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4534
Date Tue, 14 Aug 2012 21:02:14 GMT
fix setting key length for old-style mapred api
patch by jbellis; reviewed by brandonwilliams for CASSANDRA-4534


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

Branch: refs/heads/trunk
Commit: 197511f0b1b10b67fdd4942fe6f9c88adcad6f57
Parents: 8b6ce32
Author: Jonathan Ellis <jbellis@apache.org>
Authored: Mon Aug 13 14:22:36 2012 -0500
Committer: Jonathan Ellis <jbellis@apache.org>
Committed: Mon Aug 13 14:22:36 2012 -0500

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


http://git-wip-us.apache.org/repos/asf/cassandra/blob/197511f0/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 222081b..d025bef 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 1.0.12
+ * (Hadoop) fix setting key length for old-style mapred api (CASSANDRA-4534)
  * (Hadoop) fix iterating through a resultset consisting entirely
    of tombstoned rows (CASSANDRA-4466)
 

http://git-wip-us.apache.org/repos/asf/cassandra/blob/197511f0/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 20d6068..aac61ad 100644
--- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordReader.java
@@ -416,7 +416,7 @@ public class ColumnFamilyRecordReader extends RecordReader<ByteBuffer,
SortedMap
         {
             key.clear();
             key.put(this.getCurrentKey());
-            key.rewind();
+            key.flip();
 
             value.clear();
             value.putAll(this.getCurrentValue());


Mime
View raw message