Updated Branches: refs/heads/trunk f9825d48a -> 0b18bee40
remove unused local 'multiplier' Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0b18bee4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0b18bee4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0b18bee4 Branch: refs/heads/trunk Commit: 0b18bee403c52729fd16f889a4ddcc78ca1bd3a3 Parents: f9825d4 Author: Dave Brosius <[email protected]> Authored: Fri May 3 00:46:13 2013 -0400 Committer: Dave Brosius <[email protected]> Committed: Fri May 3 00:46:13 2013 -0400 ---------------------------------------------------------------------- .../cassandra/cql3/statements/SelectStatement.java | 7 +------ 1 files changed, 1 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0b18bee4/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index 38fa361..6f33309 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@ -22,8 +22,6 @@ import java.util.*; import java.util.concurrent.ExecutionException; import com.google.common.collect.AbstractIterator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.cassandra.auth.Permission; import org.apache.cassandra.cql3.*; @@ -55,8 +53,6 @@ import org.apache.cassandra.utils.Pair; */ public class SelectStatement implements CQLStatement { - private static final Logger logger = LoggerFactory.getLogger(SelectStatement.class); - private final int boundTerms; public final CFDefinition cfDef; public final Parameters parameters; @@ -273,7 +269,6 @@ public class SelectStatement implements CQLStatement // to account for the grouping of columns. // Since that doesn't work for maps/sets/lists, we now use the compositesToGroup option of SliceQueryFilter. // But we must preserve backward compatibility too (for mixed version cluster that is). - int multiplier = cfDef.isCompact ? 1 : (cfDef.metadata.size() + 1); int toGroup = cfDef.isCompact ? -1 : cfDef.columns.size(); ColumnSlice slice = new ColumnSlice(getRequestedBound(Bound.START, variables), getRequestedBound(Bound.END, variables)); @@ -1244,7 +1239,7 @@ public class SelectStatement implements CQLStatement receiver = new ColumnSpecification(name.ksName, name.cfName, new ColumnIdentifier("partition key token", true), - StorageService.instance.getPartitioner().getTokenValidator()); + StorageService.getPartitioner().getTokenValidator()); } switch (newRel.operator())
