Updated Branches: refs/heads/trunk 1795e1b1c -> 6f217f7fe
unused imports cleanup Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6f217f7f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6f217f7f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6f217f7f Branch: refs/heads/trunk Commit: 6f217f7fe86cd06b23033f9efe678bde2e08d4d8 Parents: 1795e1b Author: Dave Brosius <dbros...@apache.org> Authored: Tue Jul 30 00:58:56 2013 -0400 Committer: Dave Brosius <dbros...@apache.org> Committed: Tue Jul 30 00:58:56 2013 -0400 ---------------------------------------------------------------------- .../apache/cassandra/thrift/AuthenticationException.java | 11 ----------- .../gen-java/org/apache/cassandra/thrift/TokenRange.java | 9 --------- .../apache/cassandra/thrift/UnavailableException.java | 11 ----------- src/java/org/apache/cassandra/cql/WhereClause.java | 2 -- src/java/org/apache/cassandra/cql3/CQLStatement.java | 4 ---- src/java/org/apache/cassandra/cql3/QueryProcessor.java | 3 --- .../cql3/statements/AuthenticationStatement.java | 5 ----- .../cql3/statements/AuthorizationStatement.java | 4 ---- .../apache/cassandra/cql3/statements/BatchStatement.java | 1 - .../cassandra/cql3/statements/ModificationStatement.java | 1 - .../cql3/statements/SchemaAlteringStatement.java | 5 ----- .../cassandra/cql3/statements/TruncateStatement.java | 4 ---- .../apache/cassandra/cql3/statements/UseStatement.java | 5 ----- .../org/apache/cassandra/db/AbstractRangeCommand.java | 1 - .../org/apache/cassandra/db/ColumnFamilySerializer.java | 1 - src/java/org/apache/cassandra/db/DeletionInfo.java | 7 ------- .../apache/cassandra/db/HintedHandOffManagerMBean.java | 1 - src/java/org/apache/cassandra/db/Memtable.java | 5 ----- src/java/org/apache/cassandra/db/PagedRangeCommand.java | 2 -- src/java/org/apache/cassandra/db/RangeSliceCommand.java | 1 - src/java/org/apache/cassandra/db/RangeTombstoneList.java | 2 -- src/java/org/apache/cassandra/db/ReadVerbHandler.java | 1 - .../db/compaction/ParallelCompactionIterable.java | 1 - .../org/apache/cassandra/db/compaction/Upgrader.java | 7 +------ .../org/apache/cassandra/db/filter/ExtendedFilter.java | 2 -- .../apache/cassandra/db/index/SecondaryIndexManager.java | 2 -- src/java/org/apache/cassandra/db/marshal/AsciiType.java | 1 - .../apache/cassandra/db/marshal/CounterColumnType.java | 1 - src/java/org/apache/cassandra/db/marshal/MapType.java | 2 -- .../org/apache/cassandra/db/marshal/ReversedType.java | 1 - src/java/org/apache/cassandra/db/marshal/UTF8Type.java | 1 - .../hadoop/AbstractColumnFamilyRecordWriter.java | 2 -- .../apache/cassandra/hadoop/cql3/CqlOutputFormat.java | 1 - .../org/apache/cassandra/io/sstable/SSTableScanner.java | 5 ----- .../apache/cassandra/metrics/HintedHandoffMetrics.java | 1 - src/java/org/apache/cassandra/net/MessagingService.java | 1 - .../apache/cassandra/serializers/AsciiSerializer.java | 3 --- .../org/apache/cassandra/serializers/UTF8Serializer.java | 3 --- src/java/org/apache/cassandra/service/QueryState.java | 8 -------- .../apache/cassandra/service/RangeSliceVerbHandler.java | 2 -- .../cassandra/service/pager/MultiPartitionPager.java | 2 -- .../org/apache/cassandra/service/pager/PagingState.java | 1 - .../org/apache/cassandra/service/pager/QueryPagers.java | 2 -- .../cassandra/service/pager/RangeNamesQueryPager.java | 1 - .../cassandra/service/pager/RangeSliceQueryPager.java | 1 - .../apache/cassandra/service/pager/SliceQueryPager.java | 3 --- .../apache/cassandra/streaming/StreamManagerMBean.java | 2 -- src/java/org/apache/cassandra/streaming/StreamPlan.java | 2 -- .../streaming/compress/CompressedStreamReader.java | 3 --- .../apache/cassandra/thrift/THsHaDisruptorServer.java | 1 - .../org/apache/cassandra/tools/StandaloneUpgrader.java | 3 --- .../cassandra/transport/messages/ExecuteMessage.java | 3 --- .../cassandra/transport/messages/QueryMessage.java | 4 ---- 53 files changed, 1 insertion(+), 157 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java ---------------------------------------------------------------------- diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java index 8127883..a2e917c 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java @@ -34,23 +34,12 @@ import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * invalid authentication request (invalid keyspace, user does not exist, or credentials invalid) http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java ---------------------------------------------------------------------- diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java index 143ed3d..273d7e0 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/TokenRange.java @@ -34,23 +34,14 @@ import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; -import org.apache.thrift.TException; import java.util.List; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * A TokenRange describes part of the Cassandra ring, it is a mapping from a range to http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java ---------------------------------------------------------------------- diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java index a59b3dc..14b13d2 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/UnavailableException.java @@ -34,23 +34,12 @@ import org.apache.thrift.scheme.StandardScheme; import org.apache.thrift.scheme.TupleScheme; import org.apache.thrift.protocol.TTupleProtocol; -import org.apache.thrift.protocol.TProtocolException; -import org.apache.thrift.EncodingUtils; import org.apache.thrift.TException; -import java.util.List; -import java.util.ArrayList; import java.util.Map; import java.util.HashMap; import java.util.EnumMap; -import java.util.Set; -import java.util.HashSet; import java.util.EnumSet; import java.util.Collections; -import java.util.BitSet; -import java.nio.ByteBuffer; -import java.util.Arrays; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; /** * Not all the replicas required could be created and/or read. http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/cql/WhereClause.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql/WhereClause.java b/src/java/org/apache/cassandra/cql/WhereClause.java index bba8338..aa7d321 100644 --- a/src/java/org/apache/cassandra/cql/WhereClause.java +++ b/src/java/org/apache/cassandra/cql/WhereClause.java @@ -17,14 +17,12 @@ */ package org.apache.cassandra.cql; -import java.nio.charset.CharacterCodingException; import java.util.ArrayList; import java.util.LinkedHashSet; import java.util.List; import java.util.Set; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.utils.ByteBufferUtil; /** * WhereClauses encapsulate all of the predicates of a SELECT query. http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/cql3/CQLStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/CQLStatement.java b/src/java/org/apache/cassandra/cql3/CQLStatement.java index d123868..4828fc7 100644 --- a/src/java/org/apache/cassandra/cql3/CQLStatement.java +++ b/src/java/org/apache/cassandra/cql3/CQLStatement.java @@ -17,10 +17,6 @@ */ package org.apache.cassandra.cql3; -import java.nio.ByteBuffer; -import java.util.List; - -import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/cql3/QueryProcessor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java b/src/java/org/apache/cassandra/cql3/QueryProcessor.java index f2f71e5..3b3cc00 100644 --- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java @@ -27,13 +27,10 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.cql3.statements.*; import org.apache.cassandra.transport.messages.ResultMessage; -import org.apache.cassandra.config.*; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.filter.*; import org.apache.cassandra.exceptions.*; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; -import org.apache.cassandra.service.pager.PagingState; import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.MD5Digest; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/cql3/statements/AuthenticationStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/AuthenticationStatement.java b/src/java/org/apache/cassandra/cql3/statements/AuthenticationStatement.java index d5a515d..0e38b66 100644 --- a/src/java/org/apache/cassandra/cql3/statements/AuthenticationStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/AuthenticationStatement.java @@ -17,16 +17,11 @@ */ package org.apache.cassandra.cql3.statements; -import java.nio.ByteBuffer; -import java.util.List; - import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.exceptions.*; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; -import org.apache.cassandra.service.pager.PagingState; import org.apache.cassandra.transport.messages.ResultMessage; public abstract class AuthenticationStatement extends ParsedStatement implements CQLStatement http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/cql3/statements/AuthorizationStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/AuthorizationStatement.java b/src/java/org/apache/cassandra/cql3/statements/AuthorizationStatement.java index 15ac825..9ea73fa 100644 --- a/src/java/org/apache/cassandra/cql3/statements/AuthorizationStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/AuthorizationStatement.java @@ -17,17 +17,13 @@ */ package org.apache.cassandra.cql3.statements; -import java.nio.ByteBuffer; -import java.util.List; import org.apache.cassandra.auth.DataResource; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.exceptions.*; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; -import org.apache.cassandra.service.pager.PagingState; import org.apache.cassandra.transport.messages.ResultMessage; public abstract class AuthorizationStatement extends ParsedStatement implements CQLStatement http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java index 2c66199..bf9e315 100644 --- a/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/BatchStatement.java @@ -27,7 +27,6 @@ import org.apache.cassandra.exceptions.*; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.service.StorageProxy; -import org.apache.cassandra.service.pager.PagingState; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.Pair; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java index 88a80e0..e9141f9 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java @@ -34,7 +34,6 @@ import org.apache.cassandra.exceptions.*; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.service.StorageProxy; -import org.apache.cassandra.service.pager.PagingState; import org.apache.cassandra.thrift.ThriftValidation; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.Pair; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/cql3/statements/SchemaAlteringStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/SchemaAlteringStatement.java b/src/java/org/apache/cassandra/cql3/statements/SchemaAlteringStatement.java index e9e828c..968be9f 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SchemaAlteringStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SchemaAlteringStatement.java @@ -17,17 +17,12 @@ */ package org.apache.cassandra.cql3.statements; -import java.nio.ByteBuffer; -import java.util.List; - import org.apache.cassandra.cql3.CFName; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.exceptions.*; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; -import org.apache.cassandra.service.pager.PagingState; import org.apache.cassandra.transport.messages.ResultMessage; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java b/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java index 318995e..b58d3fd 100644 --- a/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java @@ -18,19 +18,15 @@ package org.apache.cassandra.cql3.statements; import java.io.IOException; -import java.nio.ByteBuffer; -import java.util.List; import java.util.concurrent.TimeoutException; import org.apache.cassandra.auth.Permission; import org.apache.cassandra.cql3.*; -import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.exceptions.*; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.service.StorageProxy; -import org.apache.cassandra.service.pager.PagingState; import org.apache.cassandra.thrift.ThriftValidation; public class TruncateStatement extends CFStatement implements CQLStatement http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/cql3/statements/UseStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/UseStatement.java b/src/java/org/apache/cassandra/cql3/statements/UseStatement.java index ab42fed..11f3078 100644 --- a/src/java/org/apache/cassandra/cql3/statements/UseStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/UseStatement.java @@ -17,18 +17,13 @@ */ package org.apache.cassandra.cql3.statements; -import java.nio.ByteBuffer; -import java.util.List; - import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QueryOptions; -import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.exceptions.UnauthorizedException; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; -import org.apache.cassandra.service.pager.PagingState; public class UseStatement extends ParsedStatement implements CQLStatement { http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/AbstractRangeCommand.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/AbstractRangeCommand.java b/src/java/org/apache/cassandra/db/AbstractRangeCommand.java index 1258344..45302e2 100644 --- a/src/java/org/apache/cassandra/db/AbstractRangeCommand.java +++ b/src/java/org/apache/cassandra/db/AbstractRangeCommand.java @@ -18,7 +18,6 @@ package org.apache.cassandra.db; import java.util.List; -import java.util.concurrent.ExecutionException; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.filter.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java b/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java index 411b040..3d832b2 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java @@ -20,7 +20,6 @@ package org.apache.cassandra.db; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import java.util.Iterator; import java.util.UUID; import org.apache.cassandra.config.Schema; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/DeletionInfo.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/DeletionInfo.java b/src/java/org/apache/cassandra/db/DeletionInfo.java index f61e547..d00f2bc 100644 --- a/src/java/org/apache/cassandra/db/DeletionInfo.java +++ b/src/java/org/apache/cassandra/db/DeletionInfo.java @@ -20,21 +20,14 @@ package org.apache.cassandra.db; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import java.lang.reflect.Constructor; import java.nio.ByteBuffer; import java.util.*; import com.google.common.base.Objects; -import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.io.ISSTableSerializer; -import org.apache.cassandra.io.ISerializer; import org.apache.cassandra.io.IVersionedSerializer; -import org.apache.cassandra.io.sstable.Descriptor; -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.IntervalTree; public class DeletionInfo { http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/HintedHandOffManagerMBean.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManagerMBean.java b/src/java/org/apache/cassandra/db/HintedHandOffManagerMBean.java index 142272f..9a024e6 100644 --- a/src/java/org/apache/cassandra/db/HintedHandOffManagerMBean.java +++ b/src/java/org/apache/cassandra/db/HintedHandOffManagerMBean.java @@ -19,7 +19,6 @@ package org.apache.cassandra.db; import java.net.UnknownHostException; import java.util.List; -import java.util.Map; public interface HintedHandOffManagerMBean { http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java index e323b69..b3ea3a2 100644 --- a/src/java/org/apache/cassandra/db/Memtable.java +++ b/src/java/org/apache/cassandra/db/Memtable.java @@ -18,8 +18,6 @@ package org.apache.cassandra.db; import java.io.File; -import java.io.IOException; -import java.nio.ByteBuffer; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicLong; @@ -39,10 +37,7 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor; import org.apache.cassandra.concurrent.NamedThreadFactory; -import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.commitlog.ReplayPosition; -import org.apache.cassandra.db.filter.NamesQueryFilter; -import org.apache.cassandra.db.filter.SliceQueryFilter; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.sstable.SSTableMetadata; import org.apache.cassandra.io.sstable.SSTableReader; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/PagedRangeCommand.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/PagedRangeCommand.java b/src/java/org/apache/cassandra/db/PagedRangeCommand.java index 265e9f7..b1e2c39 100644 --- a/src/java/org/apache/cassandra/db/PagedRangeCommand.java +++ b/src/java/org/apache/cassandra/db/PagedRangeCommand.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.ExecutionException; import org.apache.cassandra.db.filter.*; import org.apache.cassandra.dht.AbstractBounds; @@ -33,7 +32,6 @@ import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.thrift.IndexExpression; import org.apache.cassandra.thrift.IndexOperator; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; public class PagedRangeCommand extends AbstractRangeCommand { http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/RangeSliceCommand.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/RangeSliceCommand.java b/src/java/org/apache/cassandra/db/RangeSliceCommand.java index b4afbcd..c0cfb12 100644 --- a/src/java/org/apache/cassandra/db/RangeSliceCommand.java +++ b/src/java/org/apache/cassandra/db/RangeSliceCommand.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import java.util.concurrent.ExecutionException; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.Schema; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/RangeTombstoneList.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/RangeTombstoneList.java b/src/java/org/apache/cassandra/db/RangeTombstoneList.java index bb139fc..a10d603 100644 --- a/src/java/org/apache/cassandra/db/RangeTombstoneList.java +++ b/src/java/org/apache/cassandra/db/RangeTombstoneList.java @@ -25,10 +25,8 @@ import java.util.Arrays; import java.util.Comparator; import java.util.Iterator; -import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.AbstractIterator; -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.utils.ByteBufferUtil; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/ReadVerbHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ReadVerbHandler.java b/src/java/org/apache/cassandra/db/ReadVerbHandler.java index 24e02eb..e811cc1 100644 --- a/src/java/org/apache/cassandra/db/ReadVerbHandler.java +++ b/src/java/org/apache/cassandra/db/ReadVerbHandler.java @@ -26,7 +26,6 @@ import org.apache.cassandra.net.MessageOut; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.tracing.Tracing; -import org.apache.cassandra.utils.ByteBufferUtil; public class ReadVerbHandler implements IVerbHandler<ReadCommand> { http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java index a8baf7a..8a74fea 100644 --- a/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java +++ b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java @@ -23,7 +23,6 @@ import java.util.Comparator; import java.util.Iterator; import java.util.List; import java.util.concurrent.*; -import java.util.concurrent.locks.Condition; import com.google.common.collect.AbstractIterator; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/compaction/Upgrader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/Upgrader.java b/src/java/org/apache/cassandra/db/compaction/Upgrader.java index 56de6e3..fa21765 100644 --- a/src/java/org/apache/cassandra/db/compaction/Upgrader.java +++ b/src/java/org/apache/cassandra/db/compaction/Upgrader.java @@ -19,25 +19,20 @@ package org.apache.cassandra.db.compaction; import java.io.File; import java.io.IOException; -import java.io.IOError; import java.util.*; import com.google.common.base.Throwables; -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.db.RowIndexEntry; import org.apache.cassandra.db.compaction.AbstractCompactedRow; import org.apache.cassandra.db.compaction.AbstractCompactionStrategy; import org.apache.cassandra.db.compaction.AbstractCompactionIterable; import org.apache.cassandra.db.compaction.CompactionIterable; import org.apache.cassandra.db.compaction.CompactionController; -import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.compaction.CompactionTask; import org.apache.cassandra.db.compaction.OperationType; import org.apache.cassandra.io.sstable.*; -import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.utils.CloseableIterator; import org.apache.cassandra.utils.OutputHandler; @@ -111,7 +106,7 @@ public class Upgrader { AbstractCompactedRow row = iter.next(); - RowIndexEntry indexEntry = writer.append(row); + writer.append(row); } long maxAge = CompactionTask.getMaxDataAge(this.toUpgrade); http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java b/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java index e0f3ec3..5aa1ea9 100644 --- a/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java +++ b/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java @@ -33,10 +33,8 @@ import org.apache.cassandra.db.*; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; -import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.thrift.IndexExpression; import org.apache.cassandra.thrift.IndexOperator; -import org.apache.cassandra.utils.ByteBufferUtil; /** * Extends a column filter (IFilter) to include a number of IndexExpression. http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java index 8dd9f4e..0286c6a 100644 --- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java +++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java @@ -29,8 +29,6 @@ import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.db.*; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.filter.ExtendedFilter; -import org.apache.cassandra.db.filter.IDiskAtomFilter; -import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.ReducingKeyIterator; import org.apache.cassandra.io.sstable.SSTableReader; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/marshal/AsciiType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/AsciiType.java b/src/java/org/apache/cassandra/db/marshal/AsciiType.java index 5142f37..74ae6be 100644 --- a/src/java/org/apache/cassandra/db/marshal/AsciiType.java +++ b/src/java/org/apache/cassandra/db/marshal/AsciiType.java @@ -22,7 +22,6 @@ import java.nio.ByteBuffer; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.AsciiSerializer; -import org.apache.cassandra.serializers.MarshalException; public class AsciiType extends AbstractType<String> { http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java b/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java index ba7c59c..6a77458 100644 --- a/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java +++ b/src/java/org/apache/cassandra/db/marshal/CounterColumnType.java @@ -23,7 +23,6 @@ import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.db.*; import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.CounterSerializer; -import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.ByteBufferUtil; public class CounterColumnType extends AbstractCommutativeType http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/marshal/MapType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/MapType.java b/src/java/org/apache/cassandra/db/marshal/MapType.java index 39cf307..76f7a6d 100644 --- a/src/java/org/apache/cassandra/db/marshal/MapType.java +++ b/src/java/org/apache/cassandra/db/marshal/MapType.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.db.marshal; -import java.nio.BufferUnderflowException; import java.nio.ByteBuffer; import java.util.*; @@ -26,7 +25,6 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.MapSerializer; -import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.Pair; public class MapType<K, V> extends CollectionType<Map<K, V>> http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/marshal/ReversedType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/ReversedType.java b/src/java/org/apache/cassandra/db/marshal/ReversedType.java index a292f3b..ef8fb92 100644 --- a/src/java/org/apache/cassandra/db/marshal/ReversedType.java +++ b/src/java/org/apache/cassandra/db/marshal/ReversedType.java @@ -26,7 +26,6 @@ import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.serializers.TypeSerializer; -import org.apache.cassandra.serializers.MarshalException; public class ReversedType<T> extends AbstractType<T> { http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/db/marshal/UTF8Type.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/UTF8Type.java b/src/java/org/apache/cassandra/db/marshal/UTF8Type.java index 0e18a45..e763316 100644 --- a/src/java/org/apache/cassandra/db/marshal/UTF8Type.java +++ b/src/java/org/apache/cassandra/db/marshal/UTF8Type.java @@ -21,7 +21,6 @@ import java.nio.ByteBuffer; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.serializers.TypeSerializer; -import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.serializers.UTF8Serializer; public class UTF8Type extends AbstractType<String> http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyRecordWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyRecordWriter.java b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyRecordWriter.java index 456130d..1956262 100644 --- a/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyRecordWriter.java +++ b/src/java/org/apache/cassandra/hadoop/AbstractColumnFamilyRecordWriter.java @@ -20,7 +20,6 @@ package org.apache.cassandra.hadoop; import java.io.IOException; import java.net.InetAddress; -import java.nio.ByteBuffer; import java.util.*; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; @@ -29,7 +28,6 @@ import java.util.concurrent.TimeUnit; import org.apache.cassandra.client.RingCache; import org.apache.cassandra.thrift.*; import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.Pair; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.RecordWriter; import org.apache.hadoop.mapreduce.TaskAttemptContext; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.java index a7463cd..3cc0cd1 100644 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlOutputFormat.java @@ -24,7 +24,6 @@ import java.util.List; import java.util.Map; import org.apache.cassandra.hadoop.AbstractColumnFamilyOutputFormat; -import org.apache.cassandra.hadoop.ColumnFamilyInputFormat; import org.apache.cassandra.hadoop.ConfigHelper; import org.apache.cassandra.hadoop.Progressable; import org.apache.hadoop.mapreduce.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java b/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java index 5655486..3e1db50 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java @@ -26,15 +26,10 @@ import com.google.common.collect.AbstractIterator; import org.apache.cassandra.db.DataRange; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.RowIndexEntry; -import org.apache.cassandra.db.RowPosition; import org.apache.cassandra.db.columniterator.IColumnIteratorFactory; import org.apache.cassandra.db.columniterator.LazyColumnIterator; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.compaction.ICompactionScanner; -import org.apache.cassandra.db.filter.QueryFilter; -import org.apache.cassandra.dht.AbstractBounds; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.utils.ByteBufferUtil; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java index ae1cbf3..0f3992f 100644 --- a/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java +++ b/src/java/org/apache/cassandra/metrics/HintedHandoffMetrics.java @@ -19,7 +19,6 @@ package org.apache.cassandra.metrics; import java.net.InetAddress; import java.util.Map.Entry; -import java.util.concurrent.ExecutionException; import org.apache.cassandra.db.HintedHandOffManager; import org.apache.cassandra.db.SystemKeyspace; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/net/MessagingService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index faed07a..40b9f0e 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -59,7 +59,6 @@ import org.apache.cassandra.security.SSLFactory; import org.apache.cassandra.service.*; import org.apache.cassandra.service.paxos.Commit; import org.apache.cassandra.service.paxos.PrepareResponse; -import org.apache.cassandra.streaming.*; import org.apache.cassandra.tracing.TraceState; import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.utils.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/serializers/AsciiSerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/serializers/AsciiSerializer.java b/src/java/org/apache/cassandra/serializers/AsciiSerializer.java index 352c906..701f588 100644 --- a/src/java/org/apache/cassandra/serializers/AsciiSerializer.java +++ b/src/java/org/apache/cassandra/serializers/AsciiSerializer.java @@ -17,10 +17,7 @@ */ package org.apache.cassandra.serializers; -import org.apache.cassandra.utils.ByteBufferUtil; - import java.nio.ByteBuffer; -import java.nio.charset.CharacterCodingException; import java.nio.charset.Charset; public class AsciiSerializer extends AbstractTextSerializer http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/serializers/UTF8Serializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/serializers/UTF8Serializer.java b/src/java/org/apache/cassandra/serializers/UTF8Serializer.java index c0790a6..98e51aa 100644 --- a/src/java/org/apache/cassandra/serializers/UTF8Serializer.java +++ b/src/java/org/apache/cassandra/serializers/UTF8Serializer.java @@ -17,10 +17,7 @@ */ package org.apache.cassandra.serializers; -import org.apache.cassandra.utils.ByteBufferUtil; - import java.nio.ByteBuffer; -import java.nio.charset.CharacterCodingException; import java.nio.charset.Charset; public class UTF8Serializer extends AbstractTextSerializer http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/service/QueryState.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/QueryState.java b/src/java/org/apache/cassandra/service/QueryState.java index c8e2e8d..90bbaad 100644 --- a/src/java/org/apache/cassandra/service/QueryState.java +++ b/src/java/org/apache/cassandra/service/QueryState.java @@ -17,17 +17,9 @@ */ package org.apache.cassandra.service; -import java.nio.ByteBuffer; -import java.util.List; import java.util.UUID; -import org.apache.cassandra.cql3.statements.SelectStatement; -import org.apache.cassandra.db.Row; -import org.apache.cassandra.exceptions.RequestValidationException; -import org.apache.cassandra.exceptions.RequestExecutionException; -import org.apache.cassandra.service.pager.QueryPager; import org.apache.cassandra.tracing.Tracing; -import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.FBUtilities; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java b/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java index 9a7d1d2..22f904c 100644 --- a/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java +++ b/src/java/org/apache/cassandra/service/RangeSliceVerbHandler.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.service; -import java.util.List; - import org.apache.cassandra.db.AbstractRangeCommand; import org.apache.cassandra.db.RangeSliceReply; import org.apache.cassandra.net.IVerbHandler; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/service/pager/MultiPartitionPager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/pager/MultiPartitionPager.java b/src/java/org/apache/cassandra/service/pager/MultiPartitionPager.java index b9870dc..2615e9b 100644 --- a/src/java/org/apache/cassandra/service/pager/MultiPartitionPager.java +++ b/src/java/org/apache/cassandra/service/pager/MultiPartitionPager.java @@ -18,11 +18,9 @@ package org.apache.cassandra.service.pager; import java.util.ArrayList; -import java.util.Collections; import java.util.List; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.filter.ColumnCounter; import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.exceptions.RequestExecutionException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/service/pager/PagingState.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/pager/PagingState.java b/src/java/org/apache/cassandra/service/pager/PagingState.java index 8364286..bc77e3b 100644 --- a/src/java/org/apache/cassandra/service/pager/PagingState.java +++ b/src/java/org/apache/cassandra/service/pager/PagingState.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.service.pager; -import java.io.DataInput; import java.io.DataInputStream; import java.io.DataOutput; import java.io.DataOutputStream; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/service/pager/QueryPagers.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/pager/QueryPagers.java b/src/java/org/apache/cassandra/service/pager/QueryPagers.java index 5b97461..1601ff6 100644 --- a/src/java/org/apache/cassandra/service/pager/QueryPagers.java +++ b/src/java/org/apache/cassandra/service/pager/QueryPagers.java @@ -21,8 +21,6 @@ import java.nio.ByteBuffer; import java.util.Iterator; import java.util.List; -import com.google.common.collect.AbstractIterator; - import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.ColumnCounter; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/service/pager/RangeNamesQueryPager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/pager/RangeNamesQueryPager.java b/src/java/org/apache/cassandra/service/pager/RangeNamesQueryPager.java index 7d222ed..57fb05b 100644 --- a/src/java/org/apache/cassandra/service/pager/RangeNamesQueryPager.java +++ b/src/java/org/apache/cassandra/service/pager/RangeNamesQueryPager.java @@ -22,7 +22,6 @@ import java.util.List; import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.NamesQueryFilter; import org.apache.cassandra.dht.*; -import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.service.StorageProxy; import org.apache.cassandra.service.StorageService; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java index a316ef8..42a9585 100644 --- a/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java +++ b/src/java/org/apache/cassandra/service/pager/RangeSliceQueryPager.java @@ -23,7 +23,6 @@ import java.util.List; import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.SliceQueryFilter; import org.apache.cassandra.dht.*; -import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.service.StorageProxy; import org.apache.cassandra.service.StorageService; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java index dee9190..1d77144 100644 --- a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java +++ b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java @@ -19,11 +19,8 @@ package org.apache.cassandra.service.pager; import java.nio.ByteBuffer; import java.util.Collections; -import java.util.Iterator; import java.util.List; -import com.google.common.collect.AbstractIterator; - import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.SliceQueryFilter; import org.apache.cassandra.exceptions.RequestValidationException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/streaming/StreamManagerMBean.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamManagerMBean.java b/src/java/org/apache/cassandra/streaming/StreamManagerMBean.java index eb6f6ae..f338fb5 100644 --- a/src/java/org/apache/cassandra/streaming/StreamManagerMBean.java +++ b/src/java/org/apache/cassandra/streaming/StreamManagerMBean.java @@ -17,9 +17,7 @@ */ package org.apache.cassandra.streaming; -import java.util.List; import java.util.Set; -import java.util.UUID; public interface StreamManagerMBean { http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/streaming/StreamPlan.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamPlan.java b/src/java/org/apache/cassandra/streaming/StreamPlan.java index 1ac7607..288929c 100644 --- a/src/java/org/apache/cassandra/streaming/StreamPlan.java +++ b/src/java/org/apache/cassandra/streaming/StreamPlan.java @@ -18,12 +18,10 @@ package org.apache.cassandra.streaming; import java.net.InetAddress; -import java.net.Socket; import java.util.*; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.utils.UUIDGen; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java index da290c3..44e4d5c 100644 --- a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java +++ b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java @@ -26,11 +26,8 @@ import com.google.common.base.Throwables; import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.io.compress.CompressionMetadata; -import org.apache.cassandra.io.sstable.Component; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.io.sstable.SSTableWriter; import org.apache.cassandra.streaming.ProgressInfo; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java index c363743..57a7893 100644 --- a/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java +++ b/src/java/org/apache/cassandra/thrift/THsHaDisruptorServer.java @@ -22,7 +22,6 @@ import java.net.InetSocketAddress; import com.thinkaurelius.thrift.Message; import com.thinkaurelius.thrift.TDisruptorServer; -import org.apache.thrift.transport.TNonblockingTransport; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java index 295de9a..7e73e9d 100644 --- a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java +++ b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java @@ -17,12 +17,9 @@ */ package org.apache.cassandra.tools; -import java.io.File; import java.io.IOException; import java.util.*; -import com.google.common.base.Throwables; - import org.apache.commons.cli.*; import org.apache.cassandra.config.DatabaseDescriptor; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java b/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java index c297426..1d12647 100644 --- a/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java @@ -19,8 +19,6 @@ package org.apache.cassandra.transport.messages; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Collections; -import java.util.EnumSet; import java.util.List; import java.util.UUID; @@ -34,7 +32,6 @@ import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.exceptions.PreparedQueryNotFoundException; import org.apache.cassandra.service.QueryState; -import org.apache.cassandra.service.pager.PagingState; import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.transport.*; import org.apache.cassandra.utils.MD5Digest; http://git-wip-us.apache.org/repos/asf/cassandra/blob/6f217f7f/src/java/org/apache/cassandra/transport/messages/QueryMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/QueryMessage.java b/src/java/org/apache/cassandra/transport/messages/QueryMessage.java index 2b2583e..c0d6764 100644 --- a/src/java/org/apache/cassandra/transport/messages/QueryMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/QueryMessage.java @@ -18,10 +18,7 @@ package org.apache.cassandra.transport.messages; import java.nio.ByteBuffer; -import java.util.ArrayList; import java.util.Collections; -import java.util.EnumSet; -import java.util.List; import java.util.UUID; import com.google.common.collect.ImmutableMap; @@ -33,7 +30,6 @@ import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.exceptions.*; import org.apache.cassandra.service.QueryState; -import org.apache.cassandra.service.pager.PagingState; import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.transport.*; import org.apache.cassandra.utils.UUIDGen;
