You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2013/11/05 19:28:31 UTC
[1/2] git commit: Fix validation of CQL3 tables in ThriftValidation
Updated Branches:
refs/heads/trunk f8138a3c2 -> 470e3fe2d
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/trunk
Commit: 91a81b7cbc7712ab05df70913d6dbb33ae75dea4
Parents: 20793b0
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Nov 5 19:14:05 2013 +0100
Committer: Sylvain Lebresne <sy...@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)
[2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Posted by sl...@apache.org.
Merge branch 'cassandra-2.0' into trunk
Conflicts:
src/java/org/apache/cassandra/thrift/ThriftValidation.java
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/470e3fe2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/470e3fe2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/470e3fe2
Branch: refs/heads/trunk
Commit: 470e3fe2d0d40d70bee2f3f8c5cabce0e4a58052
Parents: f8138a3 91a81b7
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Tue Nov 5 19:28:12 2013 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Tue Nov 5 19:28:12 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/470e3fe2/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/470e3fe2/src/java/org/apache/cassandra/thrift/ThriftValidation.java
----------------------------------------------------------------------
diff --cc src/java/org/apache/cassandra/thrift/ThriftValidation.java
index beef7c6,3a831f4..e68b070
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@@ -210,7 -211,8 +210,7 @@@ public class ThriftValidatio
throw new org.apache.cassandra.exceptions.InvalidRequestException("supercolumn specified to ColumnFamily " + metadata.cfName + " containing normal columns");
}
AbstractType<?> comparator = SuperColumns.getComparatorFor(metadata, superColumnName);
- boolean isCQL3Table = metadata.hasCompositeComparator() && !metadata.isDense() && !metadata.isSuper();
- CFDefinition cfDef = metadata.getCfDef();
+ boolean isCQL3Table = !metadata.isThriftCompatible();
for (ByteBuffer name : column_names)
{
if (name.remaining() > maxNameLength)