svn commit: r1035394 - in /cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra: service/StorageService.java tools/SchemaTool.java

[jbellis]

Author: jbellis
Date: Mon Nov 15 18:37:32 2010
New Revision: 1035394

URL: http://svn.apache.org/viewvc?rev=1035394&view=rev
Log:
clean up schematool warts.
patch by jbellis

Modified:
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
    
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SchemaTool.java

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java?rev=1035394&r1=1035393&r2=1035394&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/service/StorageService.java
 Mon Nov 15 18:37:32 2010
@@ -1907,7 +1907,7 @@ public class StorageService implements I
             {
                 // blow up if there is a schema saved.
                 if (DatabaseDescriptor.getDefsVersion().timestamp() > 0 || 
Migration.getLastMigrationId() != null)
-                    throw new ConfigurationException("Cannot load from XML on 
top of pre-existing schemas.");
+                    throw new ConfigurationException("Cannot import schema 
when one already exists");
              
                 Migration migration = null;
                 for (KSMetaData table : tables)
@@ -1982,6 +1982,7 @@ public class StorageService implements I
                 RawColumnFamily rcf = new RawColumnFamily();
                 rcf.name = cfm.cfName;
                 rcf.compare_with = cfm.comparator.getClass().getName();
+                rcf.default_validation_class = 
cfm.defaultValidator.getClass().getName();
                 rcf.compare_subcolumns_with = cfm.subcolumnComparator == null 
? null : cfm.subcolumnComparator.getClass().getName();
                 rcf.column_type = cfm.cfType;
                 rcf.comment = cfm.comment;

Modified: 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SchemaTool.java
URL: 
http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SchemaTool.java?rev=1035394&r1=1035393&r2=1035394&view=diff
==============================================================================
--- 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SchemaTool.java
 (original)
+++ 
cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/tools/SchemaTool.java
 Mon Nov 15 18:37:32 2010
@@ -28,14 +28,8 @@ public class SchemaTool
     public static void main(String[] args)
     throws NumberFormatException, IOException, InterruptedException, 
ConfigurationException
     {
-        if (args.length < 3)
+        if (args.length < 3 || args.length > 3)
             usage();
-        if (args.length != 3 && "import".equals(args[2]))
-            usage();
-        if (args.length != 4 && "export".equals(args[2]))
-            usage();
-        
-        System.out.println("# Note: This tool is deprecated and will be 
removed in future releases.");
         
         String host = args[0];
         int port = 0;