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/09/12 20:25:53 UTC

[1/6] git commit: Fix CQLRW for thrift tables patch by Alex Liu; reviewed by jbellis for CASSANDRA-6002

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 <jb...@apache.org>
Authored: Thu Sep 12 20:24:26 2013 +0200
Committer: Jonathan Ellis <jb...@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;
             }
         }


[4/6] git commit: merge from 1.2

Posted by jb...@apache.org.
merge from 1.2


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

Branch: refs/heads/trunk
Commit: c7881170b5dcbeb989926e70a4313f35b85971d1
Parents: 3e73663 2ce9327
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 12 20:25:18 2013 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 12 20:25:18 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7881170/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 63cc6d7,049544e..053eb70
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
 +2.0.1
 + * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
 + * Improve leveled compaction's ability to find non-overlapping L0 compactions
 +   to work on concurrently (CASSANDRA-5921)
 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
 + * Log Merkle tree stats (CASSANDRA-2698)
 + * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
 + * Improve offheap memcpy performance (CASSANDRA-5884)
 + * Use a range aware scanner for cleanup (CASSANDRA-2524)
 + * Cleanup doesn't need to inspect sstables that contain only local data 
 +   (CASSANDRA-5722)
 + * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
 + * Improve native protocol serialization (CASSANDRA-5664)
 + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
 + * Require superuser status for adding triggers (CASSANDRA-5963)
 +Merged from 1.2:
+ 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)


[6/6] git commit: Merge branch 'cassandra-2.0' into trunk

Posted by jb...@apache.org.
Merge branch 'cassandra-2.0' into trunk


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

Branch: refs/heads/trunk
Commit: 3634eab1dec4be2e403822d3d1f3ef85907e89fe
Parents: f3430d3 c788117
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 12 20:25:26 2013 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 12 20:25:26 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/3634eab1/CHANGES.txt
----------------------------------------------------------------------


[2/6] git commit: Fix CQLRW for thrift tables patch by Alex Liu; reviewed by jbellis for CASSANDRA-6002

Posted by jb...@apache.org.
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-2.0
Commit: 2ce932761afd9f0b0949dcd97d360927c3a2c007
Parents: f663a99
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 12 20:24:26 2013 +0200
Committer: Jonathan Ellis <jb...@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;
             }
         }


[3/6] git commit: Fix CQLRW for thrift tables patch by Alex Liu; reviewed by jbellis for CASSANDRA-6002

Posted by jb...@apache.org.
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/trunk
Commit: 2ce932761afd9f0b0949dcd97d360927c3a2c007
Parents: f663a99
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 12 20:24:26 2013 +0200
Committer: Jonathan Ellis <jb...@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;
             }
         }


[5/6] git commit: merge from 1.2

Posted by jb...@apache.org.
merge from 1.2


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

Branch: refs/heads/cassandra-2.0
Commit: c7881170b5dcbeb989926e70a4313f35b85971d1
Parents: 3e73663 2ce9327
Author: Jonathan Ellis <jb...@apache.org>
Authored: Thu Sep 12 20:25:18 2013 +0200
Committer: Jonathan Ellis <jb...@apache.org>
Committed: Thu Sep 12 20:25:18 2013 +0200

----------------------------------------------------------------------
 CHANGES.txt | 1 +
 1 file changed, 1 insertion(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7881170/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 63cc6d7,049544e..053eb70
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,19 -1,5 +1,20 @@@
 +2.0.1
 + * Improve error message when yaml contains invalid properties (CASSANDRA-5958)
 + * Improve leveled compaction's ability to find non-overlapping L0 compactions
 +   to work on concurrently (CASSANDRA-5921)
 + * Notify indexer of columns shadowed by range tombstones (CASSANDRA-5614)
 + * Log Merkle tree stats (CASSANDRA-2698)
 + * Switch from crc32 to adler32 for compressed sstable checksums (CASSANDRA-5862)
 + * Improve offheap memcpy performance (CASSANDRA-5884)
 + * Use a range aware scanner for cleanup (CASSANDRA-2524)
 + * Cleanup doesn't need to inspect sstables that contain only local data 
 +   (CASSANDRA-5722)
 + * Add ability for CQL3 to list partition keys (CASSANDRA-4536)
 + * Improve native protocol serialization (CASSANDRA-5664)
 + * Upgrade Thrift to 0.9.1 (CASSANDRA-5923)
 + * Require superuser status for adding triggers (CASSANDRA-5963)
 +Merged from 1.2:
+ 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)