cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject git commit: Fix validation of CQL3 tables in ThriftValidation
Date Tue, 05 Nov 2013 18:16:18 GMT
Updated Branches:
  refs/heads/cassandra-2.0 20793b069 -> 91a81b7cb


Fix validation of CQL3 tables in ThriftValidation

patch by slebresne; reviewed by iamaleksey for CASSANDRA-6140


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

Branch: refs/heads/cassandra-2.0
Commit: 91a81b7cbc7712ab05df70913d6dbb33ae75dea4
Parents: 20793b0
Author: Sylvain Lebresne <sylvain@datastax.com>
Authored: Tue Nov 5 19:14:05 2013 +0100
Committer: Sylvain Lebresne <sylvain@datastax.com>
Committed: Tue Nov 5 19:14:05 2013 +0100

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/thrift/ThriftValidation.java | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/91a81b7c/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index ddf3e05..7e9201a 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -15,6 +15,7 @@
  * Reject CAS operation when the protocol v1 is used (CASSANDRA-6270)
  * Correctly throw error when frame too large (CASSANDRA-5981)
  * Fix serialization bug in PagedRange with 2ndary indexes (CASSANDRA-6299)
+ * Fix CQL3 table validation in Thrift (CASSANDRA-6140)
 Merged from 1.2:
  * add non-jamm path for cached statements (CASSANDRA-6293)
  * (Hadoop) Require CFRR batchSize to be at least 2 (CASSANDRA-6114)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/91a81b7c/src/java/org/apache/cassandra/thrift/ThriftValidation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/ThriftValidation.java b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
index 012a943..3a831f4 100644
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@ -212,7 +212,7 @@ public class ThriftValidation
         }
         AbstractType<?> comparator = SuperColumns.getComparatorFor(metadata, superColumnName);
         CFDefinition cfDef = metadata.getCfDef();
-        boolean isCQL3Table = cfDef.isComposite && !cfDef.isCompact && !metadata.isSuper();
+        boolean isCQL3Table = !metadata.isThriftCompatible();
         for (ByteBuffer name : column_names)
         {
             if (name.remaining() > maxNameLength)


Mime
View raw message