You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jb...@apache.org on 2013/08/29 01:27:18 UTC
[3/6] git commit: Fix CqlRecordWriter with composite keys patch by
Craig McMillian; reviewed by jbellis for CASSANDRA-5949
Fix CqlRecordWriter with composite keys
patch by Craig McMillian; reviewed by jbellis for CASSANDRA-5949
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/a35f1c28
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/a35f1c28
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/a35f1c28
Branch: refs/heads/trunk
Commit: a35f1c288f7c7fd82aca6bb7aaef8ec3f6bf857d
Parents: 47b2cd6
Author: Jonathan Ellis <jb...@apache.org>
Authored: Wed Aug 28 18:26:40 2013 -0500
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Wed Aug 28 18:26:40 2013 -0500
----------------------------------------------------------------------
CHANGES.txt | 1 +
src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a35f1c28/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 45e6497..6aa5762 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
1.2.10
+ * Fix CqlRecordWriter with composite keys (CASSANDRA-5949)
* Allow disabling SlabAllocator (CASSANDRA-5935)
* Make user-defined compaction JMX blocking (CASSANDRA-4952)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/a35f1c28/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
index 3d03486..be178b3 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java
@@ -307,7 +307,7 @@ final class CqlRecordWriter extends AbstractColumnFamilyRecordWriter<Map<String,
{
ByteBuffer[] keys = new ByteBuffer[partitionKeyColumns.length];
for (int i = 0; i< keys.length; i++)
- keys[i] = keyColumns.get(partitionKeyColumns[i]);
+ keys[i] = keyColumns.get(partitionKeyColumns[i]).duplicate();
partitionKey = ((CompositeType) keyValidator).build(keys);
}