svn commit: r1044424 - in /cassandra/branches/cassandra-0.7: CHANGES.txt src/java/org/apache/cassandra/cli/CliClient.java

[jbellis]

Author: jbellis
Date: Fri Dec 10 16:37:01 2010
New Revision: 1044424

URL: http://svn.apache.org/viewvc?rev=1044424&view=rev
Log:
cli defaults to bytestype for subcomparator when creating CFS
patch by Pavel Yaskevich; reviewed by jbellis for CASSANDRA-1835

Modified:
    cassandra/branches/cassandra-0.7/CHANGES.txt
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java

Modified: cassandra/branches/cassandra-0.7/CHANGES.txt
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/CHANGES.txt?rev=1044424&r1=1044423&r2=1044424&view=diff
==============================================================================
--- cassandra/branches/cassandra-0.7/CHANGES.txt (original)
+++ cassandra/branches/cassandra-0.7/CHANGES.txt Fri Dec 10 16:37:01 2010
@@ -5,6 +5,8 @@ dev
    when not otherwise specified
  * validation that generates less garbage (CASSANDRA-1814)
  * add TTL support to CLI (CASSANDRA-1838)
+ * cli defaults to bytestype for subcomparator when creating
+   column families (CASSANDRA-1835)
 
 
 0.7.0-rc2

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java?rev=1044424&r1=1044423&r2=1044424&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/cli/CliClient.java
 Fri Dec 10 16:37:01 2010
@@ -1544,6 +1544,13 @@ public class CliClient extends CliUserHe
     private ByteBuffer subColumnNameAsBytes(String superColumn, CfDef 
columnFamilyDef) 
     {
         String comparatorClass = columnFamilyDef.subcomparator_type;
+
+        if (comparatorClass == null)
+        {
+            sessionState.out.println(String.format("Notice: defaulting to 
BytesType subcomparator for '%s'", columnFamilyDef.getName()));
+            comparatorClass = "BytesType";
+        }
+
         return getBytesAccordingToType(superColumn, 
getFormatTypeForColumn(comparatorClass));   
     }