Repository: cassandra Updated Branches: refs/heads/trunk f6ca48251 -> 087264f29
http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/net/MessageIn.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/MessageIn.java b/src/java/org/apache/cassandra/net/MessageIn.java index 014ee93..fe85595 100644 --- a/src/java/org/apache/cassandra/net/MessageIn.java +++ b/src/java/org/apache/cassandra/net/MessageIn.java @@ -27,10 +27,8 @@ import com.google.common.collect.ImmutableMap; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.monitoring.ConstructionTime; -import org.apache.cassandra.db.monitoring.MonitorableImpl; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; -import org.apache.cassandra.io.util.FileUtils; public class MessageIn<T> { http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java index 312daed..52625bf 100644 --- a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java +++ b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java @@ -21,7 +21,6 @@ import java.net.InetAddress; import java.util.*; import com.google.common.base.Predicate; -import com.google.common.collect.Sets; import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.MoreExecutors; import org.slf4j.Logger; @@ -30,8 +29,6 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.compaction.CompactionManager; import org.apache.cassandra.dht.Bounds; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.net.IVerbHandler; import org.apache.cassandra.net.MessageIn; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/repair/ValidationTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/repair/ValidationTask.java b/src/java/org/apache/cassandra/repair/ValidationTask.java index bd866d2..177ad3e 100644 --- a/src/java/org/apache/cassandra/repair/ValidationTask.java +++ b/src/java/org/apache/cassandra/repair/ValidationTask.java @@ -18,16 +18,12 @@ package org.apache.cassandra.repair; import java.net.InetAddress; -import java.util.Map; import com.google.common.util.concurrent.AbstractFuture; -import org.apache.cassandra.dht.Range; -import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.RepairException; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.repair.messages.ValidationRequest; -import org.apache.cassandra.utils.MerkleTree; import org.apache.cassandra.utils.MerkleTrees; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/scheduler/WeightedQueue.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/scheduler/WeightedQueue.java b/src/java/org/apache/cassandra/scheduler/WeightedQueue.java index 298938d..76c7e9d 100644 --- a/src/java/org/apache/cassandra/scheduler/WeightedQueue.java +++ b/src/java/org/apache/cassandra/scheduler/WeightedQueue.java @@ -20,9 +20,6 @@ package org.apache.cassandra.scheduler; import java.util.concurrent.SynchronousQueue; import java.util.concurrent.TimeoutException; import java.util.concurrent.TimeUnit; -import java.lang.management.ManagementFactory; -import javax.management.MBeanServer; -import javax.management.ObjectName; import org.apache.cassandra.metrics.LatencyMetrics; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java index 93591f0..c70161e 100644 --- a/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java +++ b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java @@ -40,9 +40,7 @@ import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.db.rows.RowIterator; import org.apache.cassandra.db.rows.UnfilteredRowIterators; import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.concurrent.OpOrder; import static java.lang.String.format; import static org.apache.cassandra.utils.ByteBufferUtil.bytes; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/schema/Types.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/schema/Types.java b/src/java/org/apache/cassandra/schema/Types.java index 25efd70..c2d8aac 100644 --- a/src/java/org/apache/cassandra/schema/Types.java +++ b/src/java/org/apache/cassandra/schema/Types.java @@ -29,7 +29,6 @@ import org.apache.cassandra.cql3.CQL3Type; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.utils.ByteBufferUtil; import static java.lang.String.format; import static com.google.common.collect.Iterables.filter; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java index e3ba66e..19b3de0 100644 --- a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java +++ b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java @@ -31,7 +31,6 @@ import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.WriteType; import org.apache.cassandra.exceptions.*; -import org.apache.cassandra.net.IAsyncCallback; import org.apache.cassandra.net.IAsyncCallbackWithFailure; import org.apache.cassandra.net.MessageIn; import org.apache.cassandra.utils.concurrent.SimpleCondition; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/service/ActiveRepairService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/ActiveRepairService.java b/src/java/org/apache/cassandra/service/ActiveRepairService.java index bfa121d..1ef5dfe 100644 --- a/src/java/org/apache/cassandra/service/ActiveRepairService.java +++ b/src/java/org/apache/cassandra/service/ActiveRepairService.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.service; -import java.io.File; import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/service/AsyncRepairCallback.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/AsyncRepairCallback.java b/src/java/org/apache/cassandra/service/AsyncRepairCallback.java index 4e70d56..e3ad44e 100644 --- a/src/java/org/apache/cassandra/service/AsyncRepairCallback.java +++ b/src/java/org/apache/cassandra/service/AsyncRepairCallback.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.service; -import java.io.IOException; import java.util.concurrent.atomic.AtomicInteger; import org.apache.cassandra.concurrent.Stage; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/service/CacheService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CacheService.java b/src/java/org/apache/cassandra/service/CacheService.java index 625d687..a4e18c0 100644 --- a/src/java/org/apache/cassandra/service/CacheService.java +++ b/src/java/org/apache/cassandra/service/CacheService.java @@ -54,7 +54,6 @@ import org.apache.cassandra.io.sstable.format.big.BigFormat; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; -import org.apache.cassandra.utils.concurrent.OpOrder; public class CacheService implements CacheServiceMBean { http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/service/MigrationTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/MigrationTask.java b/src/java/org/apache/cassandra/service/MigrationTask.java index 39a5a11..052b89e 100644 --- a/src/java/org/apache/cassandra/service/MigrationTask.java +++ b/src/java/org/apache/cassandra/service/MigrationTask.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.service; -import java.io.IOException; import java.net.InetAddress; import java.util.Collection; import java.util.EnumSet; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/service/NativeTransportService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/NativeTransportService.java b/src/java/org/apache/cassandra/service/NativeTransportService.java index 70debeb..d63b2b6 100644 --- a/src/java/org/apache/cassandra/service/NativeTransportService.java +++ b/src/java/org/apache/cassandra/service/NativeTransportService.java @@ -32,7 +32,6 @@ import io.netty.channel.epoll.Epoll; import io.netty.channel.epoll.EpollEventLoopGroup; import io.netty.channel.nio.NioEventLoopGroup; import io.netty.util.concurrent.EventExecutor; -import io.netty.util.concurrent.Future; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.metrics.AuthMetrics; import org.apache.cassandra.metrics.ClientMetrics; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/service/StorageProxy.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java index daabcc5..2839259 100644 --- a/src/java/org/apache/cassandra/service/StorageProxy.java +++ b/src/java/org/apache/cassandra/service/StorageProxy.java @@ -73,8 +73,6 @@ import org.apache.cassandra.triggers.TriggerExecutor; import org.apache.cassandra.utils.*; import org.apache.cassandra.utils.AbstractIterator; -import static com.google.common.collect.Iterables.contains; - public class StorageProxy implements StorageProxyMBean { public static final String MBEAN_NAME = "org.apache.cassandra.db:type=StorageProxy"; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/service/paxos/Commit.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/paxos/Commit.java b/src/java/org/apache/cassandra/service/paxos/Commit.java index 95bd464..af94869 100644 --- a/src/java/org/apache/cassandra/service/paxos/Commit.java +++ b/src/java/org/apache/cassandra/service/paxos/Commit.java @@ -35,7 +35,6 @@ import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.util.DataInputPlus; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.UUIDGen; import org.apache.cassandra.utils.UUIDSerializer; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/service/paxos/PrepareCallback.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/paxos/PrepareCallback.java b/src/java/org/apache/cassandra/service/paxos/PrepareCallback.java index ff81803..544403a 100644 --- a/src/java/org/apache/cassandra/service/paxos/PrepareCallback.java +++ b/src/java/org/apache/cassandra/service/paxos/PrepareCallback.java @@ -22,7 +22,6 @@ package org.apache.cassandra.service.paxos; import java.net.InetAddress; -import java.nio.ByteBuffer; import java.util.Collections; import java.util.Map; import java.util.concurrent.ConcurrentHashMap; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/streaming/StreamResultFuture.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamResultFuture.java b/src/java/org/apache/cassandra/streaming/StreamResultFuture.java index 71ca9b1..61a1c8c 100644 --- a/src/java/org/apache/cassandra/streaming/StreamResultFuture.java +++ b/src/java/org/apache/cassandra/streaming/StreamResultFuture.java @@ -19,7 +19,6 @@ package org.apache.cassandra.streaming; import java.io.IOException; import java.net.InetAddress; -import java.net.Socket; import java.util.*; import java.util.concurrent.ConcurrentLinkedQueue; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/streaming/StreamWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamWriter.java b/src/java/org/apache/cassandra/streaming/StreamWriter.java index 1d30419..6c86c8b 100644 --- a/src/java/org/apache/cassandra/streaming/StreamWriter.java +++ b/src/java/org/apache/cassandra/streaming/StreamWriter.java @@ -32,7 +32,6 @@ import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.DataIntegrityMetadata; import org.apache.cassandra.io.util.DataIntegrityMetadata.ChecksumValidator; import org.apache.cassandra.io.util.DataOutputStreamPlus; -import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.streaming.StreamManager.StreamRateLimiter; import org.apache.cassandra.utils.FBUtilities; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/streaming/compress/CompressedStreamWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamWriter.java b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamWriter.java index 900c1ad..185ab22 100644 --- a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamWriter.java +++ b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamWriter.java @@ -18,13 +18,10 @@ package org.apache.cassandra.streaming.compress; import java.io.IOException; -import java.nio.channels.WritableByteChannel; import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.google.common.base.Function; - import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -33,8 +30,6 @@ import org.apache.cassandra.io.sstable.Component; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.ChannelProxy; import org.apache.cassandra.io.util.DataOutputStreamPlus; -import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.streaming.ProgressInfo; import org.apache.cassandra.streaming.StreamSession; import org.apache.cassandra.streaming.StreamWriter; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java b/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java index 2b5047d..ec68f9e 100644 --- a/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java +++ b/src/java/org/apache/cassandra/streaming/messages/FileMessageHeader.java @@ -25,7 +25,6 @@ import java.util.UUID; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.SerializationHeader; import org.apache.cassandra.db.TypeSizes; -import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.compress.CompressionMetadata; import org.apache.cassandra.io.sstable.format.SSTableFormat; import org.apache.cassandra.io.util.DataInputPlus; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java b/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java index 9530e14..dc2eb8f 100644 --- a/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java +++ b/src/java/org/apache/cassandra/streaming/messages/OutgoingFileMessage.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.nio.channels.ReadableByteChannel; import java.util.List; -import org.apache.cassandra.io.compress.CompressionMetadata; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.DataOutputStreamPlus; import org.apache.cassandra.streaming.StreamSession; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/thrift/ThriftSessionManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/ThriftSessionManager.java b/src/java/org/apache/cassandra/thrift/ThriftSessionManager.java index 3603ad5..7d22507 100644 --- a/src/java/org/apache/cassandra/thrift/ThriftSessionManager.java +++ b/src/java/org/apache/cassandra/thrift/ThriftSessionManager.java @@ -19,7 +19,6 @@ package org.apache.cassandra.thrift; import java.net.InetSocketAddress; import java.net.SocketAddress; -import java.util.Map; import java.util.concurrent.ConcurrentHashMap; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java b/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java index 3e2ff08..1f407cb 100644 --- a/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java +++ b/src/java/org/apache/cassandra/tools/SSTableExpiredBlockers.java @@ -32,7 +32,6 @@ import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.io.sstable.Component; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.SSTableReader; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/tools/SSTableExport.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/SSTableExport.java b/src/java/org/apache/cassandra/tools/SSTableExport.java index cc6b84b..f05898f 100644 --- a/src/java/org/apache/cassandra/tools/SSTableExport.java +++ b/src/java/org/apache/cassandra/tools/SSTableExport.java @@ -37,14 +37,12 @@ import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.dht.*; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.index.SecondaryIndexManager; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.ISSTableScanner; import org.apache.cassandra.io.sstable.KeyIterator; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.metadata.MetadataComponent; import org.apache.cassandra.io.sstable.metadata.MetadataType; -import org.apache.cassandra.io.sstable.metadata.ValidationMetadata; import org.apache.cassandra.utils.FBUtilities; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/tools/nodetool/TableStats.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/TableStats.java b/src/java/org/apache/cassandra/tools/nodetool/TableStats.java index 53a3066..b67f7c4 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/TableStats.java +++ b/src/java/org/apache/cassandra/tools/nodetool/TableStats.java @@ -18,16 +18,10 @@ package org.apache.cassandra.tools.nodetool; import java.util.*; -import javax.management.InstanceNotFoundException; - -import com.google.common.collect.ArrayListMultimap; import io.airlift.command.Arguments; import io.airlift.command.Command; import io.airlift.command.Option; -import org.apache.cassandra.db.ColumnFamilyStoreMBean; -import org.apache.cassandra.io.util.FileUtils; -import org.apache.cassandra.metrics.CassandraMetricsRegistry; import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.NodeTool.NodeToolCmd; import org.apache.cassandra.tools.nodetool.stats.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java b/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java index dd56d8a..a785528 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java +++ b/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsHolder.java @@ -28,8 +28,6 @@ import org.apache.cassandra.db.*; import org.apache.cassandra.io.util.*; import org.apache.cassandra.metrics.*; import org.apache.cassandra.tools.*; -import org.apache.cassandra.tools.nodetool.*; -import org.apache.cassandra.tools.nodetool.stats.*; public class TableStatsHolder implements StatsHolder { http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsPrinter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsPrinter.java b/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsPrinter.java index 4c86d27..49888ee 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsPrinter.java +++ b/src/java/org/apache/cassandra/tools/nodetool/stats/TableStatsPrinter.java @@ -21,9 +21,6 @@ package org.apache.cassandra.tools.nodetool.stats; import java.io.PrintStream; import java.util.List; -import org.json.simple.JSONObject; -import org.yaml.snakeyaml.Yaml; - public class TableStatsPrinter { public static StatsPrinter from(String format) http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/tools/nodetool/stats/TpStatsHolder.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/stats/TpStatsHolder.java b/src/java/org/apache/cassandra/tools/nodetool/stats/TpStatsHolder.java index df2f135..d70b4dd 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/stats/TpStatsHolder.java +++ b/src/java/org/apache/cassandra/tools/nodetool/stats/TpStatsHolder.java @@ -21,8 +21,6 @@ package org.apache.cassandra.tools.nodetool.stats; import java.util.HashMap; import java.util.Map; -import com.google.common.collect.Multimap; - import org.apache.cassandra.tools.NodeProbe; import org.apache.cassandra.tools.nodetool.stats.StatsHolder; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/triggers/ITrigger.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/triggers/ITrigger.java b/src/java/org/apache/cassandra/triggers/ITrigger.java index ad631d1..d46c036 100644 --- a/src/java/org/apache/cassandra/triggers/ITrigger.java +++ b/src/java/org/apache/cassandra/triggers/ITrigger.java @@ -21,7 +21,6 @@ package org.apache.cassandra.triggers; */ -import java.nio.ByteBuffer; import java.util.Collection; import org.apache.cassandra.db.Mutation; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/utils/CLibrary.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/CLibrary.java b/src/java/org/apache/cassandra/utils/CLibrary.java index 347b0df..a68db95 100644 --- a/src/java/org/apache/cassandra/utils/CLibrary.java +++ b/src/java/org/apache/cassandra/utils/CLibrary.java @@ -23,8 +23,6 @@ import java.io.FileInputStream; import java.io.IOException; import java.lang.reflect.Field; import java.nio.channels.FileChannel; -import java.nio.file.Paths; -import java.nio.file.StandardOpenOption; import java.util.concurrent.TimeUnit; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/utils/Interval.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/Interval.java b/src/java/org/apache/cassandra/utils/Interval.java index 335ef27..9398144 100644 --- a/src/java/org/apache/cassandra/utils/Interval.java +++ b/src/java/org/apache/cassandra/utils/Interval.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.utils; -import java.util.Comparator; - import com.google.common.base.Objects; public class Interval<C, D> http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/utils/JMXServerUtils.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/JMXServerUtils.java b/src/java/org/apache/cassandra/utils/JMXServerUtils.java index ad87efd..089c57d 100644 --- a/src/java/org/apache/cassandra/utils/JMXServerUtils.java +++ b/src/java/org/apache/cassandra/utils/JMXServerUtils.java @@ -36,7 +36,6 @@ import java.util.Map; import java.util.stream.Collectors; import javax.management.remote.*; import javax.management.remote.rmi.RMIConnectorServer; -import javax.management.remote.rmi.RMIJRMPServerImpl; import javax.rmi.ssl.SslRMIClientSocketFactory; import javax.rmi.ssl.SslRMIServerSocketFactory; import javax.security.auth.Subject; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillis.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillis.java b/src/java/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillis.java index 69b7a47..5aafbe5 100644 --- a/src/java/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillis.java +++ b/src/java/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillis.java @@ -22,8 +22,6 @@ import java.util.concurrent.TimeUnit; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.config.Config; -import com.google.common.annotations.VisibleForTesting; - /* * Convert from nanotime to non-monotonic current time millis. Beware of weaker ordering guarantees. */ http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/utils/ObjectSizes.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/ObjectSizes.java b/src/java/org/apache/cassandra/utils/ObjectSizes.java index e7469c1..5c2434e 100644 --- a/src/java/org/apache/cassandra/utils/ObjectSizes.java +++ b/src/java/org/apache/cassandra/utils/ObjectSizes.java @@ -23,8 +23,6 @@ package org.apache.cassandra.utils; import java.nio.ByteBuffer; -import java.util.ArrayList; - import org.github.jamm.MemoryLayoutSpecification; import org.github.jamm.MemoryMeter; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/utils/StatusLogger.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/StatusLogger.java b/src/java/org/apache/cassandra/utils/StatusLogger.java index 712e8f7..c33190b 100644 --- a/src/java/org/apache/cassandra/utils/StatusLogger.java +++ b/src/java/org/apache/cassandra/utils/StatusLogger.java @@ -19,19 +19,14 @@ package org.apache.cassandra.utils; import java.lang.management.ManagementFactory; import java.util.Map; -import java.util.Set; import javax.management.*; -import com.google.common.collect.Iterables; - import org.apache.cassandra.cache.*; -import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.metrics.ThreadPoolMetrics; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutorMBean; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.RowIndexEntry; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/utils/UUIDGen.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/UUIDGen.java b/src/java/org/apache/cassandra/utils/UUIDGen.java index a8b3093..a72139d 100644 --- a/src/java/org/apache/cassandra/utils/UUIDGen.java +++ b/src/java/org/apache/cassandra/utils/UUIDGen.java @@ -29,7 +29,6 @@ import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.TimeUnit; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Charsets; import com.google.common.primitives.Ints; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/utils/concurrent/RefCounted.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/concurrent/RefCounted.java b/src/java/org/apache/cassandra/utils/concurrent/RefCounted.java index e68c7bd..d09d288 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/RefCounted.java +++ b/src/java/org/apache/cassandra/utils/concurrent/RefCounted.java @@ -18,23 +18,6 @@ */ package org.apache.cassandra.utils.concurrent; -import java.lang.ref.PhantomReference; -import java.lang.ref.ReferenceQueue; -import java.util.*; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentLinkedQueue; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.Executors; -import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; - -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Iterators; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import org.apache.cassandra.concurrent.NamedThreadFactory; - /** * An object that needs ref counting does the two following: * - defines a Tidy object that will cleanup once it's gone, http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/utils/concurrent/Refs.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/concurrent/Refs.java b/src/java/org/apache/cassandra/utils/concurrent/Refs.java index ec8d6c0..e5d9c37 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/Refs.java +++ b/src/java/org/apache/cassandra/utils/concurrent/Refs.java @@ -25,7 +25,6 @@ import java.util.*; import javax.annotation.Nullable; import com.google.common.base.Function; -import com.google.common.base.Throwables; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/utils/memory/HeapPool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/memory/HeapPool.java b/src/java/org/apache/cassandra/utils/memory/HeapPool.java index 593b443..46f4111 100644 --- a/src/java/org/apache/cassandra/utils/memory/HeapPool.java +++ b/src/java/org/apache/cassandra/utils/memory/HeapPool.java @@ -18,13 +18,6 @@ */ package org.apache.cassandra.utils.memory; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.List; - -import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.utils.concurrent.OpOrder; - public class HeapPool extends MemtablePool { public HeapPool(long maxOnHeapMemory, float cleanupThreshold, Runnable cleaner) http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/src/java/org/apache/cassandra/utils/memory/MemtableBufferAllocator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/memory/MemtableBufferAllocator.java b/src/java/org/apache/cassandra/utils/memory/MemtableBufferAllocator.java index fb35b38..fe412ea 100644 --- a/src/java/org/apache/cassandra/utils/memory/MemtableBufferAllocator.java +++ b/src/java/org/apache/cassandra/utils/memory/MemtableBufferAllocator.java @@ -19,7 +19,6 @@ package org.apache.cassandra.utils.memory; import java.nio.ByteBuffer; -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.*; import org.apache.cassandra.db.rows.*; import org.apache.cassandra.utils.concurrent.OpOrder; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/long/org/apache/cassandra/cql3/ViewLongTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/cql3/ViewLongTest.java b/test/long/org/apache/cassandra/cql3/ViewLongTest.java index 3808b73..4dded85 100644 --- a/test/long/org/apache/cassandra/cql3/ViewLongTest.java +++ b/test/long/org/apache/cassandra/cql3/ViewLongTest.java @@ -32,9 +32,6 @@ import org.junit.Test; import com.datastax.driver.core.Row; import com.datastax.driver.core.exceptions.NoHostAvailableException; import com.datastax.driver.core.exceptions.WriteTimeoutException; -import org.apache.cassandra.concurrent.SEPExecutor; -import org.apache.cassandra.concurrent.Stage; -import org.apache.cassandra.concurrent.StageManager; import org.apache.cassandra.batchlog.BatchlogManager; import org.apache.cassandra.utils.WrappedRunnable; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/long/org/apache/cassandra/locator/DynamicEndpointSnitchLongTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/locator/DynamicEndpointSnitchLongTest.java b/test/long/org/apache/cassandra/locator/DynamicEndpointSnitchLongTest.java index 0d66fa9..2349453 100644 --- a/test/long/org/apache/cassandra/locator/DynamicEndpointSnitchLongTest.java +++ b/test/long/org/apache/cassandra/locator/DynamicEndpointSnitchLongTest.java @@ -31,8 +31,6 @@ import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.FBUtilities; -import static org.junit.Assert.assertEquals; - public class DynamicEndpointSnitchLongTest { @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/UpdateBuilder.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/UpdateBuilder.java b/test/unit/org/apache/cassandra/UpdateBuilder.java index 3a5fbe6..047baaa 100644 --- a/test/unit/org/apache/cassandra/UpdateBuilder.java +++ b/test/unit/org/apache/cassandra/UpdateBuilder.java @@ -23,7 +23,6 @@ import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.*; import org.apache.cassandra.db.partitions.*; import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.service.StorageService; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/Util.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/Util.java b/test/unit/org/apache/cassandra/Util.java index 9689628..df83ff1 100644 --- a/test/unit/org/apache/cassandra/Util.java +++ b/test/unit/org/apache/cassandra/Util.java @@ -57,7 +57,6 @@ import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.CounterId; import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.concurrent.OpOrder; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotNull; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/auth/jmx/AuthorizationProxyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/auth/jmx/AuthorizationProxyTest.java b/test/unit/org/apache/cassandra/auth/jmx/AuthorizationProxyTest.java index 9943acb..f86df40 100644 --- a/test/unit/org/apache/cassandra/auth/jmx/AuthorizationProxyTest.java +++ b/test/unit/org/apache/cassandra/auth/jmx/AuthorizationProxyTest.java @@ -25,7 +25,6 @@ import java.util.function.Supplier; import java.util.stream.Collectors; import javax.management.MalformedObjectNameException; import javax.management.ObjectName; -import javax.management.remote.JMXPrincipal; import javax.security.auth.Subject; import com.google.common.collect.ImmutableMap; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutorTest.java b/test/unit/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutorTest.java index 46b2764..bf78d65 100644 --- a/test/unit/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutorTest.java +++ b/test/unit/org/apache/cassandra/concurrent/DebuggableScheduledThreadPoolExecutorTest.java @@ -20,7 +20,6 @@ package org.apache.cassandra.concurrent; import java.io.IOException; import java.util.concurrent.CancellationException; -import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutionException; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/cql3/ColumnConditionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/ColumnConditionTest.java b/test/unit/org/apache/cassandra/cql3/ColumnConditionTest.java index 989c524..78e0a6c 100644 --- a/test/unit/org/apache/cassandra/cql3/ColumnConditionTest.java +++ b/test/unit/org/apache/cassandra/cql3/ColumnConditionTest.java @@ -24,7 +24,6 @@ import org.junit.Test; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; -import org.apache.cassandra.db.LivenessInfo; import org.apache.cassandra.db.rows.BufferCell; import org.apache.cassandra.db.rows.Cell; import org.apache.cassandra.db.rows.CellPath; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/cql3/LargeCompactValueTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/LargeCompactValueTest.java b/test/unit/org/apache/cassandra/cql3/LargeCompactValueTest.java index fe91650..93b16ce 100644 --- a/test/unit/org/apache/cassandra/cql3/LargeCompactValueTest.java +++ b/test/unit/org/apache/cassandra/cql3/LargeCompactValueTest.java @@ -23,8 +23,6 @@ import java.nio.ByteBuffer; import org.junit.Before; import org.junit.Test; -import org.apache.cassandra.io.util.RandomAccessReader; - public class LargeCompactValueTest extends CQLTester { @Before http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/cql3/NonNativeTimestampTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/NonNativeTimestampTest.java b/test/unit/org/apache/cassandra/cql3/NonNativeTimestampTest.java index 37dc560..7ba9889 100644 --- a/test/unit/org/apache/cassandra/cql3/NonNativeTimestampTest.java +++ b/test/unit/org/apache/cassandra/cql3/NonNativeTimestampTest.java @@ -17,12 +17,6 @@ */ package org.apache.cassandra.cql3; -import java.io.UnsupportedEncodingException; -import java.nio.ByteBuffer; -import java.nio.charset.CharacterCodingException; -import java.util.Arrays; -import java.util.Collections; - import org.junit.Test; import static junit.framework.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java b/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java index 4ddb797..17e426b 100644 --- a/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java +++ b/test/unit/org/apache/cassandra/cql3/PstmtPersistenceTest.java @@ -20,9 +20,7 @@ package org.apache.cassandra.cql3; import java.net.InetSocketAddress; import java.util.ArrayList; import java.util.Collections; -import java.util.HashSet; import java.util.List; -import java.util.Set; import org.junit.Test; @@ -30,12 +28,10 @@ import junit.framework.Assert; import org.apache.cassandra.cql3.statements.ParsedStatement; import org.apache.cassandra.db.SystemKeyspace; import org.apache.cassandra.db.marshal.Int32Type; -import org.apache.cassandra.db.marshal.IntegerType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.schema.SchemaKeyspace; import org.apache.cassandra.service.ClientState; import org.apache.cassandra.service.QueryState; -import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.MD5Digest; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/cql3/SerializationMirrorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/SerializationMirrorTest.java b/test/unit/org/apache/cassandra/cql3/SerializationMirrorTest.java index 49f77a7..3268784 100644 --- a/test/unit/org/apache/cassandra/cql3/SerializationMirrorTest.java +++ b/test/unit/org/apache/cassandra/cql3/SerializationMirrorTest.java @@ -25,7 +25,6 @@ import java.util.concurrent.ThreadLocalRandom; import org.junit.Test; import junit.framework.Assert; -import org.apache.cassandra.utils.ByteBufferUtil; public class SerializationMirrorTest extends CQLTester { http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/cql3/SimpleQueryTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/SimpleQueryTest.java b/test/unit/org/apache/cassandra/cql3/SimpleQueryTest.java index 22a4c49..c2de52a 100644 --- a/test/unit/org/apache/cassandra/cql3/SimpleQueryTest.java +++ b/test/unit/org/apache/cassandra/cql3/SimpleQueryTest.java @@ -17,12 +17,8 @@ */ package org.apache.cassandra.cql3; -import java.util.*; - import org.junit.Test; -import static junit.framework.Assert.*; - public class SimpleQueryTest extends CQLTester { @Test http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/cql3/ThriftCompatibilityTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/ThriftCompatibilityTest.java b/test/unit/org/apache/cassandra/cql3/ThriftCompatibilityTest.java index ff2af56..521c0a0 100644 --- a/test/unit/org/apache/cassandra/cql3/ThriftCompatibilityTest.java +++ b/test/unit/org/apache/cassandra/cql3/ThriftCompatibilityTest.java @@ -22,10 +22,8 @@ import java.util.Collections; import org.junit.Test; -import com.sun.org.apache.xerces.internal.impl.xs.models.CMNodeFactory; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.marshal.BytesType; import org.apache.cassandra.db.marshal.Int32Type; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/cql3/selection/TermSelectionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/selection/TermSelectionTest.java b/test/unit/org/apache/cassandra/cql3/selection/TermSelectionTest.java index 065fdbd..a07f8f9 100644 --- a/test/unit/org/apache/cassandra/cql3/selection/TermSelectionTest.java +++ b/test/unit/org/apache/cassandra/cql3/selection/TermSelectionTest.java @@ -19,7 +19,6 @@ package org.apache.cassandra.cql3.selection; import java.math.BigDecimal; -import java.math.BigInteger; import java.util.*; import org.junit.Test; @@ -29,7 +28,6 @@ import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.transport.messages.ResultMessage; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; public class TermSelectionTest extends CQLTester { http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/cql3/validation/entities/CountersTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/CountersTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/CountersTest.java index 33b4a4f..a09d0d7 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/CountersTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/CountersTest.java @@ -21,7 +21,6 @@ package org.apache.cassandra.cql3.validation.entities; import org.junit.Test; import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.InvalidRequestException; public class CountersTest extends CQLTester http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/cql3/validation/entities/UFAuthTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/UFAuthTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/UFAuthTest.java index d085a9d..a3a8e37 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/UFAuthTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/UFAuthTest.java @@ -36,7 +36,6 @@ import org.apache.cassandra.cql3.statements.BatchStatement; import org.apache.cassandra.cql3.statements.ModificationStatement; import org.apache.cassandra.exceptions.*; import org.apache.cassandra.service.ClientState; -import org.apache.cassandra.utils.Pair; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/OverflowTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/OverflowTest.java b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/OverflowTest.java index 9733eb2..49bfe88 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/OverflowTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/miscellaneous/OverflowTest.java @@ -21,7 +21,6 @@ import java.math.BigInteger; import org.junit.Test; -import static junit.framework.Assert.assertFalse; import static junit.framework.Assert.assertNull; import static org.junit.Assert.assertArrayEquals; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java index b132958..9bb2468 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/InsertUpdateIfConditionTest.java @@ -27,7 +27,6 @@ import org.apache.cassandra.schema.SchemaKeyspace; import static java.lang.String.format; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; public class InsertUpdateIfConditionTest extends CQLTester http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/db/CounterCellTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/CounterCellTest.java b/test/unit/org/apache/cassandra/db/CounterCellTest.java index b09bfad..a043b1b 100644 --- a/test/unit/org/apache/cassandra/db/CounterCellTest.java +++ b/test/unit/org/apache/cassandra/db/CounterCellTest.java @@ -31,7 +31,6 @@ import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.db.rows.BufferCell; import org.apache.cassandra.db.rows.Cell; -import org.apache.cassandra.db.rows.CellPath; import org.apache.cassandra.db.rows.Cells; import org.apache.cassandra.db.context.CounterContext; import org.apache.cassandra.exceptions.ConfigurationException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/db/RowIterationTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/RowIterationTest.java b/test/unit/org/apache/cassandra/db/RowIterationTest.java index 3b0293c..b0cd4fc 100644 --- a/test/unit/org/apache/cassandra/db/RowIterationTest.java +++ b/test/unit/org/apache/cassandra/db/RowIterationTest.java @@ -21,12 +21,9 @@ package org.apache.cassandra.db; import org.junit.Test; import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.db.rows.UnfilteredRowIterator; -import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; import org.apache.cassandra.Util; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.assertFalse; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/db/ScrubTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/ScrubTest.java b/test/unit/org/apache/cassandra/db/ScrubTest.java index df654bf..f8bafd7 100644 --- a/test/unit/org/apache/cassandra/db/ScrubTest.java +++ b/test/unit/org/apache/cassandra/db/ScrubTest.java @@ -51,7 +51,6 @@ import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.exceptions.WriteTimeoutException; import org.apache.cassandra.io.compress.CompressionMetadata; import org.apache.cassandra.io.sstable.*; -import org.apache.cassandra.io.sstable.format.SSTableFormat; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.io.sstable.format.big.BigTableWriter; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/db/VerifyTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/VerifyTest.java b/test/unit/org/apache/cassandra/db/VerifyTest.java index d216860..53bf655 100644 --- a/test/unit/org/apache/cassandra/db/VerifyTest.java +++ b/test/unit/org/apache/cassandra/db/VerifyTest.java @@ -31,7 +31,6 @@ import org.apache.cassandra.db.marshal.UUIDType; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.WriteTimeoutException; import org.apache.cassandra.io.FSWriteError; -import org.apache.cassandra.io.sstable.Component; import org.apache.cassandra.io.sstable.CorruptSSTableException; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.util.FileUtils; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/db/commitlog/SegmentReaderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/commitlog/SegmentReaderTest.java b/test/unit/org/apache/cassandra/db/commitlog/SegmentReaderTest.java index 88300a1..1e8d944 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/SegmentReaderTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/SegmentReaderTest.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.db.commitlog; -import java.io.DataInput; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/db/commitlog/SnapshotDeletingTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/commitlog/SnapshotDeletingTest.java b/test/unit/org/apache/cassandra/db/commitlog/SnapshotDeletingTest.java index 37f1731..1fae80d 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/SnapshotDeletingTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/SnapshotDeletingTest.java @@ -31,7 +31,6 @@ import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.RowUpdateBuilder; import org.apache.cassandra.db.WindowsFailedSnapshotTracker; -import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.sstable.SnapshotDeletingTask; import org.apache.cassandra.schema.KeyspaceParams; import org.apache.cassandra.service.GCInspector; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java index b264553..1a04e1f 100644 --- a/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/TTLExpiryTest.java @@ -33,7 +33,6 @@ import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.BTreeRow; import org.apache.cassandra.db.filter.ColumnFilter; import org.apache.cassandra.db.lifecycle.SSTableSet; import org.apache.cassandra.db.rows.UnfilteredRowIterator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/db/filter/SliceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/filter/SliceTest.java b/test/unit/org/apache/cassandra/db/filter/SliceTest.java index b0705ce..c2589d8 100644 --- a/test/unit/org/apache/cassandra/db/filter/SliceTest.java +++ b/test/unit/org/apache/cassandra/db/filter/SliceTest.java @@ -19,12 +19,10 @@ package org.apache.cassandra.db.filter; -import java.awt.*; import java.nio.ByteBuffer; import java.util.*; import java.util.List; -import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.db.*; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java b/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java index 0054163..b6160bf 100644 --- a/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java +++ b/test/unit/org/apache/cassandra/db/marshal/TimeUUIDTypeTest.java @@ -19,10 +19,7 @@ package org.apache.cassandra.db.marshal; import java.nio.ByteBuffer; -import java.util.Arrays; -import java.util.Random; import java.util.UUID; -import java.util.concurrent.ThreadLocalRandom; import junit.framework.Assert; import org.apache.cassandra.serializers.MarshalException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/gms/GossiperTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/gms/GossiperTest.java b/test/unit/org/apache/cassandra/gms/GossiperTest.java index ad07165..4c5cc7c 100644 --- a/test/unit/org/apache/cassandra/gms/GossiperTest.java +++ b/test/unit/org/apache/cassandra/gms/GossiperTest.java @@ -25,18 +25,13 @@ import java.util.List; import java.util.UUID; import com.google.common.collect.ImmutableMap; -import org.junit.After; -import org.junit.AfterClass; import org.junit.Before; -import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.RandomPartitioner; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.locator.TokenMetadata; import org.apache.cassandra.service.StorageService; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/index/StubIndex.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/index/StubIndex.java b/test/unit/org/apache/cassandra/index/StubIndex.java index 5f9d1f3..0b7b32f 100644 --- a/test/unit/org/apache/cassandra/index/StubIndex.java +++ b/test/unit/org/apache/cassandra/index/StubIndex.java @@ -31,7 +31,6 @@ import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.db.partitions.PartitionIterator; import org.apache.cassandra.db.partitions.PartitionUpdate; -import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.index.transactions.IndexTransaction; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java index 46d1a3c..47e3895 100644 --- a/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java +++ b/test/unit/org/apache/cassandra/index/sasi/SASIIndexTest.java @@ -46,7 +46,6 @@ import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.cassandra.exceptions.SyntaxException; import org.apache.cassandra.index.sasi.conf.ColumnIndex; import org.apache.cassandra.index.sasi.disk.OnDiskIndexBuilder; import org.apache.cassandra.index.sasi.exceptions.TimeQuotaExceededException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/io/compress/CompressorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/compress/CompressorTest.java b/test/unit/org/apache/cassandra/io/compress/CompressorTest.java index 1e24d03..617e04e 100644 --- a/test/unit/org/apache/cassandra/io/compress/CompressorTest.java +++ b/test/unit/org/apache/cassandra/io/compress/CompressorTest.java @@ -33,7 +33,6 @@ import org.junit.Test; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.memory.BufferPool; public class CompressorTest { http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java b/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java index 6226ee6..64367dc 100644 --- a/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/DescriptorTest.java @@ -27,7 +27,6 @@ import org.junit.Test; import org.apache.cassandra.db.Directories; import org.apache.cassandra.io.sstable.format.SSTableFormat; -import org.apache.cassandra.io.sstable.format.big.BigFormat; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/io/sstable/LargePartitionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/LargePartitionsTest.java b/test/unit/org/apache/cassandra/io/sstable/LargePartitionsTest.java index f97356a..5536efd 100644 --- a/test/unit/org/apache/cassandra/io/sstable/LargePartitionsTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/LargePartitionsTest.java @@ -25,7 +25,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.apache.cassandra.OrderedJUnit4ClassRunner; -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.metrics.CacheMetrics; import org.apache.cassandra.service.CacheService; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java index 803e275..9a37f66 100644 --- a/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/LegacySSTableTest.java @@ -27,7 +27,6 @@ import java.util.Random; import org.junit.After; import org.junit.Assert; -import org.junit.Before; import org.junit.BeforeClass; import org.junit.Ignore; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java b/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java index 9c3bb19..68bc3c1 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableWriterTestBase.java @@ -31,7 +31,6 @@ import org.junit.AfterClass; import org.junit.BeforeClass; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ColumnFamilyStore; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/io/util/FileUtilsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/FileUtilsTest.java b/test/unit/org/apache/cassandra/io/util/FileUtilsTest.java index ee33107..e70d706 100644 --- a/test/unit/org/apache/cassandra/io/util/FileUtilsTest.java +++ b/test/unit/org/apache/cassandra/io/util/FileUtilsTest.java @@ -30,9 +30,6 @@ import java.util.Arrays; import org.junit.Test; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.schema.SchemaKeyspace; -import org.apache.cassandra.utils.FBUtilities; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/serializers/SimpleDateSerializerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/serializers/SimpleDateSerializerTest.java b/test/unit/org/apache/cassandra/serializers/SimpleDateSerializerTest.java index 4c0751f..e051357 100644 --- a/test/unit/org/apache/cassandra/serializers/SimpleDateSerializerTest.java +++ b/test/unit/org/apache/cassandra/serializers/SimpleDateSerializerTest.java @@ -19,7 +19,6 @@ package org.apache.cassandra.serializers; import org.apache.cassandra.db.marshal.SimpleDateType; -import org.apache.cassandra.utils.Pair; import org.junit.Test; import java.nio.ByteBuffer; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/service/PaxosStateTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/PaxosStateTest.java b/test/unit/org/apache/cassandra/service/PaxosStateTest.java index 9ee91dd..8054c61 100644 --- a/test/unit/org/apache/cassandra/service/PaxosStateTest.java +++ b/test/unit/org/apache/cassandra/service/PaxosStateTest.java @@ -27,7 +27,6 @@ import org.junit.Test; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.rows.Row; import org.apache.cassandra.db.partitions.PartitionUpdate; import org.apache.cassandra.gms.Gossiper; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java b/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java index 865a173..260c507 100644 --- a/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java +++ b/test/unit/org/apache/cassandra/transport/MessagePayloadTest.java @@ -29,7 +29,6 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.BatchQueryOptions; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QueryHandler; @@ -38,7 +37,6 @@ import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.statements.BatchStatement; import org.apache.cassandra.cql3.statements.ParsedStatement; import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.dht.ByteOrderedPartitioner; import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.exceptions.RequestValidationException; import org.apache.cassandra.service.ClientState; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/utils/BloomFilterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/BloomFilterTest.java b/test/unit/org/apache/cassandra/utils/BloomFilterTest.java index 2e76e0e..818af9c 100644 --- a/test/unit/org/apache/cassandra/utils/BloomFilterTest.java +++ b/test/unit/org/apache/cassandra/utils/BloomFilterTest.java @@ -20,16 +20,13 @@ package org.apache.cassandra.utils; import java.io.*; import java.nio.ByteBuffer; -import java.util.ArrayList; import java.util.HashSet; import java.util.Iterator; -import java.util.List; import java.util.Random; import java.util.Set; import org.junit.*; -import org.apache.cassandra.db.marshal.Int32Type; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Murmur3Partitioner; import org.apache.cassandra.io.util.BufferedDataOutputStreamPlus; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/utils/MergeIteratorComparisonTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/MergeIteratorComparisonTest.java b/test/unit/org/apache/cassandra/utils/MergeIteratorComparisonTest.java index 5f2de73..6d9d2f6 100644 --- a/test/unit/org/apache/cassandra/utils/MergeIteratorComparisonTest.java +++ b/test/unit/org/apache/cassandra/utils/MergeIteratorComparisonTest.java @@ -36,7 +36,6 @@ import org.junit.Test; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.TimeUUIDType; import org.apache.cassandra.db.marshal.UUIDType; -import org.apache.cassandra.utils.MergeIterator.Candidate; import org.apache.cassandra.utils.MergeIterator.Reducer; public class MergeIteratorComparisonTest http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/test/unit/org/apache/cassandra/utils/OverlapIteratorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/OverlapIteratorTest.java b/test/unit/org/apache/cassandra/utils/OverlapIteratorTest.java index 5bbe267..6f99603 100644 --- a/test/unit/org/apache/cassandra/utils/OverlapIteratorTest.java +++ b/test/unit/org/apache/cassandra/utils/OverlapIteratorTest.java @@ -21,11 +21,6 @@ package org.apache.cassandra.utils; */ -import java.io.ByteArrayInputStream; -import java.io.DataInput; -import java.io.DataInputStream; -import java.io.IOException; -import java.lang.reflect.Constructor; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -34,13 +29,6 @@ import java.util.concurrent.ThreadLocalRandom; import org.junit.Test; -import org.apache.cassandra.db.TypeSizes; -import org.apache.cassandra.io.ISerializer; -import org.apache.cassandra.io.IVersionedSerializer; -import org.apache.cassandra.io.util.DataOutputBuffer; -import org.apache.cassandra.io.util.DataOutputPlus; - -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; public class OverlapIteratorTest http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/tools/stress/src/org/apache/cassandra/stress/Operation.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/Operation.java b/tools/stress/src/org/apache/cassandra/stress/Operation.java index 16f6f04..92a54f9 100644 --- a/tools/stress/src/org/apache/cassandra/stress/Operation.java +++ b/tools/stress/src/org/apache/cassandra/stress/Operation.java @@ -20,8 +20,6 @@ package org.apache.cassandra.stress; import java.io.IOException; -import com.google.common.util.concurrent.RateLimiter; - import org.apache.cassandra.stress.settings.SettingsLog; import org.apache.cassandra.stress.settings.StressSettings; import org.apache.cassandra.stress.util.JavaDriverClient; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/tools/stress/src/org/apache/cassandra/stress/StressGraph.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/StressGraph.java b/tools/stress/src/org/apache/cassandra/stress/StressGraph.java index ebaa0ae..3b383fa 100644 --- a/tools/stress/src/org/apache/cassandra/stress/StressGraph.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressGraph.java @@ -21,7 +21,6 @@ package org.apache.cassandra.stress; import java.io.BufferedReader; import java.io.File; import java.io.FileInputStream; -import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/tools/stress/src/org/apache/cassandra/stress/generate/values/LocalDates.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/LocalDates.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/LocalDates.java index f079d35..e5f7703 100644 --- a/tools/stress/src/org/apache/cassandra/stress/generate/values/LocalDates.java +++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/LocalDates.java @@ -20,11 +20,7 @@ */ package org.apache.cassandra.stress.generate.values; -import com.datastax.driver.core.LocalDate; import org.apache.cassandra.db.marshal.SimpleDateType; -import org.joda.time.DateTimeZone; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; public class LocalDates extends Generator<Integer> { http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/tools/stress/src/org/apache/cassandra/stress/generate/values/SmallInts.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/SmallInts.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/SmallInts.java index 702b6dc..a89fe12 100644 --- a/tools/stress/src/org/apache/cassandra/stress/generate/values/SmallInts.java +++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/SmallInts.java @@ -20,7 +20,6 @@ */ package org.apache.cassandra.stress.generate.values; -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.ShortType; public class SmallInts extends Generator<Short> http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/tools/stress/src/org/apache/cassandra/stress/generate/values/Times.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/Times.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/Times.java index 35bac86..b33d6de 100644 --- a/tools/stress/src/org/apache/cassandra/stress/generate/values/Times.java +++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/Times.java @@ -20,7 +20,6 @@ */ package org.apache.cassandra.stress.generate.values; -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.TimeType; public class Times extends Generator<Long> http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/tools/stress/src/org/apache/cassandra/stress/generate/values/TinyInts.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/values/TinyInts.java b/tools/stress/src/org/apache/cassandra/stress/generate/values/TinyInts.java index 0fe3f35..e5d46ec 100644 --- a/tools/stress/src/org/apache/cassandra/stress/generate/values/TinyInts.java +++ b/tools/stress/src/org/apache/cassandra/stress/generate/values/TinyInts.java @@ -20,15 +20,7 @@ */ package org.apache.cassandra.stress.generate.values; -import java.math.BigDecimal; -import java.nio.ByteBuffer; -import java.util.Arrays; - import org.apache.cassandra.db.marshal.ByteType; -import org.apache.cassandra.db.marshal.DecimalType; -import org.apache.cassandra.db.marshal.IntegerType; -import org.apache.cassandra.db.marshal.ShortType; -import org.apache.cassandra.stress.generate.FasterRandom; public class TinyInts extends Generator<Byte> { http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/tools/stress/src/org/apache/cassandra/stress/operations/PartitionOperation.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/PartitionOperation.java b/tools/stress/src/org/apache/cassandra/stress/operations/PartitionOperation.java index 784b2ac..93290fc 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/PartitionOperation.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/PartitionOperation.java @@ -21,8 +21,6 @@ package org.apache.cassandra.stress.operations; import java.util.ArrayList; import java.util.List; -import com.google.common.util.concurrent.RateLimiter; - import org.apache.cassandra.stress.Operation; import org.apache.cassandra.stress.WorkManager; import org.apache.cassandra.stress.generate.Distribution; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaStatement.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaStatement.java b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaStatement.java index 166d689..2e03c69 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaStatement.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/SchemaStatement.java @@ -30,7 +30,6 @@ import com.datastax.driver.core.DataType; import com.datastax.driver.core.LocalDate; import com.datastax.driver.core.PreparedStatement; import org.apache.cassandra.db.ConsistencyLevel; -import org.apache.cassandra.stress.Operation; import org.apache.cassandra.stress.generate.Row; import org.apache.cassandra.stress.operations.PartitionOperation; import org.apache.cassandra.stress.settings.StressSettings; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/TokenRangeQuery.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/TokenRangeQuery.java b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/TokenRangeQuery.java index 198f1f5..7a0f02d 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/TokenRangeQuery.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/TokenRangeQuery.java @@ -26,8 +26,6 @@ import java.util.stream.Collectors; import javax.naming.OperationNotSupportedException; -import com.google.common.util.concurrent.RateLimiter; - import com.datastax.driver.core.ColumnMetadata; import com.datastax.driver.core.PagingState; import com.datastax.driver.core.ResultSet; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/ValidatingSchemaQuery.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/ValidatingSchemaQuery.java b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/ValidatingSchemaQuery.java index 33f6f80..4547a37 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/ValidatingSchemaQuery.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/userdefined/ValidatingSchemaQuery.java @@ -30,7 +30,6 @@ import java.util.concurrent.ThreadLocalRandom; import com.datastax.driver.core.*; import org.apache.cassandra.db.ConsistencyLevel; -import org.apache.cassandra.stress.Operation; import org.apache.cassandra.stress.generate.*; import org.apache.cassandra.stress.generate.Row; import org.apache.cassandra.stress.operations.PartitionOperation; http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java index 5c437a9..debe22a 100644 --- a/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java +++ b/tools/stress/src/org/apache/cassandra/stress/settings/SettingsSchema.java @@ -28,7 +28,6 @@ import java.util.*; import com.datastax.driver.core.exceptions.AlreadyExistsException; import org.apache.cassandra.stress.util.JavaDriverClient; import org.apache.cassandra.thrift.*; -import org.apache.cassandra.thrift.ConsistencyLevel; import org.apache.cassandra.utils.ByteBufferUtil; public class SettingsSchema implements Serializable http://git-wip-us.apache.org/repos/asf/cassandra/blob/087264f2/tools/stress/src/org/apache/cassandra/stress/util/Timing.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/util/Timing.java b/tools/stress/src/org/apache/cassandra/stress/util/Timing.java index fa95fdb..a304db7 100644 --- a/tools/stress/src/org/apache/cassandra/stress/util/Timing.java +++ b/tools/stress/src/org/apache/cassandra/stress/util/Timing.java @@ -23,7 +23,6 @@ package org.apache.cassandra.stress.util; import java.util.*; import java.util.concurrent.Callable; -import java.util.concurrent.CopyOnWriteArrayList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.TimeUnit;