cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From eev...@apache.org
Subject svn commit: r943192 - in /cassandra/trunk/src/java/org/apache/cassandra/avro: AvroValidation.java CassandraServer.java
Date Tue, 11 May 2010 17:21:02 GMT
Author: eevans
Date: Tue May 11 17:21:02 2010
New Revision: 943192

URL: http://svn.apache.org/viewvc?rev=943192&view=rev
Log:
more ColumnFamilyType conversions post-r942113

Patch by eevans

Modified:
    cassandra/trunk/src/java/org/apache/cassandra/avro/AvroValidation.java
    cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java

Modified: cassandra/trunk/src/java/org/apache/cassandra/avro/AvroValidation.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/avro/AvroValidation.java?rev=943192&r1=943191&r2=943192&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/avro/AvroValidation.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/avro/AvroValidation.java Tue May 11 17:21:02
2010
@@ -114,9 +114,9 @@ public class AvroValidation {
     {
         validateKeyspace(keyspace);
         String cfName = parent.column_family.toString();
-        String cfType = validateColumnFamily(keyspace, cfName);
+        ColumnFamilyType cfType = validateColumnFamily(keyspace, cfName);
         
-        if (cfType.equals("Standard"))
+        if (cfType == ColumnFamilyType.Standard)
             if (parent.super_column != null)
                 throw newInvalidRequestException("super column specified for standard column
family");
         if (parent.super_column != null)

Modified: cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java
URL: http://svn.apache.org/viewvc/cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java?rev=943192&r1=943191&r2=943192&view=diff
==============================================================================
--- cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java (original)
+++ cassandra/trunk/src/java/org/apache/cassandra/avro/CassandraServer.java Tue May 11 17:21:02
2010
@@ -499,7 +499,7 @@ public class CassandraServer implements 
                 CFMetaData cfmeta = new CFMetaData(
                         cfDef.keyspace.toString(),
                         cfDef.name.toString(),
-                        ColumnFamily.getColumnType(cfDef.column_type.toString()),
+                        ColumnFamilyType.create(cfDef.column_type.toString()),
                         DatabaseDescriptor.getComparator(cfDef.comparator_type.toString()),
                         subComparator.length() == 0 ? null : DatabaseDescriptor.getComparator(subComparator),
                         cfDef.comment.toString(), 



Mime
View raw message