From e231f71f0fd542e4d7399f655a96fca97369fae8 Mon Sep 17 00:00:00 2001 From: Jonathan Ellis Date: Thu, 16 Dec 2010 22:26:35 +0000 Subject: [PATCH] formatting git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1050194 13f79535-47bb-0310-9956-ffa450edef68 --- src/java/org/apache/cassandra/config/ColumnDefinition.java | 3 ++- src/java/org/apache/cassandra/db/ColumnFamilyStore.java | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/java/org/apache/cassandra/config/ColumnDefinition.java b/src/java/org/apache/cassandra/config/ColumnDefinition.java index abb0c7ff75..7d69872edd 100644 --- a/src/java/org/apache/cassandra/config/ColumnDefinition.java +++ b/src/java/org/apache/cassandra/config/ColumnDefinition.java @@ -34,7 +34,8 @@ import org.apache.cassandra.thrift.IndexType; 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; diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index d6e6172d32..a128cfa7ee 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -190,7 +190,7 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean } 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 implements ColumnFamilyStoreMBean public SortedSet getIndexedColumns() { - return (SortedSet) indexedColumns.keySet(); + return indexedColumns.keySet(); } public ColumnFamilyStore getIndexedColumnFamilyStore(ByteBuffer column)