imports cleanup
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/087264f2 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/087264f2 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/087264f2 Branch: refs/heads/trunk Commit: 087264f29c309ed0b2a18cc20b79016a05847f1c Parents: f6ca482 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sat Jul 16 12:40:05 2016 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sat Jul 16 12:40:05 2016 -0400 ---------------------------------------------------------------------- .../cassandra/thrift/AuthenticationException.java | 13 ------------- .../org/apache/cassandra/thrift/CfSplit.java | 13 ------------- .../org/apache/cassandra/thrift/Column.java | 11 ----------- .../org/apache/cassandra/thrift/ColumnDef.java | 12 ------------ .../cassandra/thrift/ColumnOrSuperColumn.java | 13 ------------- .../org/apache/cassandra/thrift/ColumnPath.java | 12 ------------ .../org/apache/cassandra/thrift/CounterColumn.java | 1 - .../apache/cassandra/auth/CassandraAuthorizer.java | 6 ------ .../org/apache/cassandra/auth/RoleResource.java | 1 - .../cassandra/auth/jmx/AuthorizationProxy.java | 3 --- .../org/apache/cassandra/cache/ChunkCache.java | 1 - .../AbstractLocalAwareExecutorService.java | 2 -- .../concurrent/DebuggableThreadPoolExecutor.java | 3 --- .../apache/cassandra/concurrent/ExecutorLocal.java | 1 - .../apache/cassandra/concurrent/StageManager.java | 1 - .../cassandra/config/ParameterizedClass.java | 1 - .../org/apache/cassandra/cql3/AbstractMarker.java | 1 - src/java/org/apache/cassandra/cql3/Attributes.java | 3 --- .../apache/cassandra/cql3/ColumnIdentifier.java | 6 ------ .../org/apache/cassandra/cql3/FieldIdentifier.java | 1 - src/java/org/apache/cassandra/cql3/Json.java | 1 - src/java/org/apache/cassandra/cql3/Operation.java | 1 - src/java/org/apache/cassandra/cql3/Tuples.java | 1 - .../cassandra/cql3/functions/AggregateFcts.java | 1 - .../apache/cassandra/cql3/functions/TimeFcts.java | 1 - .../apache/cassandra/cql3/functions/ToJsonFct.java | 2 -- .../cassandra/cql3/selection/FieldSelector.java | 1 - .../cassandra/cql3/selection/Selectable.java | 1 - .../apache/cassandra/cql3/selection/Selection.java | 1 - .../cql3/selection/SelectionColumnMapping.java | 2 -- .../cassandra/cql3/selection/TermSelector.java | 3 --- .../cql3/statements/AlterTableStatementColumn.java | 1 - .../cql3/statements/CreateTypeStatement.java | 2 -- .../cql3/statements/CreateViewStatement.java | 1 - .../cql3/statements/DropViewStatement.java | 2 -- .../cassandra/cql3/statements/IndexTarget.java | 1 - .../cql3/statements/ModificationStatement.java | 1 - .../cassandra/cql3/statements/SelectStatement.java | 4 ---- .../cql3/statements/TruncateStatement.java | 1 - .../org/apache/cassandra/db/BufferClustering.java | 4 ---- .../org/apache/cassandra/db/CounterMutation.java | 1 - .../cassandra/db/CounterMutationVerbHandler.java | 1 - src/java/org/apache/cassandra/db/LivenessInfo.java | 1 - .../apache/cassandra/db/MutableDeletionInfo.java | 1 - .../apache/cassandra/db/MutationVerbHandler.java | 1 - .../apache/cassandra/db/NativeDecoratedKey.java | 1 - .../org/apache/cassandra/db/PartitionPosition.java | 1 - .../cassandra/db/PartitionRangeReadCommand.java | 1 - .../cassandra/db/SinglePartitionReadCommand.java | 1 - src/java/org/apache/cassandra/db/Slices.java | 1 - .../cassandra/db/commitlog/CommitLogReader.java | 1 - .../cassandra/db/commitlog/CompressedSegment.java | 2 -- .../db/compaction/AbstractCompactionStrategy.java | 1 - .../db/compaction/CompactionController.java | 1 - .../db/compaction/CompactionManagerMBean.java | 1 - .../db/compaction/LeveledCompactionStrategy.java | 1 - .../cassandra/db/compaction/LeveledManifest.java | 1 - .../compaction/SizeTieredCompactionStrategy.java | 1 - .../apache/cassandra/db/filter/ColumnFilter.java | 1 - .../org/apache/cassandra/db/lifecycle/View.java | 2 -- .../org/apache/cassandra/db/marshal/TimeType.java | 1 - .../org/apache/cassandra/db/marshal/UserType.java | 2 -- .../cassandra/db/partitions/PartitionIterator.java | 2 -- .../db/partitions/PartitionIterators.java | 1 - .../org/apache/cassandra/db/rows/CellPath.java | 1 - .../cassandra/db/rows/UnfilteredRowIterator.java | 3 --- .../cassandra/db/rows/WithOnlyQueriedData.java | 1 - .../org/apache/cassandra/db/view/ViewBuilder.java | 2 -- .../cassandra/db/view/ViewUpdateGenerator.java | 1 - src/java/org/apache/cassandra/dht/Bounds.java | 1 - .../org/apache/cassandra/hints/HintsBuffer.java | 1 - .../cassandra/hints/HintsDispatchTrigger.java | 1 - .../cassandra/index/internal/IndexEntry.java | 1 - .../internal/composites/CompositesSearcher.java | 1 - .../cassandra/index/sasi/conf/view/View.java | 2 -- .../cassandra/index/sasi/memory/MemIndex.java | 2 -- .../apache/cassandra/index/sasi/sa/IntegralSA.java | 1 - .../cassandra/io/compress/CompressionMetadata.java | 1 - .../cassandra/io/sstable/SSTableMultiWriter.java | 1 - .../io/sstable/SSTableSimpleIterator.java | 1 - .../cassandra/io/sstable/SSTableSimpleWriter.java | 1 - .../cassandra/io/sstable/SSTableTxnWriter.java | 1 - .../sstable/metadata/LegacyMetadataSerializer.java | 2 -- .../io/sstable/metadata/MetadataCollector.java | 1 - .../io/sstable/metadata/MetadataSerializer.java | 3 +-- .../cassandra/metrics/BufferPoolMetrics.java | 1 - .../org/apache/cassandra/net/IVerbHandler.java | 2 -- src/java/org/apache/cassandra/net/MessageIn.java | 2 -- .../cassandra/repair/RepairMessageVerbHandler.java | 3 --- .../apache/cassandra/repair/ValidationTask.java | 4 ---- .../apache/cassandra/scheduler/WeightedQueue.java | 3 --- .../cassandra/schema/LegacySchemaMigrator.java | 2 -- src/java/org/apache/cassandra/schema/Types.java | 1 - .../service/AbstractWriteResponseHandler.java | 1 - .../cassandra/service/ActiveRepairService.java | 1 - .../cassandra/service/AsyncRepairCallback.java | 1 - .../org/apache/cassandra/service/CacheService.java | 1 - .../apache/cassandra/service/MigrationTask.java | 1 - .../cassandra/service/NativeTransportService.java | 1 - .../org/apache/cassandra/service/StorageProxy.java | 2 -- .../org/apache/cassandra/service/paxos/Commit.java | 1 - .../cassandra/service/paxos/PrepareCallback.java | 1 - .../cassandra/streaming/StreamResultFuture.java | 1 - .../apache/cassandra/streaming/StreamWriter.java | 1 - .../streaming/compress/CompressedStreamWriter.java | 5 ----- .../streaming/messages/FileMessageHeader.java | 1 - .../streaming/messages/OutgoingFileMessage.java | 1 - .../cassandra/thrift/ThriftSessionManager.java | 1 - .../cassandra/tools/SSTableExpiredBlockers.java | 1 - .../org/apache/cassandra/tools/SSTableExport.java | 2 -- .../cassandra/tools/nodetool/TableStats.java | 6 ------ .../tools/nodetool/stats/TableStatsHolder.java | 2 -- .../tools/nodetool/stats/TableStatsPrinter.java | 3 --- .../tools/nodetool/stats/TpStatsHolder.java | 2 -- .../org/apache/cassandra/triggers/ITrigger.java | 1 - src/java/org/apache/cassandra/utils/CLibrary.java | 2 -- src/java/org/apache/cassandra/utils/Interval.java | 2 -- .../org/apache/cassandra/utils/JMXServerUtils.java | 1 - .../utils/NanoTimeToCurrentTimeMillis.java | 2 -- .../org/apache/cassandra/utils/ObjectSizes.java | 2 -- .../org/apache/cassandra/utils/StatusLogger.java | 5 ----- src/java/org/apache/cassandra/utils/UUIDGen.java | 1 - .../cassandra/utils/concurrent/RefCounted.java | 17 ----------------- .../apache/cassandra/utils/concurrent/Refs.java | 1 - .../apache/cassandra/utils/memory/HeapPool.java | 7 ------- .../utils/memory/MemtableBufferAllocator.java | 1 - .../org/apache/cassandra/cql3/ViewLongTest.java | 3 --- .../locator/DynamicEndpointSnitchLongTest.java | 2 -- test/unit/org/apache/cassandra/UpdateBuilder.java | 1 - test/unit/org/apache/cassandra/Util.java | 1 - .../cassandra/auth/jmx/AuthorizationProxyTest.java | 1 - .../DebuggableScheduledThreadPoolExecutorTest.java | 1 - .../apache/cassandra/cql3/ColumnConditionTest.java | 1 - .../cassandra/cql3/LargeCompactValueTest.java | 2 -- .../cassandra/cql3/NonNativeTimestampTest.java | 6 ------ .../cassandra/cql3/PstmtPersistenceTest.java | 4 ---- .../cassandra/cql3/SerializationMirrorTest.java | 1 - .../org/apache/cassandra/cql3/SimpleQueryTest.java | 4 ---- .../cassandra/cql3/ThriftCompatibilityTest.java | 2 -- .../cql3/selection/TermSelectionTest.java | 2 -- .../cql3/validation/entities/CountersTest.java | 1 - .../cql3/validation/entities/UFAuthTest.java | 1 - .../validation/miscellaneous/OverflowTest.java | 1 - .../operations/InsertUpdateIfConditionTest.java | 1 - .../org/apache/cassandra/db/CounterCellTest.java | 1 - .../org/apache/cassandra/db/RowIterationTest.java | 3 --- test/unit/org/apache/cassandra/db/ScrubTest.java | 1 - test/unit/org/apache/cassandra/db/VerifyTest.java | 1 - .../cassandra/db/commitlog/SegmentReaderTest.java | 1 - .../db/commitlog/SnapshotDeletingTest.java | 1 - .../cassandra/db/compaction/TTLExpiryTest.java | 1 - .../org/apache/cassandra/db/filter/SliceTest.java | 2 -- .../cassandra/db/marshal/TimeUUIDTypeTest.java | 3 --- .../org/apache/cassandra/gms/GossiperTest.java | 5 ----- .../unit/org/apache/cassandra/index/StubIndex.java | 1 - .../apache/cassandra/index/sasi/SASIIndexTest.java | 1 - .../cassandra/io/compress/CompressorTest.java | 1 - .../cassandra/io/sstable/DescriptorTest.java | 1 - .../cassandra/io/sstable/LargePartitionsTest.java | 1 - .../cassandra/io/sstable/LegacySSTableTest.java | 1 - .../io/sstable/SSTableWriterTestBase.java | 1 - .../apache/cassandra/io/util/FileUtilsTest.java | 3 --- .../serializers/SimpleDateSerializerTest.java | 1 - .../apache/cassandra/service/PaxosStateTest.java | 1 - .../cassandra/transport/MessagePayloadTest.java | 2 -- .../apache/cassandra/utils/BloomFilterTest.java | 3 --- .../utils/MergeIteratorComparisonTest.java | 1 - .../cassandra/utils/OverlapIteratorTest.java | 12 ------------ .../src/org/apache/cassandra/stress/Operation.java | 2 -- .../org/apache/cassandra/stress/StressGraph.java | 1 - .../stress/generate/values/LocalDates.java | 4 ---- .../stress/generate/values/SmallInts.java | 1 - .../cassandra/stress/generate/values/Times.java | 1 - .../cassandra/stress/generate/values/TinyInts.java | 8 -------- .../stress/operations/PartitionOperation.java | 2 -- .../operations/userdefined/SchemaStatement.java | 1 - .../operations/userdefined/TokenRangeQuery.java | 2 -- .../userdefined/ValidatingSchemaQuery.java | 1 - .../cassandra/stress/settings/SettingsSchema.java | 1 - .../org/apache/cassandra/stress/util/Timing.java | 1 - 180 files changed, 1 insertion(+), 398 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/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 b16c400..381b052 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/AuthenticationException.java @@ -34,25 +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 org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -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/087264f2/interface/thrift/gen-java/org/apache/cassandra/thrift/CfSplit.java ---------------------------------------------------------------------- diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CfSplit.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CfSplit.java index f765b87..b654f86 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CfSplit.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CfSplit.java @@ -34,25 +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 org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -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; /** * Represents input splits used by hadoop ColumnFamilyRecordReaders http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java ---------------------------------------------------------------------- diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java index b516a38..e24a4e4 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/Column.java @@ -34,25 +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 org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -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; /** * Basic unit of data within a ColumnFamily. http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java ---------------------------------------------------------------------- diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java index 951c967..409e4ac 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnDef.java @@ -34,25 +34,13 @@ 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 org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -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; public class ColumnDef implements org.apache.thrift.TBase<ColumnDef, ColumnDef._Fields>, java.io.Serializable, Cloneable, Comparable<ColumnDef> { private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("ColumnDef"); http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java ---------------------------------------------------------------------- diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java index 2de9d0e..261d93f 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnOrSuperColumn.java @@ -34,25 +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 org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -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; /** * Methods for fetching rows/records from Cassandra will return either a single instance of ColumnOrSuperColumn or a list http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java ---------------------------------------------------------------------- diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java index 627b9a0..997c1bb 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/ColumnPath.java @@ -34,25 +34,13 @@ 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 org.apache.thrift.async.AsyncMethodCallback; -import org.apache.thrift.server.AbstractNonblockingServer.*; -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; /** * The ColumnPath is the path to a single column in Cassandra. It might make sense to think of ColumnPath and http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java ---------------------------------------------------------------------- diff --git a/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java b/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java index 6069218..cd9c593 100644 --- a/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java +++ b/interface/thrift/gen-java/org/apache/cassandra/thrift/CounterColumn.java @@ -34,7 +34,6 @@ 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 org.apache.thrift.async.AsyncMethodCallback; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java index 619ecf8..a6c11d2 100644 --- a/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java +++ b/src/java/org/apache/cassandra/auth/CassandraAuthorizer.java @@ -41,16 +41,10 @@ import org.apache.cassandra.exceptions.*; import org.apache.cassandra.serializers.SetSerializer; import org.apache.cassandra.serializers.UTF8Serializer; import org.apache.cassandra.service.ClientState; -import java.lang.management.ManagementFactory; - -import javax.management.MBeanServer; -import javax.management.MalformedObjectNameException; -import javax.management.ObjectName; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; -import org.apache.cassandra.cql3.UntypedResultSet.Row; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.ByteBufferUtil; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/auth/RoleResource.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/RoleResource.java b/src/java/org/apache/cassandra/auth/RoleResource.java index e994233..bf3b0ec 100644 --- a/src/java/org/apache/cassandra/auth/RoleResource.java +++ b/src/java/org/apache/cassandra/auth/RoleResource.java @@ -20,7 +20,6 @@ package org.apache.cassandra.auth; import java.util.Set; import com.google.common.base.Objects; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; import org.apache.commons.lang3.StringUtils; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java b/src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java index 3bac1f6..f19b19f 100644 --- a/src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java +++ b/src/java/org/apache/cassandra/auth/jmx/AuthorizationProxy.java @@ -29,7 +29,6 @@ import java.util.stream.Collectors; import javax.management.MBeanServer; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import javax.management.remote.MBeanServerForwarder; import javax.security.auth.Subject; import com.google.common.annotations.VisibleForTesting; @@ -40,9 +39,7 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.auth.*; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.FBUtilities; /** * Provides a proxy interface to the platform's MBeanServer instance to perform http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cache/ChunkCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/ChunkCache.java b/src/java/org/apache/cassandra/cache/ChunkCache.java index 0845944..d91d9fd 100644 --- a/src/java/org/apache/cassandra/cache/ChunkCache.java +++ b/src/java/org/apache/cassandra/cache/ChunkCache.java @@ -31,7 +31,6 @@ import com.google.common.util.concurrent.MoreExecutors; import com.github.benmanes.caffeine.cache.*; import com.codahale.metrics.Timer; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.io.sstable.CorruptSSTableException; import org.apache.cassandra.io.util.*; import org.apache.cassandra.metrics.CacheMissMetrics; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java b/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java index f47d8ac..530f46e 100644 --- a/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java +++ b/src/java/org/apache/cassandra/concurrent/AbstractLocalAwareExecutorService.java @@ -29,8 +29,6 @@ import java.util.concurrent.TimeoutException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.tracing.TraceState; -import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.utils.concurrent.SimpleCondition; import org.apache.cassandra.utils.JVMStabilityInspector; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java b/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java index 1fb0690..92cbbf4 100644 --- a/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java +++ b/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java @@ -22,9 +22,6 @@ import java.util.concurrent.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.tracing.TraceState; -import org.apache.cassandra.tracing.Tracing; - import static org.apache.cassandra.tracing.Tracing.isTracing; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/concurrent/ExecutorLocal.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/concurrent/ExecutorLocal.java b/src/java/org/apache/cassandra/concurrent/ExecutorLocal.java index 367dc7c..6577b3d 100644 --- a/src/java/org/apache/cassandra/concurrent/ExecutorLocal.java +++ b/src/java/org/apache/cassandra/concurrent/ExecutorLocal.java @@ -19,7 +19,6 @@ package org.apache.cassandra.concurrent; import org.apache.cassandra.service.ClientWarn; -import org.apache.cassandra.tracing.TraceState; import org.apache.cassandra.tracing.Tracing; public interface ExecutorLocal<T> http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/concurrent/StageManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/concurrent/StageManager.java b/src/java/org/apache/cassandra/concurrent/StageManager.java index ebc4f76..badc527 100644 --- a/src/java/org/apache/cassandra/concurrent/StageManager.java +++ b/src/java/org/apache/cassandra/concurrent/StageManager.java @@ -24,7 +24,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.tracing.TraceState; import org.apache.cassandra.utils.FBUtilities; import static org.apache.cassandra.config.DatabaseDescriptor.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/config/ParameterizedClass.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/ParameterizedClass.java b/src/java/org/apache/cassandra/config/ParameterizedClass.java index 6c7996a..be1b302 100644 --- a/src/java/org/apache/cassandra/config/ParameterizedClass.java +++ b/src/java/org/apache/cassandra/config/ParameterizedClass.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import com.google.common.base.Objects; -import com.google.common.collect.ImmutableMap; public class ParameterizedClass { http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/AbstractMarker.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/AbstractMarker.java b/src/java/org/apache/cassandra/cql3/AbstractMarker.java index 3689ed1..7ffedef 100644 --- a/src/java/org/apache/cassandra/cql3/AbstractMarker.java +++ b/src/java/org/apache/cassandra/cql3/AbstractMarker.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.cql3; -import java.util.Collections; import java.util.List; import org.apache.cassandra.cql3.functions.Function; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/Attributes.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/Attributes.java b/src/java/org/apache/cassandra/cql3/Attributes.java index a443f23..534a2a0 100644 --- a/src/java/org/apache/cassandra/cql3/Attributes.java +++ b/src/java/org/apache/cassandra/cql3/Attributes.java @@ -18,11 +18,8 @@ package org.apache.cassandra.cql3; import java.nio.ByteBuffer; -import java.util.Collections; import java.util.List; -import com.google.common.collect.Iterables; - import org.apache.cassandra.cql3.functions.Function; import org.apache.cassandra.db.LivenessInfo; import org.apache.cassandra.db.marshal.Int32Type; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java index 467c672..a17b0e1 100644 --- a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java +++ b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java @@ -18,7 +18,6 @@ package org.apache.cassandra.cql3; import java.nio.ByteBuffer; -import java.util.List; import java.util.Locale; import java.util.concurrent.ConcurrentMap; import java.util.regex.Matcher; @@ -28,12 +27,7 @@ import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.MapMaker; import org.apache.cassandra.cache.IMeasurableMemory; -import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.ColumnDefinition; -import org.apache.cassandra.cql3.selection.Selectable; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.memory.AbstractAllocator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/FieldIdentifier.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/FieldIdentifier.java b/src/java/org/apache/cassandra/cql3/FieldIdentifier.java index 5e0601c..9f72fc4 100644 --- a/src/java/org/apache/cassandra/cql3/FieldIdentifier.java +++ b/src/java/org/apache/cassandra/cql3/FieldIdentifier.java @@ -22,7 +22,6 @@ import java.nio.ByteBuffer; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.exceptions.SyntaxException; -import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.serializers.MarshalException; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/Json.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/Json.java b/src/java/org/apache/cassandra/cql3/Json.java index 298cde7..c018f24 100644 --- a/src/java/org/apache/cassandra/cql3/Json.java +++ b/src/java/org/apache/cassandra/cql3/Json.java @@ -18,7 +18,6 @@ package org.apache.cassandra.cql3; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.*; import org.apache.cassandra.config.CFMetaData; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/Operation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/Operation.java b/src/java/org/apache/cassandra/cql3/Operation.java index 7d7d7b3..85a1eb2 100644 --- a/src/java/org/apache/cassandra/cql3/Operation.java +++ b/src/java/org/apache/cassandra/cql3/Operation.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.cql3; -import java.nio.ByteBuffer; import java.util.List; import org.apache.cassandra.config.CFMetaData; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/Tuples.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/Tuples.java b/src/java/org/apache/cassandra/cql3/Tuples.java index ba9ddb6..267832d 100644 --- a/src/java/org/apache/cassandra/cql3/Tuples.java +++ b/src/java/org/apache/cassandra/cql3/Tuples.java @@ -26,7 +26,6 @@ import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.cql3.Term.MultiColumnRaw; import org.apache.cassandra.cql3.functions.Function; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.exceptions.InvalidRequestException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java b/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java index 0c4f2e2..7256c66 100644 --- a/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java +++ b/src/java/org/apache/cassandra/cql3/functions/AggregateFcts.java @@ -19,7 +19,6 @@ package org.apache.cassandra.cql3.functions; import java.math.BigDecimal; import java.math.BigInteger; -import java.math.RoundingMode; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java b/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java index 623feba..79ebfaf 100644 --- a/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java +++ b/src/java/org/apache/cassandra/cql3/functions/TimeFcts.java @@ -27,7 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.db.marshal.*; -import org.apache.cassandra.serializers.TimestampSerializer; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.UUIDGen; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/functions/ToJsonFct.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/functions/ToJsonFct.java b/src/java/org/apache/cassandra/cql3/functions/ToJsonFct.java index bcb4559..c7391da 100644 --- a/src/java/org/apache/cassandra/cql3/functions/ToJsonFct.java +++ b/src/java/org/apache/cassandra/cql3/functions/ToJsonFct.java @@ -23,8 +23,6 @@ import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.utils.ByteBufferUtil; import java.nio.ByteBuffer; -import java.util.Collections; -import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/selection/FieldSelector.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/selection/FieldSelector.java b/src/java/org/apache/cassandra/cql3/selection/FieldSelector.java index 55ff50f..687b4c7 100644 --- a/src/java/org/apache/cassandra/cql3/selection/FieldSelector.java +++ b/src/java/org/apache/cassandra/cql3/selection/FieldSelector.java @@ -23,7 +23,6 @@ import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.selection.Selection.ResultSetBuilder; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.exceptions.InvalidRequestException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/selection/Selectable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/selection/Selectable.java b/src/java/org/apache/cassandra/cql3/selection/Selectable.java index 1f1f07b..fa78042 100644 --- a/src/java/org/apache/cassandra/cql3/selection/Selectable.java +++ b/src/java/org/apache/cassandra/cql3/selection/Selectable.java @@ -21,7 +21,6 @@ package org.apache.cassandra.cql3.selection; import java.util.ArrayList; import java.util.Collections; import java.util.List; -import java.nio.ByteBuffer; import org.apache.commons.lang3.text.StrBuilder; import org.apache.cassandra.config.CFMetaData; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/selection/Selection.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/selection/Selection.java b/src/java/org/apache/cassandra/cql3/selection/Selection.java index 2a11d27..f547376 100644 --- a/src/java/org/apache/cassandra/cql3/selection/Selection.java +++ b/src/java/org/apache/cassandra/cql3/selection/Selection.java @@ -21,7 +21,6 @@ import java.nio.ByteBuffer; import java.util.*; import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/selection/SelectionColumnMapping.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/selection/SelectionColumnMapping.java b/src/java/org/apache/cassandra/cql3/selection/SelectionColumnMapping.java index 4cfdefb..5072066 100644 --- a/src/java/org/apache/cassandra/cql3/selection/SelectionColumnMapping.java +++ b/src/java/org/apache/cassandra/cql3/selection/SelectionColumnMapping.java @@ -23,8 +23,6 @@ package org.apache.cassandra.cql3.selection; import java.util.*; import java.util.stream.Collectors; -import com.google.common.base.Function; -import com.google.common.base.Joiner; import com.google.common.base.Objects; import com.google.common.collect.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/selection/TermSelector.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/selection/TermSelector.java b/src/java/org/apache/cassandra/cql3/selection/TermSelector.java index 5aa4522..539826a 100644 --- a/src/java/org/apache/cassandra/cql3/selection/TermSelector.java +++ b/src/java/org/apache/cassandra/cql3/selection/TermSelector.java @@ -19,10 +19,7 @@ package org.apache.cassandra.cql3.selection; import java.nio.ByteBuffer; -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; -import org.apache.cassandra.cql3.AssignmentTestable; -import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.QueryOptions; import org.apache.cassandra.cql3.Term; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/statements/AlterTableStatementColumn.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatementColumn.java b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatementColumn.java index 813effe..480709f 100644 --- a/src/java/org/apache/cassandra/cql3/statements/AlterTableStatementColumn.java +++ b/src/java/org/apache/cassandra/cql3/statements/AlterTableStatementColumn.java @@ -19,7 +19,6 @@ package org.apache.cassandra.cql3.statements; import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.cql3.CQL3Type; -import org.apache.cassandra.cql3.ColumnIdentifier; public class AlterTableStatementColumn { http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java index 6f4331b..0b0b203 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateTypeStatement.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.cql3.statements; -import java.nio.ByteBuffer; import java.util.*; import java.util.stream.Collectors; @@ -25,7 +24,6 @@ import org.apache.cassandra.auth.Permission; import org.apache.cassandra.config.*; import org.apache.cassandra.cql3.*; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.exceptions.*; import org.apache.cassandra.schema.KeyspaceMetadata; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java index 013adbc..2bae73e 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java @@ -41,7 +41,6 @@ import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.exceptions.UnauthorizedException; import org.apache.cassandra.schema.TableParams; import org.apache.cassandra.service.ClientState; -import org.apache.cassandra.service.ClientWarn; import org.apache.cassandra.service.MigrationManager; import org.apache.cassandra.thrift.ThriftValidation; import org.apache.cassandra.transport.Event; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/statements/DropViewStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/DropViewStatement.java b/src/java/org/apache/cassandra/cql3/statements/DropViewStatement.java index 1f53ac4..f9c91c6 100644 --- a/src/java/org/apache/cassandra/cql3/statements/DropViewStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/DropViewStatement.java @@ -20,8 +20,6 @@ package org.apache.cassandra.cql3.statements; import org.apache.cassandra.auth.Permission; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.Schema; -import org.apache.cassandra.config.ViewDefinition; import org.apache.cassandra.cql3.CFName; import org.apache.cassandra.db.view.View; import org.apache.cassandra.exceptions.ConfigurationException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/cql3/statements/IndexTarget.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/IndexTarget.java b/src/java/org/apache/cassandra/cql3/statements/IndexTarget.java index 9756a4c..84af273 100644 --- a/src/java/org/apache/cassandra/cql3/statements/IndexTarget.java +++ b/src/java/org/apache/cassandra/cql3/statements/IndexTarget.java @@ -22,7 +22,6 @@ import java.util.regex.Pattern; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.cql3.ColumnIdentifier; -import org.apache.cassandra.exceptions.InvalidRequestException; public class IndexTarget { http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/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 8d85498..675aaea 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ModificationStatement.java @@ -52,7 +52,6 @@ import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.UUIDGen; import static org.apache.cassandra.cql3.statements.RequestValidations.checkFalse; -import static org.apache.cassandra.cql3.statements.RequestValidations.checkNotNull; import static org.apache.cassandra.cql3.statements.RequestValidations.checkNull; /* http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/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 f2b484e..d3fb159 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@ -21,9 +21,6 @@ import java.nio.ByteBuffer; import java.util.*; import com.google.common.base.MoreObjects; -import com.google.common.base.Objects; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterables; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -64,7 +61,6 @@ import static org.apache.cassandra.cql3.statements.RequestValidations.checkFalse import static org.apache.cassandra.cql3.statements.RequestValidations.checkNotNull; import static org.apache.cassandra.cql3.statements.RequestValidations.checkNull; import static org.apache.cassandra.cql3.statements.RequestValidations.checkTrue; -import static org.apache.cassandra.cql3.statements.RequestValidations.invalidRequest; import static org.apache.cassandra.utils.ByteBufferUtil.UNSET_BYTE_BUFFER; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/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 336091d..fa3c0f3 100644 --- a/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/TruncateStatement.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.cql3.statements; -import java.io.IOException; import java.util.concurrent.TimeoutException; import org.apache.cassandra.auth.Permission; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/BufferClustering.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/BufferClustering.java b/src/java/org/apache/cassandra/db/BufferClustering.java index 7c6bb20..df6a473 100644 --- a/src/java/org/apache/cassandra/db/BufferClustering.java +++ b/src/java/org/apache/cassandra/db/BufferClustering.java @@ -19,10 +19,6 @@ package org.apache.cassandra.db; import java.nio.ByteBuffer; -import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.ColumnDefinition; -import org.apache.cassandra.utils.memory.AbstractAllocator; - /** * The clustering column values for a row. * <p> http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/CounterMutation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/CounterMutation.java b/src/java/org/apache/cassandra/db/CounterMutation.java index a61f3e8..0496a95 100644 --- a/src/java/org/apache/cassandra/db/CounterMutation.java +++ b/src/java/org/apache/cassandra/db/CounterMutation.java @@ -43,7 +43,6 @@ import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.service.CacheService; import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.utils.*; -import org.apache.cassandra.utils.concurrent.OpOrder; import org.apache.cassandra.utils.btree.BTreeSet; public class CounterMutation implements IMutation http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java b/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java index f89480a..d1b1fa2 100644 --- a/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java +++ b/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java @@ -21,7 +21,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.net.IVerbHandler; import org.apache.cassandra.net.MessageIn; import org.apache.cassandra.net.MessagingService; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/LivenessInfo.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/LivenessInfo.java b/src/java/org/apache/cassandra/db/LivenessInfo.java index 71f3101..e6e336b 100644 --- a/src/java/org/apache/cassandra/db/LivenessInfo.java +++ b/src/java/org/apache/cassandra/db/LivenessInfo.java @@ -20,7 +20,6 @@ package org.apache.cassandra.db; import java.util.Objects; import java.security.MessageDigest; -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.FBUtilities; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/MutableDeletionInfo.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/MutableDeletionInfo.java b/src/java/org/apache/cassandra/db/MutableDeletionInfo.java index 4a2c455..39728c5 100644 --- a/src/java/org/apache/cassandra/db/MutableDeletionInfo.java +++ b/src/java/org/apache/cassandra/db/MutableDeletionInfo.java @@ -21,7 +21,6 @@ import java.util.Collections; import java.util.Iterator; import com.google.common.base.Objects; -import com.google.common.collect.Iterators; import org.apache.cassandra.db.rows.*; import org.apache.cassandra.db.rows.EncodingStats; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/MutationVerbHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/MutationVerbHandler.java b/src/java/org/apache/cassandra/db/MutationVerbHandler.java index 74dd625..5888438 100644 --- a/src/java/org/apache/cassandra/db/MutationVerbHandler.java +++ b/src/java/org/apache/cassandra/db/MutationVerbHandler.java @@ -20,7 +20,6 @@ package org.apache.cassandra.db; import java.io.DataInputStream; import java.io.IOException; import java.net.InetAddress; -import java.util.function.Consumer; import org.apache.cassandra.batchlog.LegacyBatchlogMigrator; import org.apache.cassandra.exceptions.WriteTimeoutException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/NativeDecoratedKey.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/NativeDecoratedKey.java b/src/java/org/apache/cassandra/db/NativeDecoratedKey.java index 019209e..add5218 100644 --- a/src/java/org/apache/cassandra/db/NativeDecoratedKey.java +++ b/src/java/org/apache/cassandra/db/NativeDecoratedKey.java @@ -22,7 +22,6 @@ import java.nio.ByteOrder; import org.apache.cassandra.dht.Token; import org.apache.cassandra.utils.concurrent.OpOrder; -import org.apache.cassandra.utils.memory.HeapAllocator; import org.apache.cassandra.utils.memory.MemoryUtil; import org.apache.cassandra.utils.memory.NativeAllocator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/PartitionPosition.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/PartitionPosition.java b/src/java/org/apache/cassandra/db/PartitionPosition.java index ac5258d..3b45c6c 100644 --- a/src/java/org/apache/cassandra/db/PartitionPosition.java +++ b/src/java/org/apache/cassandra/db/PartitionPosition.java @@ -23,7 +23,6 @@ import java.nio.ByteBuffer; import org.apache.cassandra.dht.*; import org.apache.cassandra.io.util.DataOutputPlus; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; public interface PartitionPosition extends RingPosition<PartitionPosition> http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java index 9517503..b13bf39 100644 --- a/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java +++ b/src/java/org/apache/cassandra/db/PartitionRangeReadCommand.java @@ -27,7 +27,6 @@ import com.google.common.collect.Iterables; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.filter.*; -import org.apache.cassandra.db.lifecycle.SSTableSet; import org.apache.cassandra.db.lifecycle.View; import org.apache.cassandra.db.partitions.*; import org.apache.cassandra.db.rows.BaseRowIterator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java index 855b030..d96648f 100644 --- a/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java +++ b/src/java/org/apache/cassandra/db/SinglePartitionReadCommand.java @@ -54,7 +54,6 @@ import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.SearchIterator; import org.apache.cassandra.utils.btree.BTreeSet; -import org.apache.cassandra.utils.concurrent.OpOrder; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/Slices.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Slices.java b/src/java/org/apache/cassandra/db/Slices.java index f880781..b3fd20a 100644 --- a/src/java/org/apache/cassandra/db/Slices.java +++ b/src/java/org/apache/cassandra/db/Slices.java @@ -25,7 +25,6 @@ import com.google.common.collect.Iterators; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; -import org.apache.cassandra.db.rows.*; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java index c797482..e6e2e1a 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReader.java @@ -34,7 +34,6 @@ import org.apache.cassandra.db.commitlog.CommitLogReadHandler.CommitLogReadError import org.apache.cassandra.db.commitlog.CommitLogReadHandler.CommitLogReadException; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.db.rows.SerializationHelper; -import org.apache.cassandra.io.util.ChannelProxy; import org.apache.cassandra.io.util.DataInputBuffer; import org.apache.cassandra.io.util.FileDataInput; import org.apache.cassandra.io.util.RandomAccessReader; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/commitlog/CompressedSegment.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CompressedSegment.java b/src/java/org/apache/cassandra/db/commitlog/CompressedSegment.java index 645eda9..2e46028 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CompressedSegment.java +++ b/src/java/org/apache/cassandra/db/commitlog/CompressedSegment.java @@ -20,9 +20,7 @@ package org.apache.cassandra.db.commitlog; import java.nio.ByteBuffer; import org.apache.cassandra.io.FSWriteError; -import org.apache.cassandra.io.compress.BufferType; import org.apache.cassandra.io.compress.ICompressor; -import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.SyncUtil; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java index cc9fc23..4728ec3 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java @@ -27,7 +27,6 @@ import com.google.common.util.concurrent.RateLimiter; import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.SerializationHeader; -import org.apache.cassandra.db.lifecycle.SSTableSet; import org.apache.cassandra.index.Index; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.SSTableMultiWriter; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/compaction/CompactionController.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionController.java b/src/java/org/apache/cassandra/db/compaction/CompactionController.java index e6115ed..e42e7a1 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java @@ -20,7 +20,6 @@ package org.apache.cassandra.db.compaction; import java.util.*; import org.apache.cassandra.db.Memtable; -import org.apache.cassandra.db.lifecycle.SSTableSet; import com.google.common.collect.Iterables; import org.apache.cassandra.db.partitions.Partition; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java b/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java index bb67d5f..8785b41 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java @@ -19,7 +19,6 @@ package org.apache.cassandra.db.compaction; import java.util.List; import java.util.Map; -import java.util.UUID; import javax.management.openmbean.TabularData; public interface CompactionManagerMBean http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java index b6ad64c..3f57fe0 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java @@ -37,7 +37,6 @@ import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.ISSTableScanner; import org.apache.cassandra.io.sstable.format.SSTableReader; -import org.apache.cassandra.utils.FBUtilities; import org.codehaus.jackson.JsonNode; import org.codehaus.jackson.node.JsonNodeFactory; import org.codehaus.jackson.node.ObjectNode; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java index d7a7d0b..fbe0513 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java @@ -25,7 +25,6 @@ import com.google.common.base.Predicate; import com.google.common.base.Predicates; import com.google.common.collect.ImmutableSortedSet; import com.google.common.collect.Iterables; -import com.google.common.collect.Lists; import com.google.common.collect.Sets; import com.google.common.primitives.Ints; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java index 8ef2ac7..7cca4a7 100644 --- a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java @@ -21,7 +21,6 @@ import java.util.*; import java.util.Map.Entry; import com.google.common.annotations.VisibleForTesting; -import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/filter/ColumnFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/ColumnFilter.java b/src/java/org/apache/cassandra/db/filter/ColumnFilter.java index 9c4c714..9ce7ef7 100644 --- a/src/java/org/apache/cassandra/db/filter/ColumnFilter.java +++ b/src/java/org/apache/cassandra/db/filter/ColumnFilter.java @@ -26,7 +26,6 @@ import com.google.common.collect.TreeMultimap; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.CellPath; import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.io.util.DataInputPlus; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/lifecycle/View.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/lifecycle/View.java b/src/java/org/apache/cassandra/db/lifecycle/View.java index a5c781d..64e5190 100644 --- a/src/java/org/apache/cassandra/db/lifecycle/View.java +++ b/src/java/org/apache/cassandra/db/lifecycle/View.java @@ -33,14 +33,12 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.utils.Interval; import static com.google.common.base.Predicates.equalTo; -import static com.google.common.base.Predicates.in; import static com.google.common.base.Predicates.not; import static com.google.common.collect.ImmutableList.copyOf; import static com.google.common.collect.ImmutableList.of; import static com.google.common.collect.Iterables.all; import static com.google.common.collect.Iterables.concat; import static com.google.common.collect.Iterables.filter; -import static com.google.common.collect.Iterables.transform; import static org.apache.cassandra.db.lifecycle.Helpers.emptySet; import static org.apache.cassandra.db.lifecycle.Helpers.filterOut; import static org.apache.cassandra.db.lifecycle.Helpers.replace; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/marshal/TimeType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/TimeType.java b/src/java/org/apache/cassandra/db/marshal/TimeType.java index 8cd221e..9992a06 100644 --- a/src/java/org/apache/cassandra/db/marshal/TimeType.java +++ b/src/java/org/apache/cassandra/db/marshal/TimeType.java @@ -25,7 +25,6 @@ import org.apache.cassandra.serializers.TimeSerializer; import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.serializers.TypeSerializer; import org.apache.cassandra.serializers.MarshalException; -import org.apache.cassandra.utils.ByteBufferUtil; /** * Nanosecond resolution time values http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/marshal/UserType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/UserType.java b/src/java/org/apache/cassandra/db/marshal/UserType.java index 7803ee2..74378b2 100644 --- a/src/java/org/apache/cassandra/db/marshal/UserType.java +++ b/src/java/org/apache/cassandra/db/marshal/UserType.java @@ -18,8 +18,6 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; -import java.nio.charset.CharacterCodingException; -import java.nio.charset.StandardCharsets; import java.util.*; import java.util.stream.Collectors; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/partitions/PartitionIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/partitions/PartitionIterator.java b/src/java/org/apache/cassandra/db/partitions/PartitionIterator.java index 529a9e2..e4b926a 100644 --- a/src/java/org/apache/cassandra/db/partitions/PartitionIterator.java +++ b/src/java/org/apache/cassandra/db/partitions/PartitionIterator.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.db.partitions; -import java.util.Iterator; - import org.apache.cassandra.db.rows.*; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/partitions/PartitionIterators.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/partitions/PartitionIterators.java b/src/java/org/apache/cassandra/db/partitions/PartitionIterators.java index 9b7d7eb..70759cf 100644 --- a/src/java/org/apache/cassandra/db/partitions/PartitionIterators.java +++ b/src/java/org/apache/cassandra/db/partitions/PartitionIterators.java @@ -18,7 +18,6 @@ package org.apache.cassandra.db.partitions; import java.util.*; -import java.security.MessageDigest; import org.apache.cassandra.db.EmptyIterators; import org.apache.cassandra.db.transform.MorePartitions; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/rows/CellPath.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/rows/CellPath.java b/src/java/org/apache/cassandra/db/rows/CellPath.java index e2b362c..91a5217 100644 --- a/src/java/org/apache/cassandra/db/rows/CellPath.java +++ b/src/java/org/apache/cassandra/db/rows/CellPath.java @@ -22,7 +22,6 @@ import java.nio.ByteBuffer; import java.security.MessageDigest; import java.util.Objects; -import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.utils.ByteBufferUtil; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterator.java b/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterator.java index a969858..bbef11e 100644 --- a/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterator.java +++ b/src/java/org/apache/cassandra/db/rows/UnfilteredRowIterator.java @@ -17,9 +17,6 @@ */ package org.apache.cassandra.db.rows; -import java.util.Iterator; - -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.*; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/rows/WithOnlyQueriedData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/rows/WithOnlyQueriedData.java b/src/java/org/apache/cassandra/db/rows/WithOnlyQueriedData.java index 5e7d905..0b407f2 100644 --- a/src/java/org/apache/cassandra/db/rows/WithOnlyQueriedData.java +++ b/src/java/org/apache/cassandra/db/rows/WithOnlyQueriedData.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.db.rows; -import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.transform.Transformation; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/view/ViewBuilder.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/view/ViewBuilder.java b/src/java/org/apache/cassandra/db/view/ViewBuilder.java index 8f8abb8..4bd95d4 100644 --- a/src/java/org/apache/cassandra/db/view/ViewBuilder.java +++ b/src/java/org/apache/cassandra/db/view/ViewBuilder.java @@ -45,8 +45,6 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.repair.SystemDistributedKeyspace; import org.apache.cassandra.service.StorageProxy; import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.service.pager.QueryPager; -import org.apache.cassandra.transport.Server; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.UUIDGen; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java index 4c6dbb7..12eb474 100644 --- a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java +++ b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java @@ -25,7 +25,6 @@ import com.google.common.collect.PeekingIterator; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; -import org.apache.cassandra.config.ViewDefinition; import org.apache.cassandra.db.*; import org.apache.cassandra.db.rows.*; import org.apache.cassandra.db.partitions.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/dht/Bounds.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/dht/Bounds.java b/src/java/org/apache/cassandra/dht/Bounds.java index a125168..626eaa6 100644 --- a/src/java/org/apache/cassandra/dht/Bounds.java +++ b/src/java/org/apache/cassandra/dht/Bounds.java @@ -18,7 +18,6 @@ package org.apache.cassandra.dht; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.Comparator; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/hints/HintsBuffer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hints/HintsBuffer.java b/src/java/org/apache/cassandra/hints/HintsBuffer.java index e86dede..835a3be 100644 --- a/src/java/org/apache/cassandra/hints/HintsBuffer.java +++ b/src/java/org/apache/cassandra/hints/HintsBuffer.java @@ -28,7 +28,6 @@ import java.util.zip.CRC32; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.util.DataOutputBufferFixed; -import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.utils.AbstractIterator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/hints/HintsDispatchTrigger.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hints/HintsDispatchTrigger.java b/src/java/org/apache/cassandra/hints/HintsDispatchTrigger.java index 5fe0e27..47d986f 100644 --- a/src/java/org/apache/cassandra/hints/HintsDispatchTrigger.java +++ b/src/java/org/apache/cassandra/hints/HintsDispatchTrigger.java @@ -20,7 +20,6 @@ package org.apache.cassandra.hints; import java.util.concurrent.atomic.AtomicBoolean; import org.apache.cassandra.gms.ApplicationState; -import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.gms.Gossiper; import static org.apache.cassandra.utils.FBUtilities.getBroadcastAddress; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/index/internal/IndexEntry.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/internal/IndexEntry.java b/src/java/org/apache/cassandra/index/internal/IndexEntry.java index 8ffd26a..97525d6 100644 --- a/src/java/org/apache/cassandra/index/internal/IndexEntry.java +++ b/src/java/org/apache/cassandra/index/internal/IndexEntry.java @@ -23,7 +23,6 @@ package org.apache.cassandra.index.internal; import java.nio.ByteBuffer; import org.apache.cassandra.db.Clustering; -import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.DecoratedKey; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java b/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java index e24e441..e2b0b2a 100644 --- a/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java +++ b/src/java/org/apache/cassandra/index/internal/composites/CompositesSearcher.java @@ -25,7 +25,6 @@ import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.ClusteringIndexNamesFilter; import org.apache.cassandra.db.filter.ClusteringIndexSliceFilter; -import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.filter.DataLimits; import org.apache.cassandra.db.filter.RowFilter; import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/index/sasi/conf/view/View.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/conf/view/View.java b/src/java/org/apache/cassandra/index/sasi/conf/view/View.java index 1f68b0c..25f32d9 100644 --- a/src/java/org/apache/cassandra/index/sasi/conf/view/View.java +++ b/src/java/org/apache/cassandra/index/sasi/conf/view/View.java @@ -20,7 +20,6 @@ package org.apache.cassandra.index.sasi.conf.view; import java.nio.ByteBuffer; import java.util.*; -import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.index.sasi.SSTableIndex; import org.apache.cassandra.index.sasi.conf.ColumnIndex; import org.apache.cassandra.index.sasi.plan.Expression; @@ -33,7 +32,6 @@ import org.apache.cassandra.utils.Interval; import org.apache.cassandra.utils.IntervalTree; import com.google.common.collect.Iterables; -import com.google.common.collect.Sets; public class View implements Iterable<SSTableIndex> { http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/index/sasi/memory/MemIndex.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/memory/MemIndex.java b/src/java/org/apache/cassandra/index/sasi/memory/MemIndex.java index 22d6c9e..cc1eb3f 100644 --- a/src/java/org/apache/cassandra/index/sasi/memory/MemIndex.java +++ b/src/java/org/apache/cassandra/index/sasi/memory/MemIndex.java @@ -26,8 +26,6 @@ import org.apache.cassandra.index.sasi.plan.Expression; import org.apache.cassandra.index.sasi.utils.RangeIterator; import org.apache.cassandra.db.marshal.AbstractType; -import org.github.jamm.MemoryMeter; - public abstract class MemIndex { protected final AbstractType<?> keyValidator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/index/sasi/sa/IntegralSA.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/sasi/sa/IntegralSA.java b/src/java/org/apache/cassandra/index/sasi/sa/IntegralSA.java index e3d591f..5f04876 100644 --- a/src/java/org/apache/cassandra/index/sasi/sa/IntegralSA.java +++ b/src/java/org/apache/cassandra/index/sasi/sa/IntegralSA.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.Comparator; import java.util.Iterator; -import org.apache.cassandra.index.Index; import org.apache.cassandra.index.sasi.disk.OnDiskIndexBuilder; import org.apache.cassandra.index.sasi.disk.TokenTreeBuilder; import org.apache.cassandra.db.marshal.AbstractType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java index 101f722..9a4d919 100644 --- a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java +++ b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java @@ -49,7 +49,6 @@ import org.apache.cassandra.io.sstable.CorruptSSTableException; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; -import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.Memory; import org.apache.cassandra.io.util.SafeMemory; import org.apache.cassandra.schema.CompressionParams; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/io/sstable/SSTableMultiWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableMultiWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableMultiWriter.java index 0bb3721..b92bc78 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableMultiWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableMultiWriter.java @@ -19,7 +19,6 @@ package org.apache.cassandra.io.sstable; import java.util.Collection; -import java.util.List; import java.util.UUID; import org.apache.cassandra.db.rows.UnfilteredRowIterator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/io/sstable/SSTableSimpleIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleIterator.java b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleIterator.java index eb69271..2d4314e 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleIterator.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleIterator.java @@ -29,7 +29,6 @@ import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.db.*; import org.apache.cassandra.db.rows.*; import org.apache.cassandra.io.util.DataInputPlus; -import org.apache.cassandra.io.util.FileDataInput; import org.apache.cassandra.io.util.DataPosition; import org.apache.cassandra.net.MessagingService; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java index 45722cd..7fbd79d 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleWriter.java @@ -25,7 +25,6 @@ import com.google.common.base.Throwables; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.*; import org.apache.cassandra.db.partitions.PartitionUpdate; -import org.apache.cassandra.dht.IPartitioner; /** * A SSTable writer that assumes rows are in (partitioner) sorted order. http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java index 5286ac5..09f6a55 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java @@ -22,7 +22,6 @@ import java.util.Collection; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.SerializationHeader; import org.apache.cassandra.db.compaction.OperationType; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/io/sstable/metadata/LegacyMetadataSerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/LegacyMetadataSerializer.java b/src/java/org/apache/cassandra/io/sstable/metadata/LegacyMetadataSerializer.java index 253b4f6..2dccf3c 100644 --- a/src/java/org/apache/cassandra/io/sstable/metadata/LegacyMetadataSerializer.java +++ b/src/java/org/apache/cassandra/io/sstable/metadata/LegacyMetadataSerializer.java @@ -21,8 +21,6 @@ import java.io.*; import java.nio.ByteBuffer; import java.util.*; -import com.google.common.collect.Maps; - import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.commitlog.CommitLogPosition; import org.apache.cassandra.io.sstable.Component; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java index be064f1..eb9abcf 100644 --- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java +++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java @@ -24,7 +24,6 @@ import java.util.EnumMap; import java.util.List; import java.util.Map; -import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.clearspring.analytics.stream.cardinality.HyperLogLogPlus; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java index 85a71ed..abc6eaa 100644 --- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java +++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataSerializer.java @@ -21,7 +21,6 @@ import java.io.*; import java.util.*; import com.google.common.collect.Lists; -import com.google.common.collect.Maps; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -108,7 +107,7 @@ public class MetadataSerializer implements IMetadataSerializer // read number of components int numComponents = in.readInt(); // read toc - Map<MetadataType, Integer> toc = new HashMap<>(numComponents); + Map<MetadataType, Integer> toc = new EnumMap<>(MetadataType.class); MetadataType[] values = MetadataType.values(); for (int i = 0; i < numComponents; i++) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/metrics/BufferPoolMetrics.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/metrics/BufferPoolMetrics.java b/src/java/org/apache/cassandra/metrics/BufferPoolMetrics.java index 107717d..c9c859a 100644 --- a/src/java/org/apache/cassandra/metrics/BufferPoolMetrics.java +++ b/src/java/org/apache/cassandra/metrics/BufferPoolMetrics.java @@ -19,7 +19,6 @@ package org.apache.cassandra.metrics; import com.codahale.metrics.Gauge; import com.codahale.metrics.Meter; -import com.codahale.metrics.RatioGauge; import org.apache.cassandra.utils.memory.BufferPool; import static org.apache.cassandra.metrics.CassandraMetricsRegistry.Metrics; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/net/IVerbHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/IVerbHandler.java b/src/java/org/apache/cassandra/net/IVerbHandler.java index b9f1a54..0995a68 100644 --- a/src/java/org/apache/cassandra/net/IVerbHandler.java +++ b/src/java/org/apache/cassandra/net/IVerbHandler.java @@ -19,8 +19,6 @@ package org.apache.cassandra.net; import java.io.IOException; -import org.apache.cassandra.db.ReadCommand; - /** * IVerbHandler provides the method that all verb handlers need to implement. * The concrete implementation of this interface would provide the functionality