svn commit: r1090927 - in /cassandra/trunk: src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java test/system/test_cql.py

[jb...@apache.org]

Author: jbellis
Date: Mon Apr 11 03:27:04 2011
New Revision: 1090927

URL: http://svn.apache.org/viewvc?rev=1090927&view=rev
Log:
make text (utf8) the default comparator again (regression from type renames)
patch by jbellis

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
    cassandra/trunk/test/system/test_cql.py

Modified: cassandra/trunk/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java?rev=1090927&r1=1090926&r2=1090927&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java Mon Apr 11 03:27:04 2011
@@ -233,7 +233,7 @@ public class CreateColumnFamilyStatement
         try
         {
             // RPC uses BytesType as the default validator/comparator but BytesType expects hex for string terms, (not convenient).
-            AbstractType<?> comparator = DatabaseDescriptor.getComparator(comparators.get(getPropertyString(KW_COMPARATOR, "utf8")));
+            AbstractType<?> comparator = DatabaseDescriptor.getComparator(comparators.get(getPropertyString(KW_COMPARATOR, "text")));
             String validator = getPropertyString(KW_DEFAULTVALIDATION, "utf8");
 
             newCFMD = new CFMetaData(keyspace,

Modified: cassandra/trunk/test/system/test_cql.py
URL: http://svn.apache.org/viewvc/cassandra/trunk/test/system/test_cql.py?rev=1090927&r1=1090926&r2=1090927&view=diff
==============================================================================
--- cassandra/trunk/test/system/test_cql.py (original)
+++ cassandra/trunk/test/system/test_cql.py Mon Apr 11 03:27:04 2011
@@ -369,8 +369,7 @@ class TestCql(ThriftTester):
                 'age' varint,
                 'birthdate' bigint,
                 'id' uuid
-            ) WITH comparator = text AND comment = 'shiny, new, cf' AND
-                    default_validation = ascii;
+            ) WITH comment = 'shiny, new, cf' AND default_validation = ascii;
         """)
         
         # TODO: temporary (until this can be done with CQL).