Author: jbellis Date: Thu Dec 16 22:26:35 2010 New Revision: 1050194 URL: http://svn.apache.org/viewvc?rev=1050194&view=rev Log: formatting
Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/ColumnDefinition.java cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/ColumnDefinition.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/ColumnDefinition.java?rev=1050194&r1=1050193&r2=1050194&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/ColumnDefinition.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/config/ColumnDefinition.java Thu Dec 16 22:26:35 2010 @@ -34,7 +34,8 @@ import org.apache.cassandra.thrift.Index import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -public class ColumnDefinition { +public class ColumnDefinition +{ public final ByteBuffer name; public final AbstractType validator; private IndexType index_type; Modified: cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java URL: http://svn.apache.org/viewvc/cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java?rev=1050194&r1=1050193&r2=1050194&view=diff ============================================================================== --- cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java (original) +++ cassandra/branches/cassandra-0.7/src/java/org/apache/cassandra/db/ColumnFamilyStore.java Thu Dec 16 22:26:35 2010 @@ -190,7 +190,7 @@ public class ColumnFamilyStore implement } for (ColumnDefinition cdef : metadata.getColumn_metadata().values()) - if (!indexedColumns.containsKey(cdef.name) && cdef.getIndexType() != null) + if (cdef.getIndexType() != null && !indexedColumns.containsKey(cdef.name)) addIndex(cdef); } @@ -1796,7 +1796,7 @@ public class ColumnFamilyStore implement public SortedSet<ByteBuffer> getIndexedColumns() { - return (SortedSet<ByteBuffer>) indexedColumns.keySet(); + return indexedColumns.keySet(); } public ColumnFamilyStore getIndexedColumnFamilyStore(ByteBuffer column)