cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From slebre...@apache.org
Subject [2/2] git commit: Merge branch 'cassandra-2.0' into trunk
Date Tue, 05 Nov 2013 18:28:32 GMT
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 <sylvain@datastax.com>
Authored: Tue Nov 5 19:28:12 2013 +0100
Committer: Sylvain Lebresne <sylvain@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)


Mime
View raw message