natas_hw
/
cassandra
mirror of https://github.com/apache/cassandra
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

formatting 

git-svn-id: https://svn.apache.org/repos/asf/cassandra/branches/cassandra-0.7@1050194 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Jonathan Ellis 2010-12-16 22:26:35 +00:00
parent 41c2ec0d1f
commit e231f71f0f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/java/org/apache/cassandra/config/ColumnDefinition.java
View File

@ -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;

4
src/java/org/apache/cassandra/db/ColumnFamilyStore.java
View File

@ -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<ByteBuffer> getIndexedColumns()
{
return (SortedSet<ByteBuffer>) indexedColumns.keySet();
return indexedColumns.keySet();
}
public ColumnFamilyStore getIndexedColumnFamilyStore(ByteBuffer column)