From a15c35b0942f91d6f9e45139d99491e189989bde Mon Sep 17 00:00:00 2001 From: Sylvain Lebresne Date: Mon, 27 Feb 2012 11:24:31 +0100 Subject: [PATCH] [3649] remove unused imports --- .../org/apache/cassandra/cache/KeyCacheKey.java | 3 --- .../org/apache/cassandra/cache/RowCacheKey.java | 1 - .../DebuggableScheduledThreadPoolExecutor.java | 3 --- src/java/org/apache/cassandra/config/Config.java | 3 --- .../cassandra/cql/CreateKeyspaceStatement.java | 2 -- src/java/org/apache/cassandra/cql/WhereClause.java | 1 - .../org/apache/cassandra/cql3/CQLStatement.java | 3 --- .../org/apache/cassandra/cql3/QueryProcessor.java | 5 ----- .../cassandra/cql3/statements/CFStatement.java | 1 - .../cql3/statements/CreateIndexStatement.java | 2 -- .../cassandra/cql3/statements/DeleteStatement.java | 1 - .../cassandra/cql3/statements/ParsedStatement.java | 7 ------- .../cql3/statements/SchemaAlteringStatement.java | 1 - .../cassandra/cql3/statements/SelectStatement.java | 1 - .../apache/cassandra/db/CollationController.java | 1 - .../apache/cassandra/db/ColumnFamilySerializer.java | 3 --- .../org/apache/cassandra/db/ColumnFamilyStore.java | 2 -- .../apache/cassandra/db/ColumnFamilyStoreMBean.java | 1 - .../org/apache/cassandra/db/ColumnSerializer.java | 1 - src/java/org/apache/cassandra/db/CounterColumn.java | 3 --- .../org/apache/cassandra/db/CounterMutation.java | 1 - .../cassandra/db/CounterMutationVerbHandler.java | 5 ----- src/java/org/apache/cassandra/db/DataTracker.java | 3 --- src/java/org/apache/cassandra/db/EchoedRow.java | 1 - .../org/apache/cassandra/db/IndexScanCommand.java | 4 ---- src/java/org/apache/cassandra/db/Memtable.java | 3 --- .../org/apache/cassandra/db/RangeSliceCommand.java | 1 - .../org/apache/cassandra/db/RowIteratorFactory.java | 1 - src/java/org/apache/cassandra/db/Table.java | 4 ---- .../db/columniterator/IColumnIterator.java | 2 -- .../db/columniterator/SimpleSliceReader.java | 1 - .../commitlog/AbstractCommitLogExecutorService.java | 3 --- .../db/commitlog/ICommitLogExecutorService.java | 2 -- .../db/compaction/AbstractCompactionStrategy.java | 1 - .../db/compaction/CompactionManagerMBean.java | 1 - .../cassandra/db/compaction/LazilyCompactedRow.java | 1 - .../db/compaction/LeveledCompactionTask.java | 7 ------- .../cassandra/db/compaction/LeveledManifest.java | 1 - .../db/compaction/SizeTieredCompactionStrategy.java | 1 - .../cassandra/db/index/SecondaryIndexSearcher.java | 2 -- .../db/marshal/AbstractCommutativeType.java | 2 -- src/java/org/apache/cassandra/dht/BootStrapper.java | 7 ------- src/java/org/apache/cassandra/dht/Range.java | 3 --- src/java/org/apache/cassandra/dht/RingPosition.java | 9 --------- src/java/org/apache/cassandra/gms/Gossiper.java | 3 --- .../apache/cassandra/hadoop/BulkOutputFormat.java | 3 --- .../apache/cassandra/hadoop/BulkRecordWriter.java | 1 - .../cassandra/hadoop/ColumnFamilyInputFormat.java | 2 -- .../cassandra/hadoop/ColumnFamilyRecordWriter.java | 1 - .../cassandra/io/compress/DeflateCompressor.java | 1 - .../apache/cassandra/io/compress/ICompressor.java | 1 - .../org/apache/cassandra/io/sstable/Descriptor.java | 5 ----- .../apache/cassandra/io/sstable/IndexSummary.java | 1 - .../org/apache/cassandra/io/sstable/SSTable.java | 1 - .../apache/cassandra/io/sstable/SSTableReader.java | 3 --- .../io/sstable/SSTableSimpleUnsortedWriter.java | 8 -------- .../apache/cassandra/io/util/ColumnSortedMap.java | 1 - .../locator/AbstractNetworkTopologySnitch.java | 1 - .../cassandra/locator/NetworkTopologyStrategy.java | 3 --- .../org/apache/cassandra/locator/SimpleSnitch.java | 2 -- .../apache/cassandra/net/IncomingTcpConnection.java | 2 -- .../org/apache/cassandra/net/MessagingService.java | 2 -- .../notifications/SSTableAddedNotification.java | 2 -- .../SSTableListChangedNotification.java | 2 -- .../service/AbstractWriteResponseHandler.java | 5 ----- .../cassandra/service/AntiEntropyService.java | 1 - .../org/apache/cassandra/service/CacheService.java | 4 ---- .../cassandra/service/DatacenterReadCallback.java | 2 -- .../cassandra/service/IWriteResponseHandler.java | 1 - .../service/RangeSliceResponseResolver.java | 3 --- .../org/apache/cassandra/service/StorageProxy.java | 2 -- .../cassandra/service/StorageServiceMBean.java | 4 ---- .../apache/cassandra/streaming/FileStreamTask.java | 1 - .../org/apache/cassandra/streaming/StreamIn.java | 5 ----- .../apache/cassandra/thrift/CassandraDaemon.java | 1 - .../cassandra/thrift/CustomTThreadPoolServer.java | 1 - .../cassandra/thrift/TCustomServerSocket.java | 2 -- src/java/org/apache/cassandra/tools/BulkLoader.java | 4 ---- src/java/org/apache/cassandra/tools/NodeCmd.java | 2 -- src/java/org/apache/cassandra/tools/NodeProbe.java | 1 - .../org/apache/cassandra/utils/FBUtilities.java | 4 ---- .../apache/cassandra/utils/LegacyBloomFilter.java | 1 - .../utils/LegacyBloomFilterSerializer.java | 2 -- .../org/apache/cassandra/utils/SlabAllocator.java | 5 ----- .../db/compaction/LongCompactionSpeedTest.java | 2 -- .../apache/cassandra/utils/LongBloomFilterTest.java | 1 - .../cassandra/utils/LongLegacyBloomFilterTest.java | 1 - test/unit/org/apache/cassandra/SchemaLoader.java | 1 - .../apache/cassandra/cache/CacheProviderTest.java | 4 ---- test/unit/org/apache/cassandra/cli/CliTest.java | 1 - test/unit/org/apache/cassandra/db/CleanupTest.java | 3 --- .../apache/cassandra/db/ColumnFamilyStoreTest.java | 2 -- .../unit/org/apache/cassandra/db/CommitLogTest.java | 1 - .../org/apache/cassandra/db/CounterColumnTest.java | 7 ------- .../org/apache/cassandra/db/DirectoriesTest.java | 1 - test/unit/org/apache/cassandra/db/KeyCacheTest.java | 3 --- .../org/apache/cassandra/db/KeyCollisionTest.java | 2 -- .../org/apache/cassandra/db/MultitableTest.java | 1 - test/unit/org/apache/cassandra/db/NameSortTest.java | 3 --- .../apache/cassandra/db/RecoveryManager2Test.java | 3 --- .../apache/cassandra/db/RecoveryManagerTest.java | 1 - .../cassandra/db/RecoveryManagerTruncateTest.java | 1 - .../apache/cassandra/db/RemoveColumnFamilyTest.java | 1 - .../db/RemoveColumnFamilyWithFlush1Test.java | 1 - .../db/RemoveColumnFamilyWithFlush2Test.java | 1 - .../org/apache/cassandra/db/RemoveColumnTest.java | 1 - .../apache/cassandra/db/RemoveSubColumnTest.java | 1 - .../apache/cassandra/db/RemoveSuperColumnTest.java | 1 - .../org/apache/cassandra/db/RowIterationTest.java | 3 --- test/unit/org/apache/cassandra/db/RowTest.java | 1 - test/unit/org/apache/cassandra/db/ScrubTest.java | 1 - .../org/apache/cassandra/db/SuperColumnTest.java | 4 ---- .../cassandra/db/context/CounterContextTest.java | 2 -- .../cassandra/db/marshal/CompositeTypeTest.java | 1 - .../db/marshal/DynamicCompositeTypeTest.java | 1 - .../apache/cassandra/db/marshal/TypeParserTest.java | 13 ------------- .../cassandra/dht/ByteOrderedPartitionerTest.java | 4 ---- .../CollatingOrderPreservingPartitionerTest.java | 4 ---- .../dht/OrderPreservingPartitionerTest.java | 5 ----- .../apache/cassandra/dht/PartitionerTestCase.java | 4 ---- .../apache/cassandra/dht/RandomPartitionerTest.java | 6 ------ .../apache/cassandra/io/sstable/DescriptorTest.java | 4 ---- .../cassandra/io/sstable/IndexHelperTest.java | 2 -- .../cassandra/io/sstable/SSTableReaderTest.java | 2 -- .../io/sstable/SSTableSimpleWriterTest.java | 1 - .../apache/cassandra/io/sstable/SSTableTest.java | 1 - .../apache/cassandra/locator/TokenMetadataTest.java | 3 --- .../service/AntiEntropyServiceTestAbstract.java | 1 - .../service/EmbeddedCassandraServiceTest.java | 3 --- .../apache/cassandra/service/StorageProxyTest.java | 3 --- .../cassandra/service/StorageServiceClientTest.java | 1 - .../cassandra/service/StorageServiceServerTest.java | 1 - .../cassandra/streaming/SerializationsTest.java | 3 --- .../org/apache/cassandra/streaming/StreamUtil.java | 1 - .../apache/cassandra/tools/SSTableImportTest.java | 2 -- .../apache/cassandra/utils/ByteBufferUtilTest.java | 1 - .../org/apache/cassandra/utils/FBUtilitiesTest.java | 3 --- .../apache/cassandra/utils/FilterTestHelper.java | 9 --------- .../org/apache/cassandra/utils/IntervalTest.java | 1 - .../stress/operations/CqlIndexedRangeSlicer.java | 1 - .../cassandra/stress/operations/CqlRangeSlicer.java | 1 - .../cassandra/stress/operations/CqlReader.java | 1 - .../cassandra/stress/server/StressThread.java | 2 -- 143 files changed, 347 deletions(-) diff --git a/src/java/org/apache/cassandra/cache/KeyCacheKey.java b/src/java/org/apache/cassandra/cache/KeyCacheKey.java index 6a287e9e09..7f6523d60a 100644 --- a/src/java/org/apache/cassandra/cache/KeyCacheKey.java +++ b/src/java/org/apache/cassandra/cache/KeyCacheKey.java @@ -21,10 +21,7 @@ package org.apache.cassandra.cache; import java.nio.ByteBuffer; -import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.io.sstable.Component; import org.apache.cassandra.io.sstable.Descriptor; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.Pair; public class KeyCacheKey extends Pair implements CacheKey diff --git a/src/java/org/apache/cassandra/cache/RowCacheKey.java b/src/java/org/apache/cassandra/cache/RowCacheKey.java index 146af35a7e..9bfc40b85b 100644 --- a/src/java/org/apache/cassandra/cache/RowCacheKey.java +++ b/src/java/org/apache/cassandra/cache/RowCacheKey.java @@ -23,7 +23,6 @@ import java.nio.ByteBuffer; import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair; import org.apache.commons.lang.builder.HashCodeBuilder; diff --git a/src/java/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.java b/src/java/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.java index fb8d9e025e..95d7e13045 100644 --- a/src/java/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.java +++ b/src/java/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutor.java @@ -23,9 +23,6 @@ package org.apache.cassandra.concurrent; import java.util.concurrent.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /** * Like DebuggableThreadPoolExecutor, DebuggableScheduledThreadPoolExecutor always * logs exceptions from the tasks it is given, even if Future.get is never called elsewhere. diff --git a/src/java/org/apache/cassandra/config/Config.java b/src/java/org/apache/cassandra/config/Config.java index bc0f103feb..35f6bf9919 100644 --- a/src/java/org/apache/cassandra/config/Config.java +++ b/src/java/org/apache/cassandra/config/Config.java @@ -21,9 +21,6 @@ package org.apache.cassandra.config; */ import org.apache.cassandra.cache.ConcurrentLinkedHashCacheProvider; -import org.apache.cassandra.cache.IRowCacheProvider; - -import java.util.List; public class Config diff --git a/src/java/org/apache/cassandra/cql/CreateKeyspaceStatement.java b/src/java/org/apache/cassandra/cql/CreateKeyspaceStatement.java index 0b8fea4c1e..a63ba7dc49 100644 --- a/src/java/org/apache/cassandra/cql/CreateKeyspaceStatement.java +++ b/src/java/org/apache/cassandra/cql/CreateKeyspaceStatement.java @@ -27,8 +27,6 @@ import java.util.Map; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.locator.AbstractReplicationStrategy; -import org.apache.cassandra.locator.IEndpointSnitch; -import org.apache.cassandra.locator.TokenMetadata; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.thrift.InvalidRequestException; diff --git a/src/java/org/apache/cassandra/cql/WhereClause.java b/src/java/org/apache/cassandra/cql/WhereClause.java index 349641a334..89b238eb3e 100644 --- a/src/java/org/apache/cassandra/cql/WhereClause.java +++ b/src/java/org/apache/cassandra/cql/WhereClause.java @@ -20,7 +20,6 @@ package org.apache.cassandra.cql; * */ -import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; import java.util.ArrayList; import java.util.LinkedHashSet; diff --git a/src/java/org/apache/cassandra/cql3/CQLStatement.java b/src/java/org/apache/cassandra/cql3/CQLStatement.java index 49963ddcb6..83a65a3a96 100644 --- a/src/java/org/apache/cassandra/cql3/CQLStatement.java +++ b/src/java/org/apache/cassandra/cql3/CQLStatement.java @@ -19,17 +19,14 @@ package org.apache.cassandra.cql3; import java.nio.ByteBuffer; -import java.util.Collections; import java.util.List; -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.thrift.CqlResult; import org.apache.cassandra.thrift.InvalidRequestException; import org.apache.cassandra.thrift.SchemaDisagreementException; import org.apache.cassandra.thrift.TimedOutException; import org.apache.cassandra.thrift.UnavailableException; -import org.apache.cassandra.utils.Pair; public interface CQLStatement { diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java b/src/java/org/apache/cassandra/cql3/QueryProcessor.java index 4413d80a89..b054a5b3b4 100644 --- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java +++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java @@ -21,8 +21,6 @@ package org.apache.cassandra.cql3; import java.nio.ByteBuffer; import java.util.*; -import com.google.common.base.Predicates; -import com.google.common.collect.Maps; import org.antlr.runtime.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -34,10 +32,7 @@ import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.TypeParser; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.thrift.*; -import org.apache.cassandra.thrift.Column; -import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.SemanticVersion; public class QueryProcessor diff --git a/src/java/org/apache/cassandra/cql3/statements/CFStatement.java b/src/java/org/apache/cassandra/cql3/statements/CFStatement.java index 1ea68ece52..8d758078b0 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CFStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CFStatement.java @@ -19,7 +19,6 @@ package org.apache.cassandra.cql3.statements; import org.apache.cassandra.cql3.CFName; -import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.thrift.InvalidRequestException; diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java index 6be4e63011..4572d975f6 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java @@ -18,8 +18,6 @@ */ package org.apache.cassandra.cql3.statements; -import java.io.IOException; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java b/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java index 702ca5b16d..4eb05dfc2d 100644 --- a/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/DeleteStatement.java @@ -26,7 +26,6 @@ import java.util.List; import java.util.HashMap; import java.util.Map; -import org.apache.cassandra.auth.Permission; import org.apache.cassandra.cql3.*; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.IMutation; diff --git a/src/java/org/apache/cassandra/cql3/statements/ParsedStatement.java b/src/java/org/apache/cassandra/cql3/statements/ParsedStatement.java index 74905dc4bc..6f428b2909 100644 --- a/src/java/org/apache/cassandra/cql3/statements/ParsedStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/ParsedStatement.java @@ -18,19 +18,12 @@ */ package org.apache.cassandra.cql3.statements; -import java.nio.ByteBuffer; import java.util.Collections; import java.util.List; import org.apache.cassandra.cql3.*; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.service.ClientState; -import org.apache.cassandra.thrift.CqlResult; import org.apache.cassandra.thrift.InvalidRequestException; -import org.apache.cassandra.thrift.SchemaDisagreementException; -import org.apache.cassandra.thrift.TimedOutException; -import org.apache.cassandra.thrift.UnavailableException; -import org.apache.cassandra.utils.Pair; public abstract class ParsedStatement { diff --git a/src/java/org/apache/cassandra/cql3/statements/SchemaAlteringStatement.java b/src/java/org/apache/cassandra/cql3/statements/SchemaAlteringStatement.java index a34942db49..4fab4361c5 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SchemaAlteringStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SchemaAlteringStatement.java @@ -20,7 +20,6 @@ package org.apache.cassandra.cql3.statements; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.Collections; import java.util.List; import java.util.Map; import java.util.concurrent.Callable; diff --git a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java index e8b7c45eae..4825385ac2 100644 --- a/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/SelectStatement.java @@ -23,7 +23,6 @@ import java.nio.ByteBuffer; import java.util.*; import java.util.concurrent.TimeoutException; -import com.google.common.base.Objects; import com.google.common.collect.AbstractIterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/CollationController.java b/src/java/org/apache/cassandra/db/CollationController.java index 036614c12e..5289d1b030 100644 --- a/src/java/org/apache/cassandra/db/CollationController.java +++ b/src/java/org/apache/cassandra/db/CollationController.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.*; -import com.google.common.collect.Iterables; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java b/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java index d773efeb8f..6d7d825ef1 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java @@ -24,17 +24,14 @@ package org.apache.cassandra.db; import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import java.io.RandomAccessFile; import java.util.Collection; import org.apache.cassandra.config.Schema; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.io.IColumnSerializer; import org.apache.cassandra.io.ISerializer; -import org.apache.cassandra.io.sstable.SSTableMetadata; public class ColumnFamilySerializer implements ISerializer { diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java index 776b975c7d..165b15026c 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java @@ -30,7 +30,6 @@ import javax.management.*; import com.google.common.collect.*; -import org.apache.cassandra.db.compaction.LeveledManifest; import org.apache.cassandra.io.compress.CompressionParameters; import org.apache.cassandra.service.CacheService; import org.slf4j.Logger; @@ -47,7 +46,6 @@ import org.apache.cassandra.db.commitlog.ReplayPosition; import org.apache.cassandra.db.compaction.AbstractCompactionStrategy; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.compaction.LeveledCompactionStrategy; -import org.apache.cassandra.db.compaction.LeveledManifest; import org.apache.cassandra.db.filter.ExtendedFilter; import org.apache.cassandra.db.filter.IFilter; import org.apache.cassandra.db.filter.QueryFilter; diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java b/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java index a05c8da64c..d8243c5a12 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilyStoreMBean.java @@ -18,7 +18,6 @@ package org.apache.cassandra.db; -import java.io.IOException; import java.util.List; import java.util.Map; import java.util.concurrent.ExecutionException; diff --git a/src/java/org/apache/cassandra/db/ColumnSerializer.java b/src/java/org/apache/cassandra/db/ColumnSerializer.java index 2d97d32f6e..cd7ba3343d 100644 --- a/src/java/org/apache/cassandra/db/ColumnSerializer.java +++ b/src/java/org/apache/cassandra/db/ColumnSerializer.java @@ -29,7 +29,6 @@ import java.nio.ByteBuffer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.db.context.CounterContext; import org.apache.cassandra.io.IColumnSerializer; import org.apache.cassandra.io.util.FileDataInput; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/db/CounterColumn.java b/src/java/org/apache/cassandra/db/CounterColumn.java index 026900e2d5..7871b7cc52 100644 --- a/src/java/org/apache/cassandra/db/CounterColumn.java +++ b/src/java/org/apache/cassandra/db/CounterColumn.java @@ -23,11 +23,8 @@ import java.nio.ByteBuffer; import java.net.InetAddress; import java.security.MessageDigest; import java.util.concurrent.TimeoutException; -import java.util.Arrays; -import java.util.Map; import java.util.Collection; -import com.google.common.collect.Multimap; import org.apache.log4j.Logger; import org.apache.cassandra.config.CFMetaData; diff --git a/src/java/org/apache/cassandra/db/CounterMutation.java b/src/java/org/apache/cassandra/db/CounterMutation.java index 541dfc02a7..bd664cf695 100644 --- a/src/java/org/apache/cassandra/db/CounterMutation.java +++ b/src/java/org/apache/cassandra/db/CounterMutation.java @@ -29,7 +29,6 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.io.IVersionedSerializer; -import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.net.Message; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java b/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java index b700d377e7..01d7b50f5c 100644 --- a/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java +++ b/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java @@ -21,10 +21,6 @@ package org.apache.cassandra.db; import java.io.*; import java.util.concurrent.TimeoutException; -import java.net.InetAddress; -import java.nio.ByteBuffer; -import java.util.Collections; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,7 +29,6 @@ import org.apache.cassandra.io.util.FastByteArrayInputStream; import org.apache.cassandra.net.*; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.service.StorageProxy; -import org.apache.cassandra.thrift.ConsistencyLevel; import org.apache.cassandra.thrift.UnavailableException; public class CounterMutationVerbHandler implements IVerbHandler diff --git a/src/java/org/apache/cassandra/db/DataTracker.java b/src/java/org/apache/cassandra/db/DataTracker.java index b55a15b60d..3b1db567d2 100644 --- a/src/java/org/apache/cassandra/db/DataTracker.java +++ b/src/java/org/apache/cassandra/db/DataTracker.java @@ -20,7 +20,6 @@ package org.apache.cassandra.db; import java.io.File; -import java.io.IOException; import java.util.*; import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.atomic.AtomicLong; @@ -31,8 +30,6 @@ import com.google.common.collect.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.cache.AutoSavingCache; -import org.apache.cassandra.cache.KeyCacheKey; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.notifications.INotification; diff --git a/src/java/org/apache/cassandra/db/EchoedRow.java b/src/java/org/apache/cassandra/db/EchoedRow.java index ea518f658e..bae80473ab 100644 --- a/src/java/org/apache/cassandra/db/EchoedRow.java +++ b/src/java/org/apache/cassandra/db/EchoedRow.java @@ -26,7 +26,6 @@ import java.io.IOException; import java.security.MessageDigest; import org.apache.cassandra.db.compaction.AbstractCompactedRow; -import org.apache.cassandra.db.compaction.CompactionController; import org.apache.cassandra.io.sstable.SSTableIdentityIterator; /** diff --git a/src/java/org/apache/cassandra/db/IndexScanCommand.java b/src/java/org/apache/cassandra/db/IndexScanCommand.java index 409f69a5c8..6bce7e3738 100644 --- a/src/java/org/apache/cassandra/db/IndexScanCommand.java +++ b/src/java/org/apache/cassandra/db/IndexScanCommand.java @@ -23,14 +23,10 @@ import java.io.*; import java.util.Arrays; import org.apache.cassandra.dht.AbstractBounds; -import org.apache.cassandra.dht.Bounds; -import org.apache.cassandra.dht.Token; -import org.apache.cassandra.dht.Range; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.util.FastByteArrayInputStream; import org.apache.cassandra.net.Message; -import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.MessageProducer; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.thrift.IndexClause; diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java index 32d42feccf..81dac7c3b2 100644 --- a/src/java/org/apache/cassandra/db/Memtable.java +++ b/src/java/org/apache/cassandra/db/Memtable.java @@ -26,8 +26,6 @@ import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicLong; import com.google.common.base.Function; -import com.google.common.collect.Iterators; -import com.google.common.collect.PeekingIterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -39,7 +37,6 @@ import org.apache.cassandra.db.commitlog.ReplayPosition; import org.apache.cassandra.db.filter.AbstractColumnIterator; 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.SSTableReader; import org.apache.cassandra.io.sstable.SSTableWriter; import org.apache.cassandra.utils.FBUtilities; diff --git a/src/java/org/apache/cassandra/db/RangeSliceCommand.java b/src/java/org/apache/cassandra/db/RangeSliceCommand.java index 59317eb3c5..80dc7193fb 100644 --- a/src/java/org/apache/cassandra/db/RangeSliceCommand.java +++ b/src/java/org/apache/cassandra/db/RangeSliceCommand.java @@ -43,7 +43,6 @@ import java.util.ArrayList; import java.util.List; import org.apache.cassandra.dht.AbstractBounds; -import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.util.FastByteArrayInputStream; diff --git a/src/java/org/apache/cassandra/db/RowIteratorFactory.java b/src/java/org/apache/cassandra/db/RowIteratorFactory.java index c995c23252..34fe07a510 100644 --- a/src/java/org/apache/cassandra/db/RowIteratorFactory.java +++ b/src/java/org/apache/cassandra/db/RowIteratorFactory.java @@ -20,7 +20,6 @@ package org.apache.cassandra.db; import java.io.Closeable; import java.util.*; -import com.google.common.base.Predicate; import com.google.common.collect.AbstractIterator; import org.apache.cassandra.db.columniterator.IColumnIterator; diff --git a/src/java/org/apache/cassandra/db/Table.java b/src/java/org/apache/cassandra/db/Table.java index d39b6d13dd..f29e4142ec 100644 --- a/src/java/org/apache/cassandra/db/Table.java +++ b/src/java/org/apache/cassandra/db/Table.java @@ -18,7 +18,6 @@ package org.apache.cassandra.db; -import java.io.File; import java.io.IOError; import java.io.IOException; import java.nio.ByteBuffer; @@ -40,10 +39,7 @@ import org.apache.cassandra.config.*; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.filter.QueryPath; -import org.apache.cassandra.io.sstable.SSTableDeletingTask; import org.apache.cassandra.io.sstable.SSTableReader; -import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.io.util.MmappedSegmentedFile; import org.apache.cassandra.locator.AbstractReplicationStrategy; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/db/columniterator/IColumnIterator.java b/src/java/org/apache/cassandra/db/columniterator/IColumnIterator.java index 4aa752d82c..5f9779824d 100644 --- a/src/java/org/apache/cassandra/db/columniterator/IColumnIterator.java +++ b/src/java/org/apache/cassandra/db/columniterator/IColumnIterator.java @@ -22,8 +22,6 @@ package org.apache.cassandra.db.columniterator; import java.io.IOException; -import java.util.Iterator; - import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.IColumn; diff --git a/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java b/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java index d2c19d240a..383777f3c1 100644 --- a/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java +++ b/src/java/org/apache/cassandra/db/columniterator/SimpleSliceReader.java @@ -27,7 +27,6 @@ import java.nio.ByteBuffer; import com.google.common.collect.AbstractIterator; -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.IColumn; diff --git a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogExecutorService.java b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogExecutorService.java index 3a1af47f62..49a475d5b8 100644 --- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogExecutorService.java +++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogExecutorService.java @@ -21,12 +21,9 @@ package org.apache.cassandra.db.commitlog; */ -import java.lang.management.ManagementFactory; import java.util.List; import java.util.concurrent.AbstractExecutorService; import java.util.concurrent.TimeUnit; -import javax.management.MBeanServer; -import javax.management.ObjectName; public abstract class AbstractCommitLogExecutorService extends AbstractExecutorService implements ICommitLogExecutorService { diff --git a/src/java/org/apache/cassandra/db/commitlog/ICommitLogExecutorService.java b/src/java/org/apache/cassandra/db/commitlog/ICommitLogExecutorService.java index 647e4a714d..6cfba15cba 100644 --- a/src/java/org/apache/cassandra/db/commitlog/ICommitLogExecutorService.java +++ b/src/java/org/apache/cassandra/db/commitlog/ICommitLogExecutorService.java @@ -24,8 +24,6 @@ package org.apache.cassandra.db.commitlog; import java.util.concurrent.Callable; import java.util.concurrent.Future; -import org.apache.cassandra.concurrent.IExecutorMBean; - /** * Like ExecutorService, but customized for batch and periodic commitlog execution. */ diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java index bda321abbe..0455f959e4 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionStrategy.java @@ -19,7 +19,6 @@ package org.apache.cassandra.db.compaction; import java.util.Collection; -import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.TimeUnit; diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java b/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java index ffb19ee88f..3fa9176a6c 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionManagerMBean.java @@ -18,7 +18,6 @@ package org.apache.cassandra.db.compaction; -import java.util.HashMap; import java.util.List; import java.util.Map; diff --git a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java index 4e701bfbd7..ec1dd83129 100644 --- a/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java +++ b/src/java/org/apache/cassandra/db/compaction/LazilyCompactedRow.java @@ -24,7 +24,6 @@ package org.apache.cassandra.db.compaction; import java.io.DataOutput; import java.io.IOError; import java.io.IOException; -import java.nio.channels.ClosedByInterruptException; import java.security.MessageDigest; import java.util.Iterator; import java.util.List; diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java index 5ee5eaa5f1..2565466bc1 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionTask.java @@ -21,19 +21,12 @@ package org.apache.cassandra.db.compaction; */ -import java.io.File; import java.io.IOException; import java.util.Collection; import java.util.Set; import java.util.concurrent.CountDownLatch; -import com.google.common.collect.Iterables; - -import org.apache.commons.lang.StringUtils; - -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.Table; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.io.sstable.SSTableWriter; diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java index a4cd5ce957..4c63180238 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java @@ -31,7 +31,6 @@ import com.google.common.primitives.Ints; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.RowPosition; import org.apache.cassandra.dht.Range; diff --git a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java index 9f11f193c5..26b851ba63 100644 --- a/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java +++ b/src/java/org/apache/cassandra/db/compaction/SizeTieredCompactionStrategy.java @@ -25,7 +25,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.DataTracker; import org.apache.cassandra.io.sstable.SSTable; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.utils.Pair; diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java index cce1afe73b..279b0a9cae 100644 --- a/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java +++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java @@ -22,10 +22,8 @@ import java.util.*; import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.IFilter; -import org.apache.cassandra.db.filter.NamesQueryFilter; import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.thrift.IndexExpression; -import org.apache.cassandra.thrift.IndexOperator; public abstract class SecondaryIndexSearcher { diff --git a/src/java/org/apache/cassandra/db/marshal/AbstractCommutativeType.java b/src/java/org/apache/cassandra/db/marshal/AbstractCommutativeType.java index 358f4ebf2b..d9b2e95072 100644 --- a/src/java/org/apache/cassandra/db/marshal/AbstractCommutativeType.java +++ b/src/java/org/apache/cassandra/db/marshal/AbstractCommutativeType.java @@ -21,8 +21,6 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; -import java.sql.Types; - import org.apache.cassandra.db.Column; import org.apache.cassandra.db.context.CounterContext; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/src/java/org/apache/cassandra/dht/BootStrapper.java b/src/java/org/apache/cassandra/dht/BootStrapper.java index 74ec226861..2ea150ecb7 100644 --- a/src/java/org/apache/cassandra/dht/BootStrapper.java +++ b/src/java/org/apache/cassandra/dht/BootStrapper.java @@ -21,18 +21,13 @@ package org.apache.cassandra.dht; import java.io.IOException; import java.net.InetAddress; import java.util.*; - import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Condition; import com.google.common.base.Charsets; - import com.google.common.collect.ArrayListMultimap; - import com.google.common.collect.HashMultimap; - import com.google.common.collect.Multimap; import org.apache.cassandra.config.Schema; import org.apache.cassandra.gms.Gossiper; import org.apache.commons.lang.ArrayUtils; - import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -40,7 +35,6 @@ package org.apache.cassandra.dht; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.Table; import org.apache.cassandra.gms.FailureDetector; - import org.apache.cassandra.gms.IFailureDetector; import org.apache.cassandra.locator.AbstractReplicationStrategy; import org.apache.cassandra.locator.TokenMetadata; import org.apache.cassandra.net.IAsyncCallback; @@ -49,7 +43,6 @@ package org.apache.cassandra.dht; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.streaming.OperationType; - import org.apache.cassandra.streaming.StreamIn; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.SimpleCondition; diff --git a/src/java/org/apache/cassandra/dht/Range.java b/src/java/org/apache/cassandra/dht/Range.java index 4478214a4f..3365b9179e 100644 --- a/src/java/org/apache/cassandra/dht/Range.java +++ b/src/java/org/apache/cassandra/dht/Range.java @@ -19,15 +19,12 @@ package org.apache.cassandra.dht; import java.io.Serializable; -import java.nio.ByteBuffer; import java.util.*; -import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.commons.lang.ObjectUtils; import org.apache.cassandra.db.RowPosition; import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; /** diff --git a/src/java/org/apache/cassandra/dht/RingPosition.java b/src/java/org/apache/cassandra/dht/RingPosition.java index 1617e4fadd..ea9cd47c85 100644 --- a/src/java/org/apache/cassandra/dht/RingPosition.java +++ b/src/java/org/apache/cassandra/dht/RingPosition.java @@ -18,15 +18,6 @@ */ package org.apache.cassandra.dht; -import java.io.DataInput; -import java.io.DataOutput; -import java.io.IOException; -import java.nio.ByteBuffer; - -import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.ByteBufferUtil; - /** * Interface representing a position on the ring. * Both Token and DecoratedKey represent a position in the ring, a token being diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java index 9db156ec54..d6237a2c3a 100644 --- a/src/java/org/apache/cassandra/gms/Gossiper.java +++ b/src/java/org/apache/cassandra/gms/Gossiper.java @@ -32,17 +32,14 @@ import javax.management.MBeanServer; import javax.management.ObjectName; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.db.SystemTable; import org.apache.cassandra.io.util.FastByteArrayOutputStream; import org.apache.cassandra.net.MessageProducer; -import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.utils.FBUtilities; import org.cliffc.high_scale_lib.NonBlockingHashMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.concurrent.DebuggableScheduledThreadPoolExecutor; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessagingService; diff --git a/src/java/org/apache/cassandra/hadoop/BulkOutputFormat.java b/src/java/org/apache/cassandra/hadoop/BulkOutputFormat.java index 2bea14e8f4..9902b6b3ba 100644 --- a/src/java/org/apache/cassandra/hadoop/BulkOutputFormat.java +++ b/src/java/org/apache/cassandra/hadoop/BulkOutputFormat.java @@ -23,10 +23,7 @@ package org.apache.cassandra.hadoop; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.HashMap; import java.util.List; -import java.util.Map; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java b/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java index 74f1158b48..b247c8d0d4 100644 --- a/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java +++ b/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java @@ -30,7 +30,6 @@ import java.util.*; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.IColumn; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.dht.Range; diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java index 60f6af75b1..ef56678ca9 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java @@ -28,7 +28,6 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Random; -import java.util.Set; import java.util.SortedMap; import java.util.concurrent.Callable; import java.util.concurrent.ExecutorService; @@ -46,7 +45,6 @@ import org.apache.cassandra.thrift.TokenRange; import org.apache.commons.lang.StringUtils; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapred.*; -import org.apache.hadoop.mapreduce.*; import org.apache.hadoop.mapreduce.InputFormat; import org.apache.hadoop.mapreduce.InputSplit; import org.apache.hadoop.mapreduce.JobContext; diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java index 9c1639e75e..f6d0ed4c9e 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyRecordWriter.java @@ -33,7 +33,6 @@ import org.apache.cassandra.client.RingCache; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.thrift.*; -import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.mapreduce.RecordWriter; diff --git a/src/java/org/apache/cassandra/io/compress/DeflateCompressor.java b/src/java/org/apache/cassandra/io/compress/DeflateCompressor.java index ba5e83ab35..1b4bbafa04 100644 --- a/src/java/org/apache/cassandra/io/compress/DeflateCompressor.java +++ b/src/java/org/apache/cassandra/io/compress/DeflateCompressor.java @@ -19,7 +19,6 @@ package org.apache.cassandra.io.compress; import java.io.IOException; -import java.util.HashMap; import java.util.Map; import java.util.zip.DataFormatException; import java.util.zip.Deflater; diff --git a/src/java/org/apache/cassandra/io/compress/ICompressor.java b/src/java/org/apache/cassandra/io/compress/ICompressor.java index e423f53ba0..2e85d4f7d3 100644 --- a/src/java/org/apache/cassandra/io/compress/ICompressor.java +++ b/src/java/org/apache/cassandra/io/compress/ICompressor.java @@ -19,7 +19,6 @@ package org.apache.cassandra.io.compress; import java.io.IOException; -import java.util.Map; public interface ICompressor { diff --git a/src/java/org/apache/cassandra/io/sstable/Descriptor.java b/src/java/org/apache/cassandra/io/sstable/Descriptor.java index cf767ff2fd..ca7351e1d2 100644 --- a/src/java/org/apache/cassandra/io/sstable/Descriptor.java +++ b/src/java/org/apache/cassandra/io/sstable/Descriptor.java @@ -22,15 +22,10 @@ package org.apache.cassandra.io.sstable; import java.io.File; -import java.io.IOException; import java.util.StringTokenizer; import com.google.common.base.Objects; -import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.db.Directories; -import org.apache.cassandra.db.Table; -import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.Pair; import static org.apache.cassandra.io.sstable.Component.separator; diff --git a/src/java/org/apache/cassandra/io/sstable/IndexSummary.java b/src/java/org/apache/cassandra/io/sstable/IndexSummary.java index 99d84da993..1ecb4f0341 100644 --- a/src/java/org/apache/cassandra/io/sstable/IndexSummary.java +++ b/src/java/org/apache/cassandra/io/sstable/IndexSummary.java @@ -26,7 +26,6 @@ import java.util.List; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.db.RowPosition; /** * Two approaches to building an IndexSummary: diff --git a/src/java/org/apache/cassandra/io/sstable/SSTable.java b/src/java/org/apache/cassandra/io/sstable/SSTable.java index 31f961fae2..aed3c62bab 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTable.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTable.java @@ -20,7 +20,6 @@ package org.apache.cassandra.io.sstable; import java.io.File; -import java.io.FileFilter; import java.io.IOException; import java.util.*; diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java index 2e166b2507..79b71ae4f7 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java @@ -26,9 +26,6 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.*; -import com.google.common.base.Function; -import com.google.common.collect.Collections2; - import org.apache.cassandra.cache.KeyCacheKey; import org.apache.cassandra.concurrent.DebuggableThreadPoolExecutor; import org.apache.cassandra.config.ColumnDefinition; diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java index b869d1e2ee..9a69ba3e92 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java @@ -20,23 +20,15 @@ package org.apache.cassandra.io.sstable; import java.io.File; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.Map; import java.util.TreeMap; import java.util.concurrent.BlockingQueue; import java.util.concurrent.SynchronousQueue; -import java.util.concurrent.locks.Condition; - import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.*; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.io.compress.CompressionParameters; -import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.HeapAllocator; - -import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.SimpleCondition; /** * A SSTable writer that doesn't assume rows are in sorted order. diff --git a/src/java/org/apache/cassandra/io/util/ColumnSortedMap.java b/src/java/org/apache/cassandra/io/util/ColumnSortedMap.java index d71556c9a2..beafd80e93 100644 --- a/src/java/org/apache/cassandra/io/util/ColumnSortedMap.java +++ b/src/java/org/apache/cassandra/io/util/ColumnSortedMap.java @@ -28,7 +28,6 @@ import java.nio.ByteBuffer; import java.util.*; import java.util.Map.Entry; -import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.ColumnSerializer; import org.apache.cassandra.db.IColumn; import org.apache.cassandra.io.IColumnSerializer; diff --git a/src/java/org/apache/cassandra/locator/AbstractNetworkTopologySnitch.java b/src/java/org/apache/cassandra/locator/AbstractNetworkTopologySnitch.java index be81b82d11..c2df7e48c0 100644 --- a/src/java/org/apache/cassandra/locator/AbstractNetworkTopologySnitch.java +++ b/src/java/org/apache/cassandra/locator/AbstractNetworkTopologySnitch.java @@ -23,7 +23,6 @@ package org.apache.cassandra.locator; import java.net.InetAddress; import java.net.UnknownHostException; -import java.util.*; /** * An endpoint snitch tells Cassandra information about network topology that it can use to route diff --git a/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java index 8c85db8f54..2f0fed1b5e 100644 --- a/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java +++ b/src/java/org/apache/cassandra/locator/NetworkTopologyStrategy.java @@ -25,15 +25,12 @@ import java.net.InetAddress; import java.util.*; import java.util.Map.Entry; -import com.google.common.collect.Multimap; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.service.*; -import org.apache.cassandra.thrift.ConsistencyLevel; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; diff --git a/src/java/org/apache/cassandra/locator/SimpleSnitch.java b/src/java/org/apache/cassandra/locator/SimpleSnitch.java index c47888c200..b518d72bc4 100644 --- a/src/java/org/apache/cassandra/locator/SimpleSnitch.java +++ b/src/java/org/apache/cassandra/locator/SimpleSnitch.java @@ -19,8 +19,6 @@ package org.apache.cassandra.locator; import java.net.InetAddress; -import java.util.ArrayList; -import java.util.Collection; import java.util.List; /** diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java index 2a617f2f4a..edae8767d3 100644 --- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java +++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java @@ -23,7 +23,6 @@ package org.apache.cassandra.net; import java.io.*; import java.net.InetAddress; -import java.net.InetSocketAddress; import java.net.Socket; import org.apache.cassandra.gms.Gossiper; @@ -33,7 +32,6 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.streaming.IncomingStreamReader; import org.apache.cassandra.streaming.StreamHeader; -import org.apache.cassandra.utils.FBUtilities; public class IncomingTcpConnection extends Thread { diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java index b92b0e4f04..1a20b2f9cb 100644 --- a/src/java/org/apache/cassandra/net/MessagingService.java +++ b/src/java/org/apache/cassandra/net/MessagingService.java @@ -32,8 +32,6 @@ import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.locks.Lock; -import java.util.concurrent.locks.ReentrantLock; import javax.management.MBeanServer; import javax.management.ObjectName; diff --git a/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java b/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java index 0773f6ca95..47048b1dad 100644 --- a/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java +++ b/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java @@ -23,8 +23,6 @@ package org.apache.cassandra.notifications; import org.apache.cassandra.io.sstable.SSTableReader; -import java.util.List; - public class SSTableAddedNotification implements INotification { public SSTableReader added; diff --git a/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java b/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java index 12c086575a..26a52b529d 100644 --- a/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java +++ b/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java @@ -23,8 +23,6 @@ package org.apache.cassandra.notifications; import org.apache.cassandra.io.sstable.SSTableReader; -import java.util.List; - public class SSTableListChangedNotification implements INotification { public Iterable removed; diff --git a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java index 5c446a194f..81def72822 100644 --- a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java +++ b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java @@ -22,19 +22,14 @@ package org.apache.cassandra.service; import java.net.InetAddress; -import java.util.ArrayList; import java.util.Collection; -import java.util.List; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import org.apache.cassandra.concurrent.CreationTimeAwareFuture; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.net.Message; import org.apache.cassandra.thrift.ConsistencyLevel; import org.apache.cassandra.thrift.UnavailableException; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.SimpleCondition; public abstract class AbstractWriteResponseHandler implements IWriteResponseHandler diff --git a/src/java/org/apache/cassandra/service/AntiEntropyService.java b/src/java/org/apache/cassandra/service/AntiEntropyService.java index 5979860a80..30742b1ae3 100644 --- a/src/java/org/apache/cassandra/service/AntiEntropyService.java +++ b/src/java/org/apache/cassandra/service/AntiEntropyService.java @@ -43,7 +43,6 @@ import org.apache.cassandra.dht.RandomPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.gms.*; -import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.util.FastByteArrayInputStream; import org.apache.cassandra.io.util.FastByteArrayOutputStream; import org.apache.cassandra.net.CompactEndpointSerializationHelper; diff --git a/src/java/org/apache/cassandra/service/CacheService.java b/src/java/org/apache/cassandra/service/CacheService.java index 64381652c0..8dd6bded38 100644 --- a/src/java/org/apache/cassandra/service/CacheService.java +++ b/src/java/org/apache/cassandra/service/CacheService.java @@ -20,7 +20,6 @@ package org.apache.cassandra.service; import java.lang.management.ManagementFactory; import java.util.ArrayList; import java.util.List; -import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; @@ -30,9 +29,6 @@ import javax.management.ObjectName; import org.apache.cassandra.cache.*; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamily; -import org.apache.cassandra.db.ColumnFamilyStore; -import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.db.Table; import org.apache.cassandra.utils.FBUtilities; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/service/DatacenterReadCallback.java b/src/java/org/apache/cassandra/service/DatacenterReadCallback.java index 83225b82fe..bb1e09c8e8 100644 --- a/src/java/org/apache/cassandra/service/DatacenterReadCallback.java +++ b/src/java/org/apache/cassandra/service/DatacenterReadCallback.java @@ -26,10 +26,8 @@ import java.util.Collections; import java.util.Comparator; import java.util.List; -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ReadResponse; import org.apache.cassandra.db.Table; -import org.apache.cassandra.locator.IEndpointSnitch; import org.apache.cassandra.locator.NetworkTopologyStrategy; import org.apache.cassandra.net.Message; import org.apache.cassandra.thrift.ConsistencyLevel; diff --git a/src/java/org/apache/cassandra/service/IWriteResponseHandler.java b/src/java/org/apache/cassandra/service/IWriteResponseHandler.java index 807df5bf10..9806f7722a 100644 --- a/src/java/org/apache/cassandra/service/IWriteResponseHandler.java +++ b/src/java/org/apache/cassandra/service/IWriteResponseHandler.java @@ -22,7 +22,6 @@ package org.apache.cassandra.service; import java.util.concurrent.TimeoutException; -import org.apache.cassandra.concurrent.CreationTimeAwareFuture; import org.apache.cassandra.net.IAsyncCallback; import org.apache.cassandra.thrift.UnavailableException; diff --git a/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java b/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java index a870d5c567..72b588926c 100644 --- a/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java +++ b/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java @@ -22,13 +22,10 @@ import java.io.IOException; import java.net.InetAddress; import java.util.*; import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.TimeUnit; - import com.google.common.collect.AbstractIterator; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.RangeSliceReply; diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index 8ae8ff8471..25729eed2b 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -40,7 +40,6 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.concurrent.CreationTimeAwareFuture; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.concurrent.StageManager; import org.apache.cassandra.config.DatabaseDescriptor; @@ -48,7 +47,6 @@ import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.*; import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.dht.Bounds; -import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.RingPosition; import org.apache.cassandra.dht.Token; import org.apache.cassandra.gms.FailureDetector; diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java index afff793e94..184a9358c3 100644 --- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java +++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java @@ -20,7 +20,6 @@ package org.apache.cassandra.service; import java.io.IOException; import java.net.InetAddress; -import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.util.List; import java.util.Map; @@ -28,10 +27,7 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeoutException; import org.apache.cassandra.config.ConfigurationException; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; import org.apache.cassandra.thrift.InvalidRequestException; -import org.apache.cassandra.thrift.TokenRange; import org.apache.cassandra.thrift.UnavailableException; diff --git a/src/java/org/apache/cassandra/streaming/FileStreamTask.java b/src/java/org/apache/cassandra/streaming/FileStreamTask.java index 7c84c03968..babdc4e899 100644 --- a/src/java/org/apache/cassandra/streaming/FileStreamTask.java +++ b/src/java/org/apache/cassandra/streaming/FileStreamTask.java @@ -31,7 +31,6 @@ import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.net.Header; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.net.OutboundTcpConnection; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair; diff --git a/src/java/org/apache/cassandra/streaming/StreamIn.java b/src/java/org/apache/cassandra/streaming/StreamIn.java index 93bdc08db0..ce6f7ef4e6 100644 --- a/src/java/org/apache/cassandra/streaming/StreamIn.java +++ b/src/java/org/apache/cassandra/streaming/StreamIn.java @@ -24,11 +24,6 @@ package org.apache.cassandra.streaming; import java.io.IOException; import java.net.InetAddress; import java.util.Collection; -import java.util.Collections; -import java.util.ArrayList; -import java.util.List; - -import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.gms.Gossiper; import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/thrift/CassandraDaemon.java b/src/java/org/apache/cassandra/thrift/CassandraDaemon.java index 52473a6287..7153c08e15 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/thrift/CassandraDaemon.java @@ -23,7 +23,6 @@ import java.net.InetSocketAddress; import java.util.Arrays; import java.util.List; import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.TimeUnit; diff --git a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java index 81377f75e4..d6ba012895 100644 --- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java +++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java @@ -21,7 +21,6 @@ package org.apache.cassandra.thrift; import java.net.SocketTimeoutException; import java.util.concurrent.ExecutorService; -import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicInteger; import org.slf4j.Logger; diff --git a/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java b/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java index e139190ef9..08eea5af19 100644 --- a/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java +++ b/src/java/org/apache/cassandra/thrift/TCustomServerSocket.java @@ -30,9 +30,7 @@ import java.net.SocketException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.thrift.transport.TServerSocket; import org.apache.thrift.transport.TServerTransport; -import org.apache.thrift.transport.TSocket; import org.apache.thrift.transport.TTransportException; /** diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java index b1a0560888..47936e9674 100644 --- a/src/java/org/apache/cassandra/tools/BulkLoader.java +++ b/src/java/org/apache/cassandra/tools/BulkLoader.java @@ -24,17 +24,13 @@ import java.net.InetAddress; import java.net.UnknownHostException; import java.util.*; -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.SSTableLoader; import org.apache.cassandra.streaming.PendingFile; import org.apache.cassandra.thrift.*; -import org.apache.cassandra.utils.FBUtilities; - import org.apache.commons.cli.*; -import org.apache.thrift.TException; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TProtocol; import org.apache.thrift.transport.TFramedTransport; diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java index 84618be212..46b369bb85 100644 --- a/src/java/org/apache/cassandra/tools/NodeCmd.java +++ b/src/java/org/apache/cassandra/tools/NodeCmd.java @@ -37,9 +37,7 @@ import org.apache.commons.cli.*; import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutorMBean; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.db.ColumnFamilyStoreMBean; -import org.apache.cassandra.db.compaction.CompactionInfo; import org.apache.cassandra.db.compaction.CompactionManagerMBean; -import org.apache.cassandra.dht.Token; import org.apache.cassandra.net.MessagingServiceMBean; import org.apache.cassandra.thrift.InvalidRequestException; import org.apache.cassandra.utils.EstimatedHistogram; diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index b0d9019493..cdfc4d1143 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -45,7 +45,6 @@ import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.db.ColumnFamilyStoreMBean; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.compaction.CompactionManagerMBean; -import org.apache.cassandra.dht.Token; import org.apache.cassandra.gms.FailureDetector; import org.apache.cassandra.gms.FailureDetectorMBean; import org.apache.cassandra.locator.EndpointSnitchInfoMBean; diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java b/src/java/org/apache/cassandra/utils/FBUtilities.java index 91d2c1be48..4f13c80b60 100644 --- a/src/java/org/apache/cassandra/utils/FBUtilities.java +++ b/src/java/org/apache/cassandra/utils/FBUtilities.java @@ -33,12 +33,8 @@ import java.util.concurrent.ExecutionException; import java.util.concurrent.Future; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicLong; - import com.google.common.base.Joiner; import com.google.common.collect.AbstractIterator; -import com.google.common.primitives.Ints; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/utils/LegacyBloomFilter.java b/src/java/org/apache/cassandra/utils/LegacyBloomFilter.java index cc670ddc46..0620d82203 100644 --- a/src/java/org/apache/cassandra/utils/LegacyBloomFilter.java +++ b/src/java/org/apache/cassandra/utils/LegacyBloomFilter.java @@ -21,7 +21,6 @@ package org.apache.cassandra.utils; import java.nio.ByteBuffer; import java.util.BitSet; -import org.apache.cassandra.io.IVersionedSerializer; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/src/java/org/apache/cassandra/utils/LegacyBloomFilterSerializer.java b/src/java/org/apache/cassandra/utils/LegacyBloomFilterSerializer.java index 310e73593e..21e82676b3 100644 --- a/src/java/org/apache/cassandra/utils/LegacyBloomFilterSerializer.java +++ b/src/java/org/apache/cassandra/utils/LegacyBloomFilterSerializer.java @@ -24,8 +24,6 @@ package org.apache.cassandra.utils; import java.io.*; import java.util.BitSet; -import org.apache.cassandra.io.IVersionedSerializer; - public class LegacyBloomFilterSerializer { public void serialize(LegacyBloomFilter bf, DataOutput dos) diff --git a/src/java/org/apache/cassandra/utils/SlabAllocator.java b/src/java/org/apache/cassandra/utils/SlabAllocator.java index b6ca040224..6e477fe627 100644 --- a/src/java/org/apache/cassandra/utils/SlabAllocator.java +++ b/src/java/org/apache/cassandra/utils/SlabAllocator.java @@ -20,15 +20,10 @@ package org.apache.cassandra.utils; import java.nio.ByteBuffer; -import java.util.Collection; -import java.util.Collections; -import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.atomic.AtomicReference; import com.google.common.base.Preconditions; -import com.google.common.collect.Iterables; -import com.google.common.collect.MapMaker; import org.slf4j.Logger; import org.slf4j.LoggerFactory; diff --git a/test/long/org/apache/cassandra/db/compaction/LongCompactionSpeedTest.java b/test/long/org/apache/cassandra/db/compaction/LongCompactionSpeedTest.java index ee65d5a0d1..cc305cec8b 100644 --- a/test/long/org/apache/cassandra/db/compaction/LongCompactionSpeedTest.java +++ b/test/long/org/apache/cassandra/db/compaction/LongCompactionSpeedTest.java @@ -28,8 +28,6 @@ import org.apache.cassandra.db.*; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.io.sstable.SSTableUtils; -import static junit.framework.Assert.assertEquals; - public class LongCompactionSpeedTest extends CleanupHelper { public static final String TABLE1 = "Keyspace1"; diff --git a/test/long/org/apache/cassandra/utils/LongBloomFilterTest.java b/test/long/org/apache/cassandra/utils/LongBloomFilterTest.java index b88f74f0dc..e5a9e22824 100644 --- a/test/long/org/apache/cassandra/utils/LongBloomFilterTest.java +++ b/test/long/org/apache/cassandra/utils/LongBloomFilterTest.java @@ -18,7 +18,6 @@ */ package org.apache.cassandra.utils; -import java.io.IOException; import java.util.Random; import org.junit.Test; diff --git a/test/long/org/apache/cassandra/utils/LongLegacyBloomFilterTest.java b/test/long/org/apache/cassandra/utils/LongLegacyBloomFilterTest.java index ee7ee1d04b..60d1bc34b5 100644 --- a/test/long/org/apache/cassandra/utils/LongLegacyBloomFilterTest.java +++ b/test/long/org/apache/cassandra/utils/LongLegacyBloomFilterTest.java @@ -18,7 +18,6 @@ */ package org.apache.cassandra.utils; -import java.io.IOException; import java.util.Random; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java index 124962f1c0..5d8ca46f7f 100644 --- a/test/unit/org/apache/cassandra/SchemaLoader.java +++ b/test/unit/org/apache/cassandra/SchemaLoader.java @@ -18,7 +18,6 @@ package org.apache.cassandra; -import java.io.IOException; import java.nio.ByteBuffer; import java.util.*; diff --git a/test/unit/org/apache/cassandra/cache/CacheProviderTest.java b/test/unit/org/apache/cassandra/cache/CacheProviderTest.java index fa8a4eacf1..5ff1411109 100644 --- a/test/unit/org/apache/cassandra/cache/CacheProviderTest.java +++ b/test/unit/org/apache/cassandra/cache/CacheProviderTest.java @@ -23,14 +23,10 @@ package org.apache.cassandra.cache; import java.util.ArrayList; import java.util.List; -import java.util.Map; - import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.db.ColumnFamily; -import org.apache.cassandra.db.IColumn; - import static org.apache.cassandra.Util.column; import static org.junit.Assert.*; diff --git a/test/unit/org/apache/cassandra/cli/CliTest.java b/test/unit/org/apache/cassandra/cli/CliTest.java index b87c56a498..4490cf5df1 100644 --- a/test/unit/org/apache/cassandra/cli/CliTest.java +++ b/test/unit/org/apache/cassandra/cli/CliTest.java @@ -23,7 +23,6 @@ import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.service.EmbeddedCassandraService; import org.apache.cassandra.thrift.*; import org.apache.thrift.TException; -import org.apache.thrift.transport.TTransportException; import org.junit.Test; import java.io.ByteArrayOutputStream; diff --git a/test/unit/org/apache/cassandra/db/CleanupTest.java b/test/unit/org/apache/cassandra/db/CleanupTest.java index b1b34ee37f..c9a48ea4ee 100644 --- a/test/unit/org/apache/cassandra/db/CleanupTest.java +++ b/test/unit/org/apache/cassandra/db/CleanupTest.java @@ -19,8 +19,6 @@ package org.apache.cassandra.db; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; - import java.io.IOException; import java.net.InetAddress; import java.nio.ByteBuffer; @@ -40,7 +38,6 @@ import org.apache.cassandra.db.index.SecondaryIndex; import org.apache.cassandra.dht.BytesToken; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.locator.TokenMetadata; import org.apache.cassandra.service.StorageService; diff --git a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java index 85269b7cb7..e312c4040c 100644 --- a/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java +++ b/test/unit/org/apache/cassandra/db/ColumnFamilyStoreTest.java @@ -30,11 +30,9 @@ import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.Util; import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.config.ConfigurationException; -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.filter.*; import org.apache.cassandra.db.index.SecondaryIndex; -import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.db.marshal.LexicalUUIDType; import org.apache.cassandra.dht.*; import org.apache.cassandra.io.sstable.Component; diff --git a/test/unit/org/apache/cassandra/db/CommitLogTest.java b/test/unit/org/apache/cassandra/db/CommitLogTest.java index 7f8bd832b0..4d7a344f45 100644 --- a/test/unit/org/apache/cassandra/db/CommitLogTest.java +++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java @@ -28,7 +28,6 @@ import org.junit.Test; import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.db.commitlog.CommitLog; -import org.apache.cassandra.db.commitlog.CommitLogSegment; import org.apache.cassandra.db.filter.QueryPath; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; diff --git a/test/unit/org/apache/cassandra/db/CounterColumnTest.java b/test/unit/org/apache/cassandra/db/CounterColumnTest.java index bfd84cf699..5eda279cbe 100644 --- a/test/unit/org/apache/cassandra/db/CounterColumnTest.java +++ b/test/unit/org/apache/cassandra/db/CounterColumnTest.java @@ -20,31 +20,24 @@ package org.apache.cassandra.db; import java.security.MessageDigest; -import static org.junit.Assert.*; - import java.io.ByteArrayInputStream; import java.io.DataInputStream; import java.io.IOException; -import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.util.Arrays; -import org.apache.commons.lang.ArrayUtils; - import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.db.context.CounterContext; import static org.apache.cassandra.db.context.CounterContext.ContextState; -import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.io.IColumnSerializer; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.utils.Allocator; import org.apache.cassandra.utils.HeapAllocator; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.NodeId; public class CounterColumnTest extends SchemaLoader diff --git a/test/unit/org/apache/cassandra/db/DirectoriesTest.java b/test/unit/org/apache/cassandra/db/DirectoriesTest.java index cf8c450942..3668735cec 100644 --- a/test/unit/org/apache/cassandra/db/DirectoriesTest.java +++ b/test/unit/org/apache/cassandra/db/DirectoriesTest.java @@ -29,7 +29,6 @@ import static org.junit.Assert.assertEquals; import org.apache.cassandra.db.compaction.LeveledManifest; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.sstable.*; -import org.apache.cassandra.utils.Pair; public class DirectoriesTest { diff --git a/test/unit/org/apache/cassandra/db/KeyCacheTest.java b/test/unit/org/apache/cassandra/db/KeyCacheTest.java index 7af70940dd..a47e2ea26c 100644 --- a/test/unit/org/apache/cassandra/db/KeyCacheTest.java +++ b/test/unit/org/apache/cassandra/db/KeyCacheTest.java @@ -37,10 +37,7 @@ import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.Util; import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.db.compaction.CompactionManager; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.Pair; - import static junit.framework.Assert.assertEquals; public class KeyCacheTest extends CleanupHelper diff --git a/test/unit/org/apache/cassandra/db/KeyCollisionTest.java b/test/unit/org/apache/cassandra/db/KeyCollisionTest.java index 8284371436..9c5aadf932 100644 --- a/test/unit/org/apache/cassandra/db/KeyCollisionTest.java +++ b/test/unit/org/apache/cassandra/db/KeyCollisionTest.java @@ -19,10 +19,8 @@ package org.apache.cassandra.db; import java.io.IOException; -import java.math.BigDecimal; import java.math.BigInteger; import java.nio.ByteBuffer; -import java.nio.charset.CharacterCodingException; import java.util.*; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/MultitableTest.java b/test/unit/org/apache/cassandra/db/MultitableTest.java index f7967b873f..5636dc3fbc 100644 --- a/test/unit/org/apache/cassandra/db/MultitableTest.java +++ b/test/unit/org/apache/cassandra/db/MultitableTest.java @@ -29,7 +29,6 @@ import org.junit.Test; import static org.apache.cassandra.db.TableTest.assertColumns; import org.apache.cassandra.CleanupHelper; -import org.apache.cassandra.Util; import static org.apache.cassandra.Util.column; public class MultitableTest extends CleanupHelper diff --git a/test/unit/org/apache/cassandra/db/NameSortTest.java b/test/unit/org/apache/cassandra/db/NameSortTest.java index 823754cbd0..6f2110ae9f 100644 --- a/test/unit/org/apache/cassandra/db/NameSortTest.java +++ b/test/unit/org/apache/cassandra/db/NameSortTest.java @@ -20,8 +20,6 @@ package org.apache.cassandra.db; import static junit.framework.Assert.assertEquals; import static org.apache.cassandra.Util.addMutation; -import static org.apache.cassandra.Util.column; - import java.io.IOException; import java.nio.ByteBuffer; import java.util.Collection; @@ -29,7 +27,6 @@ import java.util.concurrent.ExecutionException; import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.Util; -import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java b/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java index 0a5054431a..af9f7ecb7f 100644 --- a/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManager2Test.java @@ -22,8 +22,6 @@ package org.apache.cassandra.db; import java.io.IOException; -import java.nio.ByteBuffer; - import org.junit.Test; import org.slf4j.Logger; @@ -31,7 +29,6 @@ import org.slf4j.LoggerFactory; import static org.apache.cassandra.Util.column; import org.apache.cassandra.CleanupHelper; -import org.apache.cassandra.Util; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java index e9b0df7fb0..4a43ecadef 100644 --- a/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTest.java @@ -28,7 +28,6 @@ import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.Util; import static org.apache.cassandra.Util.column; import static org.apache.cassandra.db.TableTest.assertColumns; diff --git a/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java b/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java index 00964cb8e1..9161ebab52 100644 --- a/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java +++ b/test/unit/org/apache/cassandra/db/RecoveryManagerTruncateTest.java @@ -23,7 +23,6 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.concurrent.ExecutionException; import org.apache.cassandra.CleanupHelper; diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java index 3c27d12e4b..3c086b0dc8 100644 --- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java +++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyTest.java @@ -19,7 +19,6 @@ package org.apache.cassandra.db; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.concurrent.ExecutionException; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java index fbf6690c43..d13b5e633b 100644 --- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java +++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush1Test.java @@ -19,7 +19,6 @@ package org.apache.cassandra.db; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.concurrent.ExecutionException; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java index 3bcd242369..3f6261df99 100644 --- a/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java +++ b/test/unit/org/apache/cassandra/db/RemoveColumnFamilyWithFlush2Test.java @@ -19,7 +19,6 @@ package org.apache.cassandra.db; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.concurrent.ExecutionException; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/RemoveColumnTest.java b/test/unit/org/apache/cassandra/db/RemoveColumnTest.java index d65a99967a..cfd8e9cd53 100644 --- a/test/unit/org/apache/cassandra/db/RemoveColumnTest.java +++ b/test/unit/org/apache/cassandra/db/RemoveColumnTest.java @@ -19,7 +19,6 @@ package org.apache.cassandra.db; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.concurrent.ExecutionException; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java b/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java index 28e4aef1f7..499653ca4a 100644 --- a/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java +++ b/test/unit/org/apache/cassandra/db/RemoveSubColumnTest.java @@ -19,7 +19,6 @@ package org.apache.cassandra.db; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.concurrent.ExecutionException; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java b/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java index 6b4abe472c..a908783bac 100644 --- a/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java +++ b/test/unit/org/apache/cassandra/db/RemoveSuperColumnTest.java @@ -19,7 +19,6 @@ package org.apache.cassandra.db; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.concurrent.ExecutionException; import java.util.Collection; diff --git a/test/unit/org/apache/cassandra/db/RowIterationTest.java b/test/unit/org/apache/cassandra/db/RowIterationTest.java index 5dda735cb0..1e3aecea35 100644 --- a/test/unit/org/apache/cassandra/db/RowIterationTest.java +++ b/test/unit/org/apache/cassandra/db/RowIterationTest.java @@ -22,8 +22,6 @@ import java.io.IOException; import java.net.InetAddress; import java.nio.ByteBuffer; import java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; -import java.util.ArrayList; import java.util.Set; import java.util.HashSet; @@ -31,7 +29,6 @@ import org.apache.cassandra.Util; import org.junit.Test; -import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.utils.FBUtilities; diff --git a/test/unit/org/apache/cassandra/db/RowTest.java b/test/unit/org/apache/cassandra/db/RowTest.java index 71c974b0f1..b3bc516a36 100644 --- a/test/unit/org/apache/cassandra/db/RowTest.java +++ b/test/unit/org/apache/cassandra/db/RowTest.java @@ -18,7 +18,6 @@ */ package org.apache.cassandra.db; -import java.nio.ByteBuffer; import java.util.Arrays; import org.apache.cassandra.SchemaLoader; diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java index e7529d74e5..f0b379d918 100644 --- a/test/unit/org/apache/cassandra/db/ScrubTest.java +++ b/test/unit/org/apache/cassandra/db/ScrubTest.java @@ -31,7 +31,6 @@ import org.junit.Test; import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.Util; import org.apache.cassandra.config.ConfigurationException; -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.io.util.FileUtils; diff --git a/test/unit/org/apache/cassandra/db/SuperColumnTest.java b/test/unit/org/apache/cassandra/db/SuperColumnTest.java index f1d1ba6ac3..6537b2642b 100644 --- a/test/unit/org/apache/cassandra/db/SuperColumnTest.java +++ b/test/unit/org/apache/cassandra/db/SuperColumnTest.java @@ -17,19 +17,15 @@ */ package org.apache.cassandra.db; -import java.nio.ByteBuffer; - import org.junit.Test; import static junit.framework.Assert.assertNotNull; import static junit.framework.Assert.assertNull; import static org.apache.cassandra.Util.getBytes; -import static org.apache.cassandra.Util.concatByteArrays; import org.apache.cassandra.db.context.CounterContext; import static org.apache.cassandra.db.context.CounterContext.ContextState; import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.NodeId; public class SuperColumnTest diff --git a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java index ae9ffbf8bb..b976065d9e 100644 --- a/test/unit/org/apache/cassandra/db/context/CounterContextTest.java +++ b/test/unit/org/apache/cassandra/db/context/CounterContextTest.java @@ -22,8 +22,6 @@ package org.apache.cassandra.db.context; import static org.junit.Assert.*; -import java.net.InetAddress; -import java.net.UnknownHostException; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; diff --git a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java index 80efe00c1e..c52efb9148 100644 --- a/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/CompositeTypeTest.java @@ -31,7 +31,6 @@ import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.Util; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.utils.*; diff --git a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java index 022b2a0a78..45b243d32a 100644 --- a/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/DynamicCompositeTypeTest.java @@ -30,7 +30,6 @@ import static org.junit.Assert.fail; import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.Util; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.columniterator.IdentityQueryFilter; import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.utils.*; diff --git a/test/unit/org/apache/cassandra/db/marshal/TypeParserTest.java b/test/unit/org/apache/cassandra/db/marshal/TypeParserTest.java index ff60676532..dc7037a72b 100644 --- a/test/unit/org/apache/cassandra/db/marshal/TypeParserTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/TypeParserTest.java @@ -18,23 +18,10 @@ */ package org.apache.cassandra.db.marshal; -import java.nio.ByteBuffer; -import java.util.Iterator; -import java.util.HashMap; -import java.util.Map; -import java.util.UUID; - import org.junit.Test; import static org.junit.Assert.fail; -import org.apache.cassandra.CleanupHelper; -import org.apache.cassandra.Util; import org.apache.cassandra.config.ConfigurationException; -import org.apache.cassandra.db.*; -import org.apache.cassandra.db.columniterator.IdentityQueryFilter; -import org.apache.cassandra.db.filter.QueryFilter; -import org.apache.cassandra.db.filter.QueryPath; -import org.apache.cassandra.utils.*; public class TypeParserTest { diff --git a/test/unit/org/apache/cassandra/dht/ByteOrderedPartitionerTest.java b/test/unit/org/apache/cassandra/dht/ByteOrderedPartitionerTest.java index 93a4b24a2e..31a1af3620 100644 --- a/test/unit/org/apache/cassandra/dht/ByteOrderedPartitionerTest.java +++ b/test/unit/org/apache/cassandra/dht/ByteOrderedPartitionerTest.java @@ -18,10 +18,6 @@ */ package org.apache.cassandra.dht; -import org.junit.Test; - -import org.apache.cassandra.utils.FBUtilities; - public class ByteOrderedPartitionerTest extends PartitionerTestCase { public void initPartitioner() diff --git a/test/unit/org/apache/cassandra/dht/CollatingOrderPreservingPartitionerTest.java b/test/unit/org/apache/cassandra/dht/CollatingOrderPreservingPartitionerTest.java index 1121bc945d..23145303e2 100644 --- a/test/unit/org/apache/cassandra/dht/CollatingOrderPreservingPartitionerTest.java +++ b/test/unit/org/apache/cassandra/dht/CollatingOrderPreservingPartitionerTest.java @@ -18,12 +18,8 @@ */ package org.apache.cassandra.dht; -import java.nio.ByteBuffer; - import org.junit.Test; -import org.apache.cassandra.utils.FBUtilities; - public class CollatingOrderPreservingPartitionerTest extends PartitionerTestCase { public void initPartitioner() diff --git a/test/unit/org/apache/cassandra/dht/OrderPreservingPartitionerTest.java b/test/unit/org/apache/cassandra/dht/OrderPreservingPartitionerTest.java index c6742bd8b6..6b3aed20c9 100644 --- a/test/unit/org/apache/cassandra/dht/OrderPreservingPartitionerTest.java +++ b/test/unit/org/apache/cassandra/dht/OrderPreservingPartitionerTest.java @@ -18,13 +18,8 @@ */ package org.apache.cassandra.dht; -import java.math.BigInteger; - -import org.junit.Before; import org.junit.Test; -import org.apache.cassandra.utils.FBUtilities; - public class OrderPreservingPartitionerTest extends PartitionerTestCase { public void initPartitioner() { diff --git a/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java b/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java index 13b052d3bc..623b26c335 100644 --- a/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java +++ b/test/unit/org/apache/cassandra/dht/PartitionerTestCase.java @@ -21,13 +21,9 @@ package org.apache.cassandra.dht; import java.nio.ByteBuffer; import java.util.Random; -import static org.junit.Assert.assertEquals; - import org.junit.Before; import org.junit.Test; -import org.apache.cassandra.db.DecoratedKey; - public abstract class PartitionerTestCase { protected IPartitioner partitioner; diff --git a/test/unit/org/apache/cassandra/dht/RandomPartitionerTest.java b/test/unit/org/apache/cassandra/dht/RandomPartitionerTest.java index be5e3659f5..90501ab570 100644 --- a/test/unit/org/apache/cassandra/dht/RandomPartitionerTest.java +++ b/test/unit/org/apache/cassandra/dht/RandomPartitionerTest.java @@ -20,12 +20,6 @@ package org.apache.cassandra.dht; * */ - -import static org.junit.Assert.assertEquals; - -import org.apache.cassandra.db.DecoratedKey; -import org.junit.Test; - public class RandomPartitionerTest extends PartitionerTestCase { public void initPartitioner() diff --git a/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java b/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java index 98b806c1ec..525ecdee2f 100644 --- a/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java @@ -21,12 +21,8 @@ package org.apache.cassandra.io.sstable; */ -import java.io.File; - import org.junit.Test; -import org.apache.cassandra.db.Directories; - public class DescriptorTest { @Test diff --git a/test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java b/test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java index 96e4c9a49c..32cf447125 100644 --- a/test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java @@ -20,8 +20,6 @@ package org.apache.cassandra.io.sstable; import java.util.ArrayList; import java.util.List; -import java.nio.ByteBuffer; - import org.junit.Test; import org.apache.cassandra.db.marshal.AbstractType; diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java index e7ea9d952a..fede05338c 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableReaderTest.java @@ -27,8 +27,6 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Map; -import java.util.Set; import java.util.concurrent.ExecutionException; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java index 9416432572..667e3f6c8d 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableSimpleWriterTest.java @@ -21,7 +21,6 @@ package org.apache.cassandra.io.sstable; import java.io.File; import org.apache.cassandra.dht.IPartitioner; -import org.apache.cassandra.dht.RandomPartitioner; import org.junit.Test; import org.apache.cassandra.CleanupHelper; diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableTest.java b/test/unit/org/apache/cassandra/io/sstable/SSTableTest.java index 4964aa8dbd..34f322640f 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableTest.java @@ -23,7 +23,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.*; -import com.google.common.collect.Sets; import org.junit.Test; import org.apache.cassandra.CleanupHelper; diff --git a/test/unit/org/apache/cassandra/locator/TokenMetadataTest.java b/test/unit/org/apache/cassandra/locator/TokenMetadataTest.java index 0a92c5354d..9f93b2ff24 100644 --- a/test/unit/org/apache/cassandra/locator/TokenMetadataTest.java +++ b/test/unit/org/apache/cassandra/locator/TokenMetadataTest.java @@ -20,15 +20,12 @@ package org.apache.cassandra.locator; import java.net.InetAddress; import java.util.ArrayList; -import java.util.List; - import com.google.common.collect.Iterators; import org.junit.BeforeClass; import org.junit.Test; import static org.junit.Assert.assertEquals; -import org.apache.cassandra.CleanupHelper; import static org.apache.cassandra.Util.token; import org.apache.cassandra.dht.Token; diff --git a/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java b/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java index 63cc4d7262..9a9e459ef1 100644 --- a/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java +++ b/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java @@ -45,7 +45,6 @@ import org.apache.cassandra.utils.MerkleTree; import static org.apache.cassandra.service.AntiEntropyService.*; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.fail; import org.apache.cassandra.utils.ByteBufferUtil; public abstract class AntiEntropyServiceTestAbstract extends CleanupHelper diff --git a/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java b/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java index 255fe13348..701dee528a 100644 --- a/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java +++ b/test/unit/org/apache/cassandra/service/EmbeddedCassandraServiceTest.java @@ -22,15 +22,12 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; -import com.google.common.base.Charsets; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.CleanupHelper; -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.thrift.*; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.thrift.TException; diff --git a/test/unit/org/apache/cassandra/service/StorageProxyTest.java b/test/unit/org/apache/cassandra/service/StorageProxyTest.java index 1c89cfbd75..193c258190 100644 --- a/test/unit/org/apache/cassandra/service/StorageProxyTest.java +++ b/test/unit/org/apache/cassandra/service/StorageProxyTest.java @@ -29,7 +29,6 @@ import org.apache.cassandra.CleanupHelper; import static org.apache.cassandra.Util.token; import static org.apache.cassandra.Util.rp; -import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.RowPosition; import org.apache.cassandra.dht.AbstractBounds; import org.apache.cassandra.dht.Bounds; @@ -40,8 +39,6 @@ import org.apache.cassandra.dht.IncludingExcludingBounds; import org.apache.cassandra.locator.TokenMetadata; import org.apache.cassandra.utils.ByteBufferUtil; -import java.util.Arrays; - public class StorageProxyTest extends CleanupHelper { private static Range range(RowPosition left, RowPosition right) diff --git a/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java b/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java index a8d169c312..eb7dc37e44 100644 --- a/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java +++ b/test/unit/org/apache/cassandra/service/StorageServiceClientTest.java @@ -23,7 +23,6 @@ import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.config.DatabaseDescriptor; import org.junit.Test; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; import java.io.File; diff --git a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java index 3c9a93b630..5d44ffed25 100644 --- a/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java +++ b/test/unit/org/apache/cassandra/service/StorageServiceServerTest.java @@ -32,7 +32,6 @@ import org.apache.cassandra.CleanupHelper; import org.apache.cassandra.config.DatabaseDescriptor; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; public class StorageServiceServerTest diff --git a/test/unit/org/apache/cassandra/streaming/SerializationsTest.java b/test/unit/org/apache/cassandra/streaming/SerializationsTest.java index 0701f5cc49..d5494570f8 100644 --- a/test/unit/org/apache/cassandra/streaming/SerializationsTest.java +++ b/test/unit/org/apache/cassandra/streaming/SerializationsTest.java @@ -32,19 +32,16 @@ import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.SSTable; import org.apache.cassandra.io.sstable.SSTableReader; -import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessageSerializer; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; -import org.junit.Ignore; import org.junit.Test; import java.io.DataInputStream; import java.io.DataOutputStream; import java.io.File; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.*; public class SerializationsTest extends AbstractSerializationsTester diff --git a/test/unit/org/apache/cassandra/streaming/StreamUtil.java b/test/unit/org/apache/cassandra/streaming/StreamUtil.java index dc942e2f67..2210a287e5 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamUtil.java +++ b/test/unit/org/apache/cassandra/streaming/StreamUtil.java @@ -25,7 +25,6 @@ import java.net.InetAddress; import org.apache.cassandra.net.Message; import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.service.StorageService; public class StreamUtil { diff --git a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java index 50d62055a0..a0925118c8 100644 --- a/test/unit/org/apache/cassandra/tools/SSTableImportTest.java +++ b/test/unit/org/apache/cassandra/tools/SSTableImportTest.java @@ -42,8 +42,6 @@ import org.apache.cassandra.utils.ByteBufferUtil; import static org.apache.cassandra.utils.ByteBufferUtil.hexToBytes; import static org.apache.cassandra.io.sstable.SSTableUtils.tempSSTableFile; -import static org.junit.Assert.assertEquals; - import org.apache.cassandra.Util; import org.json.simple.parser.ParseException; diff --git a/test/unit/org/apache/cassandra/utils/ByteBufferUtilTest.java b/test/unit/org/apache/cassandra/utils/ByteBufferUtilTest.java index 421e86f699..172cdb1dce 100644 --- a/test/unit/org/apache/cassandra/utils/ByteBufferUtilTest.java +++ b/test/unit/org/apache/cassandra/utils/ByteBufferUtilTest.java @@ -30,7 +30,6 @@ import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; import java.util.Arrays; -import com.google.common.base.Charsets; import org.junit.Test; public class ByteBufferUtilTest diff --git a/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java b/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java index 31b1075b49..e91cbd1666 100644 --- a/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java +++ b/test/unit/org/apache/cassandra/utils/FBUtilitiesTest.java @@ -18,14 +18,11 @@ package org.apache.cassandra.utils; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; import java.io.IOException; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; -import java.util.Arrays; - import com.google.common.base.Charsets; import com.google.common.primitives.Ints; import org.junit.Test; diff --git a/test/unit/org/apache/cassandra/utils/FilterTestHelper.java b/test/unit/org/apache/cassandra/utils/FilterTestHelper.java index 34a7ad87e4..85294f6532 100644 --- a/test/unit/org/apache/cassandra/utils/FilterTestHelper.java +++ b/test/unit/org/apache/cassandra/utils/FilterTestHelper.java @@ -18,16 +18,7 @@ */ package org.apache.cassandra.utils; -import java.io.ByteArrayInputStream; -import java.io.DataInputStream; -import java.io.IOException; import java.nio.ByteBuffer; -import java.util.HashSet; -import java.util.Iterator; -import java.util.Set; - -import org.apache.cassandra.io.util.DataOutputBuffer; -import org.junit.Test; public class FilterTestHelper { diff --git a/test/unit/org/apache/cassandra/utils/IntervalTest.java b/test/unit/org/apache/cassandra/utils/IntervalTest.java index bce4e37bb8..1141dd9098 100644 --- a/test/unit/org/apache/cassandra/utils/IntervalTest.java +++ b/test/unit/org/apache/cassandra/utils/IntervalTest.java @@ -21,7 +21,6 @@ package org.apache.cassandra.utils; */ -import junit.framework.Assert; import junit.framework.TestCase; import org.apache.cassandra.utils.IntervalTree.Interval; import org.junit.Test; diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/CqlIndexedRangeSlicer.java b/tools/stress/src/org/apache/cassandra/stress/operations/CqlIndexedRangeSlicer.java index 8482d78ad2..978c1c442a 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/CqlIndexedRangeSlicer.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/CqlIndexedRangeSlicer.java @@ -31,7 +31,6 @@ import org.apache.cassandra.stress.util.Operation; import org.apache.cassandra.thrift.Cassandra; import org.apache.cassandra.thrift.Compression; import org.apache.cassandra.thrift.CqlResult; -import org.apache.cassandra.thrift.CqlResultType; import org.apache.cassandra.thrift.CqlRow; import org.apache.cassandra.utils.ByteBufferUtil; diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/CqlRangeSlicer.java b/tools/stress/src/org/apache/cassandra/stress/operations/CqlRangeSlicer.java index f49c51783e..e57a9ac87c 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/CqlRangeSlicer.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/CqlRangeSlicer.java @@ -30,7 +30,6 @@ import org.apache.cassandra.stress.util.Operation; import org.apache.cassandra.thrift.Cassandra; import org.apache.cassandra.thrift.Compression; import org.apache.cassandra.thrift.CqlResult; -import org.apache.cassandra.thrift.CqlResultType; public class CqlRangeSlicer extends Operation { diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/CqlReader.java b/tools/stress/src/org/apache/cassandra/stress/operations/CqlReader.java index 686c394e34..93a5c7992b 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/CqlReader.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/CqlReader.java @@ -30,7 +30,6 @@ import org.apache.cassandra.stress.util.Operation; import org.apache.cassandra.thrift.Cassandra; import org.apache.cassandra.thrift.Compression; import org.apache.cassandra.thrift.CqlResult; -import org.apache.cassandra.thrift.CqlResultType; public class CqlReader extends Operation { diff --git a/tools/stress/src/org/apache/cassandra/stress/server/StressThread.java b/tools/stress/src/org/apache/cassandra/stress/server/StressThread.java index 3d6fb0deba..158a09f976 100644 --- a/tools/stress/src/org/apache/cassandra/stress/server/StressThread.java +++ b/tools/stress/src/org/apache/cassandra/stress/server/StressThread.java @@ -24,8 +24,6 @@ import java.io.IOException; import java.io.ObjectInputStream; import java.io.PrintStream; import java.net.Socket; -import java.net.SocketException; -import java.net.SocketTimeoutException; public class StressThread extends Thread {