Updated Branches: refs/heads/trunk f41684fde -> 0f52874ab
remove dead assignment Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0f52874a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0f52874a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0f52874a Branch: refs/heads/trunk Commit: 0f52874ab5fa857e8f8ead1a52fbb5f0ff27027f Parents: f41684f Author: Dave Brosius <[email protected]> Authored: Tue Aug 21 22:59:37 2012 -0400 Committer: Dave Brosius <[email protected]> Committed: Tue Aug 21 22:59:37 2012 -0400 ---------------------------------------------------------------------- .../db/index/composites/CompositesIndex.java | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0f52874a/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java b/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java index e53a3bf..f9db99f 100644 --- a/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java +++ b/src/java/org/apache/cassandra/db/index/composites/CompositesIndex.java @@ -17,14 +17,9 @@ */ package org.apache.cassandra.db.index.composites; -import java.io.IOException; import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; import java.util.Set; -import java.util.concurrent.ExecutionException; -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.db.*; @@ -32,9 +27,6 @@ import org.apache.cassandra.db.index.AbstractSimplePerColumnSecondaryIndex; import org.apache.cassandra.db.index.SecondaryIndex; import org.apache.cassandra.db.index.SecondaryIndexSearcher; import org.apache.cassandra.db.marshal.*; -import org.apache.cassandra.dht.*; -import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.ByteBufferUtil; /** * Implements a secondary index for a column family using a second column family @@ -50,7 +42,7 @@ public class CompositesIndex extends AbstractSimplePerColumnSecondaryIndex public void init(ColumnDefinition columnDef) { assert baseCfs.getComparator() instanceof CompositeType; - CompositeType baseComparator = (CompositeType) baseCfs.getComparator(); + try { prefixSize = Integer.parseInt(columnDef.getIndexOptions().get(PREFIX_SIZE_OPTION));
