Updated Branches: refs/heads/cassandra-1.2 f663a996c -> 2ce932761 refs/heads/cassandra-2.0 3e7366332 -> c7881170b refs/heads/trunk f3430d394 -> 3634eab1d
Fix CQLRW for thrift tables patch by Alex Liu; reviewed by jbellis for CASSANDRA-6002 Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2ce93276 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2ce93276 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2ce93276 Branch: refs/heads/cassandra-1.2 Commit: 2ce932761afd9f0b0949dcd97d360927c3a2c007 Parents: f663a99 Author: Jonathan Ellis <jbel...@apache.org> Authored: Thu Sep 12 20:24:26 2013 +0200 Committer: Jonathan Ellis <jbel...@apache.org> Committed: Thu Sep 12 20:24:26 2013 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java | 4 ++++ 2 files changed, 5 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ce93276/CHANGES.txt ---------------------------------------------------------------------- diff --git a/CHANGES.txt b/CHANGES.txt index 51be09d..049544e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,4 +1,5 @@ 1.2.10 + * (Hadoop) Fix CQLRW for thrift tables (CASSANDRA-6002) * Fix possible divide-by-zero in HHOM (CASSANDRA-5990) * Allow local batchlog writes for CL.ANY (CASSANDRA-5967) * Optimize name query performance in wide rows (CASSANDRA-5966) http://git-wip-us.apache.org/repos/asf/cassandra/blob/2ce93276/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 be178b3..d08e08a 100644 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordWriter.java @@ -376,11 +376,15 @@ final class CqlRecordWriter extends AbstractColumnFamilyRecordWriter<Map<String, CFMetaData cfMeta = CFMetaData.fromThrift(cfDef); CFDefinition cfDefinition = new CFDefinition(cfMeta); int i = 0; + partitionKeyColumns = new String[cfDefinition.keys.keySet().size()]; for (ColumnIdentifier column : cfDefinition.keys.keySet()) { partitionKeyColumns[i] = column.toString(); i++; } + clusterColumns = new ArrayList<String>(); + for (ColumnIdentifier column : cfDefinition.columns.keySet()) + clusterColumns.add(column.toString()); return; } }
