Repository: cassandra Updated Branches: refs/heads/trunk 1e865ed6b -> b30cdd9a7
import cleanups Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/b30cdd9a Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/b30cdd9a Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/b30cdd9a Branch: refs/heads/trunk Commit: b30cdd9a7e1178014ae90c01795e680b3041c0b7 Parents: 1e865ed Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sun Jan 25 22:03:22 2015 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sun Jan 25 22:03:22 2015 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/client/RingCache.java | 1 - src/java/org/apache/cassandra/cql3/ResultSet.java | 1 - src/java/org/apache/cassandra/cql3/UntypedResultSet.java | 1 - src/java/org/apache/cassandra/cql3/functions/Function.java | 1 - src/java/org/apache/cassandra/cql3/functions/UDHelper.java | 1 - .../cassandra/cql3/restrictions/SingleColumnRestriction.java | 3 --- .../cassandra/cql3/statements/CreateIndexStatement.java | 1 - src/java/org/apache/cassandra/db/AbstractCell.java | 1 - src/java/org/apache/cassandra/db/AtomDeserializer.java | 1 - src/java/org/apache/cassandra/db/CollationController.java | 2 -- src/java/org/apache/cassandra/db/ColumnFamilySerializer.java | 1 - src/java/org/apache/cassandra/db/ConsistencyLevel.java | 1 - src/java/org/apache/cassandra/db/Directories.java | 1 - src/java/org/apache/cassandra/db/OnDiskAtom.java | 1 - src/java/org/apache/cassandra/db/RangeTombstone.java | 1 - .../apache/cassandra/db/compaction/AbstractCompactedRow.java | 1 - .../org/apache/cassandra/db/compaction/CompactionTask.java | 1 - .../org/apache/cassandra/db/compaction/LeveledManifest.java | 1 - src/java/org/apache/cassandra/db/compaction/Upgrader.java | 1 - .../org/apache/cassandra/db/composites/AbstractCType.java | 2 -- src/java/org/apache/cassandra/db/composites/CType.java | 1 - src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java | 1 - .../org/apache/cassandra/db/index/SecondaryIndexSearcher.java | 2 -- src/java/org/apache/cassandra/dht/ExcludingBounds.java | 1 - .../org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java | 1 - src/java/org/apache/cassandra/hadoop/ConfigHelper.java | 1 - src/java/org/apache/cassandra/io/ISSTableSerializer.java | 1 - src/java/org/apache/cassandra/io/compress/LZ4Compressor.java | 1 - .../org/apache/cassandra/io/compress/SnappyCompressor.java | 1 - src/java/org/apache/cassandra/io/sstable/Descriptor.java | 1 - src/java/org/apache/cassandra/io/sstable/IndexHelper.java | 2 -- src/java/org/apache/cassandra/io/sstable/SSTableLoader.java | 1 - .../cassandra/io/sstable/SSTableSimpleUnsortedWriter.java | 3 --- .../cassandra/io/sstable/format/big/BigTableReader.java | 1 - .../cassandra/io/sstable/format/big/BigTableWriter.java | 4 ---- .../cassandra/io/sstable/metadata/CompactionMetadata.java | 1 - .../io/sstable/metadata/IMetadataComponentSerializer.java | 1 - .../apache/cassandra/io/sstable/metadata/StatsMetadata.java | 1 - .../cassandra/io/sstable/metadata/ValidationMetadata.java | 1 - src/java/org/apache/cassandra/io/util/FileDataInput.java | 1 - src/java/org/apache/cassandra/io/util/FileUtils.java | 1 - .../org/apache/cassandra/io/util/MmappedSegmentedFile.java | 1 - .../org/apache/cassandra/repair/RepairMessageVerbHandler.java | 1 - src/java/org/apache/cassandra/repair/RepairSession.java | 1 - src/java/org/apache/cassandra/service/QueryState.java | 1 - src/java/org/apache/cassandra/service/ReadCallback.java | 2 -- .../org/apache/cassandra/service/pager/SliceQueryPager.java | 1 - src/java/org/apache/cassandra/streaming/StreamReader.java | 1 - .../org/apache/cassandra/streaming/StreamReceiveTask.java | 2 -- .../cassandra/streaming/compress/CompressedInputStream.java | 2 -- src/java/org/apache/cassandra/tools/NodeProbe.java | 7 ------- src/java/org/apache/cassandra/tracing/Tracing.java | 2 -- .../apache/cassandra/transport/messages/ResultMessage.java | 1 - src/java/org/apache/cassandra/utils/FBUtilities.java | 2 -- src/java/org/apache/cassandra/utils/MurmurHash.java | 2 -- .../cassandra/concurrent/LongSharedExecutorPoolTest.java | 2 -- test/long/org/apache/cassandra/cql3/CorruptionTest.java | 1 - test/pig/org/apache/pig/test/MiniCluster.java | 1 - test/unit/org/apache/cassandra/SchemaLoader.java | 1 - test/unit/org/apache/cassandra/config/KSMetaDataTest.java | 1 - test/unit/org/apache/cassandra/cql3/BatchTests.java | 1 - test/unit/org/apache/cassandra/cql3/DeleteTest.java | 3 --- .../apache/cassandra/cql3/SecondaryIndexOnMapEntriesTest.java | 1 - test/unit/org/apache/cassandra/cql3/TypeTest.java | 2 -- test/unit/org/apache/cassandra/db/CommitLogTest.java | 1 - test/unit/org/apache/cassandra/db/CounterCellTest.java | 1 - .../org/apache/cassandra/db/SecondaryIndexCellSizeTest.java | 1 - test/unit/org/apache/cassandra/gms/SerializationsTest.java | 1 - .../unit/org/apache/cassandra/io/compress/CompressorTest.java | 1 - .../cassandra/io/util/BufferedRandomAccessFileTest.java | 1 - .../org/apache/cassandra/locator/CloudstackSnitchTest.java | 4 ---- .../org/apache/cassandra/locator/GoogleCloudSnitchTest.java | 4 ---- test/unit/org/apache/cassandra/repair/ValidatorTest.java | 1 - .../unit/org/apache/cassandra/service/SerializationsTest.java | 1 - .../apache/cassandra/streaming/StreamTransferTaskTest.java | 1 - test/unit/org/apache/cassandra/utils/BloomFilterTest.java | 1 - test/unit/org/apache/cassandra/utils/ByteBufferUtilTest.java | 3 --- .../org/apache/cassandra/utils/JVMStabilityInspectorTest.java | 5 ----- test/unit/org/apache/cassandra/utils/MerkleTreeTest.java | 1 - test/unit/org/apache/cassandra/utils/SerializationsTest.java | 1 - .../org/apache/cassandra/utils/StreamingHistogramTest.java | 2 -- test/unit/org/apache/cassandra/utils/TopKSamplerTest.java | 2 -- .../stress/src/org/apache/cassandra/stress/StressMetrics.java | 1 - .../apache/cassandra/stress/generate/PartitionIterator.java | 1 - .../stress/operations/SampledOpDistributionFactory.java | 1 - .../cassandra/stress/operations/predefined/CqlOperation.java | 1 - 86 files changed, 127 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/client/RingCache.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/client/RingCache.java b/src/java/org/apache/cassandra/client/RingCache.java index 1a9ff0b..094cf4f 100644 --- a/src/java/org/apache/cassandra/client/RingCache.java +++ b/src/java/org/apache/cassandra/client/RingCache.java @@ -28,7 +28,6 @@ import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.hadoop.ConfigHelper; import org.apache.cassandra.thrift.Cassandra; -import org.apache.cassandra.thrift.InvalidRequestException; import org.apache.cassandra.thrift.TokenRange; import org.apache.hadoop.conf.Configuration; import org.apache.thrift.TException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/cql3/ResultSet.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/ResultSet.java b/src/java/org/apache/cassandra/cql3/ResultSet.java index c8c3869..75a9c8e 100644 --- a/src/java/org/apache/cassandra/cql3/ResultSet.java +++ b/src/java/org/apache/cassandra/cql3/ResultSet.java @@ -24,7 +24,6 @@ import io.netty.buffer.ByteBuf; import org.apache.cassandra.transport.*; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.LongType; import org.apache.cassandra.db.marshal.ReversedType; import org.apache.cassandra.thrift.Column; import org.apache.cassandra.thrift.CqlMetadata; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/cql3/UntypedResultSet.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/UntypedResultSet.java b/src/java/org/apache/cassandra/cql3/UntypedResultSet.java index 64fd60d..657d536 100644 --- a/src/java/org/apache/cassandra/cql3/UntypedResultSet.java +++ b/src/java/org/apache/cassandra/cql3/UntypedResultSet.java @@ -26,7 +26,6 @@ import com.google.common.collect.AbstractIterator; import org.apache.cassandra.cql3.statements.SelectStatement; import org.apache.cassandra.db.marshal.*; -import org.apache.cassandra.exceptions.*; import org.apache.cassandra.service.pager.QueryPager; /** a utility for doing internal cql-based queries */ http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/cql3/functions/Function.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/functions/Function.java b/src/java/org/apache/cassandra/cql3/functions/Function.java index 4d2b993..1b7952a 100644 --- a/src/java/org/apache/cassandra/cql3/functions/Function.java +++ b/src/java/org/apache/cassandra/cql3/functions/Function.java @@ -21,7 +21,6 @@ import java.util.List; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.exceptions.InvalidRequestException; import org.github.jamm.Unmetered; @Unmetered http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/cql3/functions/UDHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/functions/UDHelper.java b/src/java/org/apache/cassandra/cql3/functions/UDHelper.java index f4b3809..af62c5a 100644 --- a/src/java/org/apache/cassandra/cql3/functions/UDHelper.java +++ b/src/java/org/apache/cassandra/cql3/functions/UDHelper.java @@ -20,7 +20,6 @@ package org.apache.cassandra.cql3.functions; import java.lang.invoke.MethodHandle; import java.lang.invoke.MethodHandles; import java.lang.reflect.Method; -import java.nio.ByteBuffer; import java.util.*; import org.slf4j.Logger; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java b/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java index 44a9e68..4acd34b 100644 --- a/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java +++ b/src/java/org/apache/cassandra/cql3/restrictions/SingleColumnRestriction.java @@ -19,10 +19,7 @@ package org.apache.cassandra.cql3.restrictions; import java.nio.ByteBuffer; import java.util.ArrayList; -import java.util.Arrays; import java.util.Collections; -import java.util.Deque; -import java.util.LinkedList; import java.util.List; import org.apache.cassandra.config.ColumnDefinition; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java index 4ae31d6..c940660 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java +++ b/src/java/org/apache/cassandra/cql3/statements/CreateIndexStatement.java @@ -29,7 +29,6 @@ import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.config.IndexType; import org.apache.cassandra.config.Schema; -import org.apache.cassandra.db.index.SecondaryIndex; import org.apache.cassandra.db.marshal.MapType; import org.apache.cassandra.exceptions.*; import org.apache.cassandra.cql3.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/AbstractCell.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/AbstractCell.java b/src/java/org/apache/cassandra/db/AbstractCell.java index de86126..814b8c6 100644 --- a/src/java/org/apache/cassandra/db/AbstractCell.java +++ b/src/java/org/apache/cassandra/db/AbstractCell.java @@ -30,7 +30,6 @@ import org.apache.cassandra.db.composites.CellName; import org.apache.cassandra.db.composites.CellNameType; import org.apache.cassandra.db.context.CounterContext; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.Version; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.FBUtilities; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/AtomDeserializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/AtomDeserializer.java b/src/java/org/apache/cassandra/db/AtomDeserializer.java index c71321c..74f1946 100644 --- a/src/java/org/apache/cassandra/db/AtomDeserializer.java +++ b/src/java/org/apache/cassandra/db/AtomDeserializer.java @@ -23,7 +23,6 @@ import java.io.IOException; import org.apache.cassandra.db.composites.CellName; import org.apache.cassandra.db.composites.CellNameType; import org.apache.cassandra.db.composites.Composite; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.Version; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/CollationController.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/CollationController.java b/src/java/org/apache/cassandra/db/CollationController.java index e7bbd3e..d266351 100644 --- a/src/java/org/apache/cassandra/db/CollationController.java +++ b/src/java/org/apache/cassandra/db/CollationController.java @@ -28,11 +28,9 @@ import com.google.common.base.Function; import com.google.common.collect.Iterables; import com.google.common.collect.Iterators; -import net.nicoulaj.compilecommand.annotations.Inline; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.concurrent.StageManager; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; -import org.apache.cassandra.db.compaction.SizeTieredCompactionStrategy; import org.apache.cassandra.db.composites.CellName; import org.apache.cassandra.db.filter.NamesQueryFilter; import org.apache.cassandra.db.filter.QueryFilter; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java b/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java index 29866d6..928c21f 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java @@ -24,7 +24,6 @@ import java.util.UUID; import org.apache.cassandra.config.Schema; import org.apache.cassandra.io.ISSTableSerializer; import org.apache.cassandra.io.IVersionedSerializer; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.Version; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.net.MessagingService; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/ConsistencyLevel.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ConsistencyLevel.java b/src/java/org/apache/cassandra/db/ConsistencyLevel.java index 18a469f..d49d66a 100644 --- a/src/java/org/apache/cassandra/db/ConsistencyLevel.java +++ b/src/java/org/apache/cassandra/db/ConsistencyLevel.java @@ -25,7 +25,6 @@ import java.util.List; import java.util.Map; import com.google.common.collect.Iterables; -import net.nicoulaj.compilecommand.annotations.Inline; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/Directories.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Directories.java b/src/java/org/apache/cassandra/db/Directories.java index fa9b320..3246647 100644 --- a/src/java/org/apache/cassandra/db/Directories.java +++ b/src/java/org/apache/cassandra/db/Directories.java @@ -48,7 +48,6 @@ import org.apache.cassandra.io.FSError; import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.sstable.*; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/OnDiskAtom.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/OnDiskAtom.java b/src/java/org/apache/cassandra/db/OnDiskAtom.java index f97ca42..f5eddb9 100644 --- a/src/java/org/apache/cassandra/db/OnDiskAtom.java +++ b/src/java/org/apache/cassandra/db/OnDiskAtom.java @@ -25,7 +25,6 @@ import org.apache.cassandra.db.composites.CellName; import org.apache.cassandra.db.composites.CellNameType; import org.apache.cassandra.db.composites.Composite; import org.apache.cassandra.io.ISSTableSerializer; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.Version; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.serializers.MarshalException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/RangeTombstone.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/RangeTombstone.java b/src/java/org/apache/cassandra/db/RangeTombstone.java index 4a0037b..c69ea8c 100644 --- a/src/java/org/apache/cassandra/db/RangeTombstone.java +++ b/src/java/org/apache/cassandra/db/RangeTombstone.java @@ -26,7 +26,6 @@ import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.composites.CType; import org.apache.cassandra.db.composites.Composite; import org.apache.cassandra.io.ISSTableSerializer; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.Version; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.util.DataOutputPlus; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java index f88fe92..16b5fac 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactedRow.java @@ -24,7 +24,6 @@ import java.security.MessageDigest; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.RowIndexEntry; import org.apache.cassandra.io.sstable.ColumnStats; -import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.io.util.SequentialWriter; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java index dfbdc22..08897b3 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java @@ -18,7 +18,6 @@ package org.apache.cassandra.db.compaction; import java.io.File; -import java.io.IOException; import java.util.Arrays; import java.util.Collection; import java.util.HashMap; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java index cbc65f4..94bb802 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java @@ -38,7 +38,6 @@ import org.apache.cassandra.db.RowPosition; import org.apache.cassandra.dht.Bounds; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.io.sstable.*; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.Pair; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/compaction/Upgrader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/Upgrader.java b/src/java/org/apache/cassandra/db/compaction/Upgrader.java index 52739de..7badd30 100644 --- a/src/java/org/apache/cassandra/db/compaction/Upgrader.java +++ b/src/java/org/apache/cassandra/db/compaction/Upgrader.java @@ -30,7 +30,6 @@ import org.apache.cassandra.io.sstable.*; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; -import org.apache.cassandra.utils.CloseableIterator; import org.apache.cassandra.utils.OutputHandler; public class Upgrader http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/composites/AbstractCType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/composites/AbstractCType.java b/src/java/org/apache/cassandra/db/composites/AbstractCType.java index 1df73fe..a982280 100644 --- a/src/java/org/apache/cassandra/db/composites/AbstractCType.java +++ b/src/java/org/apache/cassandra/db/composites/AbstractCType.java @@ -26,13 +26,11 @@ import org.apache.cassandra.db.Cell; import org.apache.cassandra.db.DeletionInfo; import org.apache.cassandra.db.NativeCell; import org.apache.cassandra.db.RangeTombstone; -import org.apache.cassandra.db.RowIndexEntry; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.filter.ColumnSlice; import org.apache.cassandra.db.filter.SliceQueryFilter; import org.apache.cassandra.db.marshal.AbstractCompositeType; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.io.ISerializer; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.utils.ByteBufferUtil; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/composites/CType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/composites/CType.java b/src/java/org/apache/cassandra/db/composites/CType.java index 3844342..7f70313 100644 --- a/src/java/org/apache/cassandra/db/composites/CType.java +++ b/src/java/org/apache/cassandra/db/composites/CType.java @@ -24,7 +24,6 @@ import java.util.Comparator; import org.apache.cassandra.db.DeletionInfo; import org.apache.cassandra.db.RangeTombstone; -import org.apache.cassandra.db.RowIndexEntry; import org.apache.cassandra.db.filter.ColumnSlice; import org.apache.cassandra.db.filter.SliceQueryFilter; import org.apache.cassandra.db.marshal.AbstractType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java index 453191e..f984f96 100644 --- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java +++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java @@ -38,7 +38,6 @@ import org.apache.cassandra.db.composites.Composite; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.io.util.FileDataInput; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.tracing.Tracing; public class SliceQueryFilter implements IDiskAtomFilter http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java index 93e0643..b9ccd8e 100644 --- a/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java +++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java @@ -18,14 +18,12 @@ package org.apache.cassandra.db.index; import java.nio.ByteBuffer; -import java.nio.charset.CharacterCodingException; import java.util.*; import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.ExtendedFilter; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.tracing.Tracing; -import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; public abstract class SecondaryIndexSearcher http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/dht/ExcludingBounds.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/dht/ExcludingBounds.java b/src/java/org/apache/cassandra/dht/ExcludingBounds.java index f4f313d..8a89d14 100644 --- a/src/java/org/apache/cassandra/dht/ExcludingBounds.java +++ b/src/java/org/apache/cassandra/dht/ExcludingBounds.java @@ -21,7 +21,6 @@ import java.util.Collections; import java.util.List; import org.apache.cassandra.db.RowPosition; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.Pair; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java index c5489c6..2990bf3 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java @@ -18,7 +18,6 @@ package org.apache.cassandra.hadoop; -import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; import org.apache.cassandra.thrift.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java index 69504b1..b956e23 100644 --- a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java +++ b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java @@ -26,7 +26,6 @@ import java.util.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.io.compress.CompressionParameters; import org.apache.cassandra.thrift.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/ISSTableSerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/ISSTableSerializer.java b/src/java/org/apache/cassandra/io/ISSTableSerializer.java index 2834662..96a38ac 100644 --- a/src/java/org/apache/cassandra/io/ISSTableSerializer.java +++ b/src/java/org/apache/cassandra/io/ISSTableSerializer.java @@ -20,7 +20,6 @@ package org.apache.cassandra.io; import java.io.DataInput; import java.io.IOException; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.Version; import org.apache.cassandra.io.util.DataOutputPlus; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/compress/LZ4Compressor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/compress/LZ4Compressor.java b/src/java/org/apache/cassandra/io/compress/LZ4Compressor.java index f458cb6..f32f266 100644 --- a/src/java/org/apache/cassandra/io/compress/LZ4Compressor.java +++ b/src/java/org/apache/cassandra/io/compress/LZ4Compressor.java @@ -26,7 +26,6 @@ import java.util.Set; import net.jpountz.lz4.LZ4Exception; import net.jpountz.lz4.LZ4Factory; -import org.apache.cassandra.utils.FastByteOperations; public class LZ4Compressor implements ICompressor { http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java b/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java index f5a2062..0094042 100644 --- a/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java +++ b/src/java/org/apache/cassandra/io/compress/SnappyCompressor.java @@ -23,7 +23,6 @@ import java.util.Collections; import java.util.Map; import java.util.Set; -import org.apache.cassandra.utils.ByteBufferUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.xerial.snappy.Snappy; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/sstable/Descriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/Descriptor.java b/src/java/org/apache/cassandra/io/sstable/Descriptor.java index 03522c3..9f259fe 100644 --- a/src/java/org/apache/cassandra/io/sstable/Descriptor.java +++ b/src/java/org/apache/cassandra/io/sstable/Descriptor.java @@ -33,7 +33,6 @@ import org.apache.cassandra.io.sstable.metadata.IMetadataSerializer; import org.apache.cassandra.io.sstable.metadata.LegacyMetadataSerializer; import org.apache.cassandra.io.sstable.metadata.MetadataSerializer; import org.apache.cassandra.utils.Pair; -import org.apache.commons.lang.StringUtils; import static org.apache.cassandra.io.sstable.Component.separator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/sstable/IndexHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/IndexHelper.java b/src/java/org/apache/cassandra/io/sstable/IndexHelper.java index 4518e23..3d304c5 100644 --- a/src/java/org/apache/cassandra/io/sstable/IndexHelper.java +++ b/src/java/org/apache/cassandra/io/sstable/IndexHelper.java @@ -18,7 +18,6 @@ package org.apache.cassandra.io.sstable; import java.io.*; -import java.util.ArrayList; import java.util.Collections; import java.util.Comparator; import java.util.List; @@ -29,7 +28,6 @@ import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.io.ISerializer; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.io.util.FileDataInput; -import org.apache.cassandra.io.util.FileMark; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.utils.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java index 2a1b66f..99f69b8 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableLoader.java @@ -27,7 +27,6 @@ import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java index 4c2e409..ff75e0d 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java @@ -27,7 +27,6 @@ import java.util.concurrent.SynchronousQueue; import com.google.common.base.Throwables; import org.apache.cassandra.config.CFMetaData; -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.ArrayBackedSortedColumns; import org.apache.cassandra.db.Cell; import org.apache.cassandra.db.ColumnFamily; @@ -36,9 +35,7 @@ import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.io.compress.CompressionParameters; -import org.apache.cassandra.io.sstable.format.SSTableFormat; import org.apache.cassandra.io.sstable.format.SSTableWriter; -import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.utils.JVMStabilityInspector; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java index fc346d1..4fcbc31 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java +++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableReader.java @@ -40,7 +40,6 @@ import org.apache.cassandra.io.util.FileDataInput; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.Pair; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java index 868ee9f..8b9a88f 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/format/big/BigTableWriter.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.io.sstable.format.big; -import java.io.Closeable; import java.io.DataInput; import java.io.File; import java.io.FileOutputStream; @@ -34,7 +33,6 @@ import org.apache.cassandra.io.sstable.*; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.io.sstable.format.Version; -import org.apache.cassandra.io.util.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -54,8 +52,6 @@ import org.apache.cassandra.io.util.FileMark; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.SegmentedFile; import org.apache.cassandra.io.util.SequentialWriter; -import org.apache.cassandra.service.ActiveRepairService; -import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.FilterFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/sstable/metadata/CompactionMetadata.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/CompactionMetadata.java b/src/java/org/apache/cassandra/io/sstable/metadata/CompactionMetadata.java index dd879c4..ed1f327 100644 --- a/src/java/org/apache/cassandra/io/sstable/metadata/CompactionMetadata.java +++ b/src/java/org/apache/cassandra/io/sstable/metadata/CompactionMetadata.java @@ -26,7 +26,6 @@ import com.clearspring.analytics.stream.cardinality.HyperLogLogPlus; import com.clearspring.analytics.stream.cardinality.ICardinality; import org.apache.cassandra.db.TypeSizes; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.Version; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.utils.ByteBufferUtil; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/sstable/metadata/IMetadataComponentSerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/IMetadataComponentSerializer.java b/src/java/org/apache/cassandra/io/sstable/metadata/IMetadataComponentSerializer.java index 018d4a0..dc8fbdf 100644 --- a/src/java/org/apache/cassandra/io/sstable/metadata/IMetadataComponentSerializer.java +++ b/src/java/org/apache/cassandra/io/sstable/metadata/IMetadataComponentSerializer.java @@ -20,7 +20,6 @@ package org.apache.cassandra.io.sstable.metadata; import java.io.DataInput; import java.io.IOException; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.Version; import org.apache.cassandra.io.util.DataOutputPlus; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java b/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java index a501518..f2eb1af 100644 --- a/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java +++ b/src/java/org/apache/cassandra/io/sstable/metadata/StatsMetadata.java @@ -29,7 +29,6 @@ import org.apache.commons.lang3.builder.HashCodeBuilder; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.commitlog.ReplayPosition; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.EstimatedHistogram; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/sstable/metadata/ValidationMetadata.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/ValidationMetadata.java b/src/java/org/apache/cassandra/io/sstable/metadata/ValidationMetadata.java index aed6820..603732b 100644 --- a/src/java/org/apache/cassandra/io/sstable/metadata/ValidationMetadata.java +++ b/src/java/org/apache/cassandra/io/sstable/metadata/ValidationMetadata.java @@ -21,7 +21,6 @@ import java.io.DataInput; import java.io.IOException; import org.apache.cassandra.db.TypeSizes; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.Version; import org.apache.cassandra.io.util.DataOutputPlus; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/util/FileDataInput.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/FileDataInput.java b/src/java/org/apache/cassandra/io/util/FileDataInput.java index 55809ad..d94075c 100644 --- a/src/java/org/apache/cassandra/io/util/FileDataInput.java +++ b/src/java/org/apache/cassandra/io/util/FileDataInput.java @@ -20,7 +20,6 @@ package org.apache.cassandra.io.util; import java.io.Closeable; import java.io.DataInput; import java.io.IOException; -import java.io.InputStream; import java.nio.ByteBuffer; public interface FileDataInput extends DataInput, Closeable http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/util/FileUtils.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/FileUtils.java b/src/java/org/apache/cassandra/io/util/FileUtils.java index 837cc6a..ef9d23b 100644 --- a/src/java/org/apache/cassandra/io/util/FileUtils.java +++ b/src/java/org/apache/cassandra/io/util/FileUtils.java @@ -19,7 +19,6 @@ package org.apache.cassandra.io.util; import java.io.*; import java.nio.ByteBuffer; -import java.nio.MappedByteBuffer; import java.nio.file.AtomicMoveNotSupportedException; import java.nio.file.Files; import java.nio.file.Path; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java index 6f2def0..bf120a3 100644 --- a/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java +++ b/src/java/org/apache/cassandra/io/util/MmappedSegmentedFile.java @@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.utils.JVMStabilityInspector; -import sun.nio.ch.DirectBuffer; public class MmappedSegmentedFile extends SegmentedFile { http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/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 be685cd..847f667 100644 --- a/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java +++ b/src/java/org/apache/cassandra/repair/RepairMessageVerbHandler.java @@ -18,7 +18,6 @@ package org.apache.cassandra.repair; import java.util.ArrayList; -import java.util.Collection; import java.util.Collections; import java.util.List; import java.util.Set; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/repair/RepairSession.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/repair/RepairSession.java b/src/java/org/apache/cassandra/repair/RepairSession.java index 9a8f645..98da14f 100644 --- a/src/java/org/apache/cassandra/repair/RepairSession.java +++ b/src/java/org/apache/cassandra/repair/RepairSession.java @@ -22,7 +22,6 @@ import java.net.InetAddress; import java.util.*; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; -import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/service/QueryState.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/QueryState.java b/src/java/org/apache/cassandra/service/QueryState.java index 9a709ff..e5c21f4 100644 --- a/src/java/org/apache/cassandra/service/QueryState.java +++ b/src/java/org/apache/cassandra/service/QueryState.java @@ -21,7 +21,6 @@ import java.util.UUID; import java.util.concurrent.ThreadLocalRandom; import org.apache.cassandra.tracing.Tracing; -import org.apache.cassandra.utils.FBUtilities; /** * Represents the state related to a given query. http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/service/ReadCallback.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/ReadCallback.java b/src/java/org/apache/cassandra/service/ReadCallback.java index 9371568..40ccf86 100644 --- a/src/java/org/apache/cassandra/service/ReadCallback.java +++ b/src/java/org/apache/cassandra/service/ReadCallback.java @@ -34,10 +34,8 @@ import org.apache.cassandra.db.ReadCommand; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.exceptions.ReadFailureException; import org.apache.cassandra.exceptions.ReadTimeoutException; -import org.apache.cassandra.exceptions.RequestExecutionException; import org.apache.cassandra.exceptions.UnavailableException; import org.apache.cassandra.metrics.ReadRepairMetrics; -import org.apache.cassandra.net.IAsyncCallback; import org.apache.cassandra.net.IAsyncCallbackWithFailure; import org.apache.cassandra.net.MessageIn; import org.apache.cassandra.net.MessageOut; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java index 05c05b1..745beee 100644 --- a/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java +++ b/src/java/org/apache/cassandra/service/pager/SliceQueryPager.java @@ -22,7 +22,6 @@ import java.util.Collections; import java.util.List; import org.apache.cassandra.db.*; -import org.apache.cassandra.db.composites.CellName; import org.apache.cassandra.db.composites.Composite; import org.apache.cassandra.db.filter.SliceQueryFilter; import org.apache.cassandra.exceptions.RequestValidationException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/streaming/StreamReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamReader.java b/src/java/org/apache/cassandra/streaming/StreamReader.java index 6144afb..0f3ebb3 100644 --- a/src/java/org/apache/cassandra/streaming/StreamReader.java +++ b/src/java/org/apache/cassandra/streaming/StreamReader.java @@ -27,7 +27,6 @@ import com.google.common.base.Throwables; import org.apache.cassandra.io.sstable.format.SSTableFormat; import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.io.sstable.format.Version; -import org.apache.cassandra.io.util.FileUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java index 0efcc93..d018786 100644 --- a/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java +++ b/src/java/org/apache/cassandra/streaming/StreamReceiveTask.java @@ -33,8 +33,6 @@ import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.SSTableWriter; -import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/streaming/compress/CompressedInputStream.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/compress/CompressedInputStream.java b/src/java/org/apache/cassandra/streaming/compress/CompressedInputStream.java index 54f6eda..872afcd 100644 --- a/src/java/org/apache/cassandra/streaming/compress/CompressedInputStream.java +++ b/src/java/org/apache/cassandra/streaming/compress/CompressedInputStream.java @@ -25,14 +25,12 @@ import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; import java.util.concurrent.ThreadLocalRandom; import java.util.zip.Adler32; -import java.util.zip.CRC32; import java.util.zip.Checksum; import com.google.common.collect.Iterators; import com.google.common.primitives.Ints; import org.apache.cassandra.io.compress.CompressionMetadata; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.WrappedRunnable; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/tools/NodeProbe.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java index a6ab091..8aa5992 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -25,14 +25,11 @@ import java.lang.management.MemoryUsage; import java.lang.management.RuntimeMXBean; import java.net.InetAddress; import java.net.UnknownHostException; -import java.text.SimpleDateFormat; import java.util.*; import java.util.Map.Entry; import java.util.concurrent.*; -import java.util.concurrent.locks.Condition; import javax.management.*; import javax.management.openmbean.CompositeData; -import javax.management.remote.JMXConnectionNotification; import javax.management.remote.JMXConnector; import javax.management.remote.JMXConnectorFactory; import javax.management.remote.JMXServiceURL; @@ -42,7 +39,6 @@ import com.google.common.base.Function; import com.google.common.collect.*; import com.google.common.util.concurrent.Uninterruptibles; -import com.google.common.util.concurrent.AbstractFuture; import com.yammer.metrics.reporting.JmxReporter; import org.apache.cassandra.concurrent.JMXEnabledThreadPoolExecutorMBean; import org.apache.cassandra.db.ColumnFamilyStoreMBean; @@ -58,13 +54,10 @@ import org.apache.cassandra.locator.EndpointSnitchInfoMBean; import org.apache.cassandra.metrics.ColumnFamilyMetrics.Sampler; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.MessagingServiceMBean; -import org.apache.cassandra.repair.RepairParallelism; import org.apache.cassandra.service.*; import org.apache.cassandra.streaming.StreamState; import org.apache.cassandra.streaming.StreamManagerMBean; import org.apache.cassandra.streaming.management.StreamStateCompositeData; -import org.apache.cassandra.utils.concurrent.SimpleCondition; -import org.apache.cassandra.utils.JVMStabilityInspector; /** * JMX client operations for Cassandra. http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/tracing/Tracing.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tracing/Tracing.java b/src/java/org/apache/cassandra/tracing/Tracing.java index 930f024..12a943e 100644 --- a/src/java/org/apache/cassandra/tracing/Tracing.java +++ b/src/java/org/apache/cassandra/tracing/Tracing.java @@ -36,8 +36,6 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.*; import org.apache.cassandra.db.marshal.TimeUUIDType; import org.apache.cassandra.exceptions.OverloadedException; -import org.apache.cassandra.exceptions.UnavailableException; -import org.apache.cassandra.exceptions.WriteTimeoutException; import org.apache.cassandra.net.MessageIn; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.service.StorageProxy; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java index 723beed..f9d3a13 100644 --- a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java @@ -26,7 +26,6 @@ import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.ResultSet; import org.apache.cassandra.cql3.statements.SelectStatement; import org.apache.cassandra.cql3.statements.ParsedStatement; -import org.apache.cassandra.service.pager.PagingState; import org.apache.cassandra.transport.*; import org.apache.cassandra.thrift.CqlPreparedResult; import org.apache.cassandra.thrift.CqlResult; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/utils/FBUtilities.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java b/src/java/org/apache/cassandra/utils/FBUtilities.java index c9024ec..64e4987 100644 --- a/src/java/org/apache/cassandra/utils/FBUtilities.java +++ b/src/java/org/apache/cassandra/utils/FBUtilities.java @@ -33,7 +33,6 @@ import java.util.zip.Checksum; import com.google.common.base.Joiner; import com.google.common.collect.AbstractIterator; -import com.google.common.primitives.Ints; import org.apache.commons.lang3.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,7 +47,6 @@ import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.io.IVersionedSerializer; -import org.apache.cassandra.io.compress.CompressedRandomAccessReader; import org.apache.cassandra.io.compress.CompressionParameters; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.io.util.FileUtils; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/src/java/org/apache/cassandra/utils/MurmurHash.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/MurmurHash.java b/src/java/org/apache/cassandra/utils/MurmurHash.java index 8d17ea9..9dcde6d 100644 --- a/src/java/org/apache/cassandra/utils/MurmurHash.java +++ b/src/java/org/apache/cassandra/utils/MurmurHash.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.utils; -import net.nicoulaj.compilecommand.annotations.Inline; - import java.nio.ByteBuffer; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/long/org/apache/cassandra/concurrent/LongSharedExecutorPoolTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/concurrent/LongSharedExecutorPoolTest.java b/test/long/org/apache/cassandra/concurrent/LongSharedExecutorPoolTest.java index 0fd53bb..b44c234 100644 --- a/test/long/org/apache/cassandra/concurrent/LongSharedExecutorPoolTest.java +++ b/test/long/org/apache/cassandra/concurrent/LongSharedExecutorPoolTest.java @@ -17,9 +17,7 @@ */ package org.apache.cassandra.concurrent; -import java.util.ArrayList; import java.util.BitSet; -import java.util.List; import java.util.TreeSet; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/long/org/apache/cassandra/cql3/CorruptionTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/cql3/CorruptionTest.java b/test/long/org/apache/cassandra/cql3/CorruptionTest.java index 1a42112..43cf5e0 100644 --- a/test/long/org/apache/cassandra/cql3/CorruptionTest.java +++ b/test/long/org/apache/cassandra/cql3/CorruptionTest.java @@ -28,7 +28,6 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.TimeUnit; -import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/pig/org/apache/pig/test/MiniCluster.java ---------------------------------------------------------------------- diff --git a/test/pig/org/apache/pig/test/MiniCluster.java b/test/pig/org/apache/pig/test/MiniCluster.java index aa03861..95acb84 100644 --- a/test/pig/org/apache/pig/test/MiniCluster.java +++ b/test/pig/org/apache/pig/test/MiniCluster.java @@ -21,7 +21,6 @@ import java.io.File; import java.io.FileOutputStream; import java.io.IOException; import java.io.OutputStream; -import java.util.Locale; import org.apache.cassandra.utils.FBUtilities; import org.apache.hadoop.conf.Configuration; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/SchemaLoader.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/SchemaLoader.java b/test/unit/org/apache/cassandra/SchemaLoader.java index 2be4cc0..f7b10a2 100644 --- a/test/unit/org/apache/cassandra/SchemaLoader.java +++ b/test/unit/org/apache/cassandra/SchemaLoader.java @@ -21,7 +21,6 @@ import java.io.File; import java.nio.ByteBuffer; import java.util.*; -import org.junit.AfterClass; import org.junit.BeforeClass; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/config/KSMetaDataTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/config/KSMetaDataTest.java b/test/unit/org/apache/cassandra/config/KSMetaDataTest.java index 3d90bef..39be913 100644 --- a/test/unit/org/apache/cassandra/config/KSMetaDataTest.java +++ b/test/unit/org/apache/cassandra/config/KSMetaDataTest.java @@ -19,7 +19,6 @@ package org.apache.cassandra.config; -import java.util.Collections; import java.util.HashMap; import java.util.Map; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/cql3/BatchTests.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/BatchTests.java b/test/unit/org/apache/cassandra/cql3/BatchTests.java index 4905233..95fe612 100644 --- a/test/unit/org/apache/cassandra/cql3/BatchTests.java +++ b/test/unit/org/apache/cassandra/cql3/BatchTests.java @@ -29,7 +29,6 @@ import org.junit.BeforeClass; import org.junit.Test; import java.io.IOException; -import java.util.concurrent.TimeUnit; public class BatchTests { http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/cql3/DeleteTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/DeleteTest.java b/test/unit/org/apache/cassandra/cql3/DeleteTest.java index c8aa660..812d729 100644 --- a/test/unit/org/apache/cassandra/cql3/DeleteTest.java +++ b/test/unit/org/apache/cassandra/cql3/DeleteTest.java @@ -25,15 +25,12 @@ import com.datastax.driver.core.Session; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.config.Schema; -import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.service.EmbeddedCassandraService; import org.junit.Assert; import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; -import java.io.IOException; - public class DeleteTest extends SchemaLoader { private static EmbeddedCassandraService cassandra; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/cql3/SecondaryIndexOnMapEntriesTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/SecondaryIndexOnMapEntriesTest.java b/test/unit/org/apache/cassandra/cql3/SecondaryIndexOnMapEntriesTest.java index fa40e0a..e502f6a 100644 --- a/test/unit/org/apache/cassandra/cql3/SecondaryIndexOnMapEntriesTest.java +++ b/test/unit/org/apache/cassandra/cql3/SecondaryIndexOnMapEntriesTest.java @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/cql3/TypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/TypeTest.java b/test/unit/org/apache/cassandra/cql3/TypeTest.java index ec82d41..7e12f9f 100644 --- a/test/unit/org/apache/cassandra/cql3/TypeTest.java +++ b/test/unit/org/apache/cassandra/cql3/TypeTest.java @@ -17,10 +17,8 @@ */ package org.apache.cassandra.cql3; -import org.apache.cassandra.exceptions.ConfigurationException; import org.junit.Test; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; public class TypeTest extends CQLTester http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/db/CommitLogTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/CommitLogTest.java b/test/unit/org/apache/cassandra/db/CommitLogTest.java index 33795f1..528cbdb 100644 --- a/test/unit/org/apache/cassandra/db/CommitLogTest.java +++ b/test/unit/org/apache/cassandra/db/CommitLogTest.java @@ -44,7 +44,6 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.db.composites.CellNameType; import org.apache.cassandra.db.filter.NamesQueryFilter; -import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.service.StorageService; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/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 6b4c636..8d75b9a 100644 --- a/test/unit/org/apache/cassandra/db/CounterCellTest.java +++ b/test/unit/org/apache/cassandra/db/CounterCellTest.java @@ -29,7 +29,6 @@ import java.util.Arrays; import org.junit.Assert; import org.junit.Test; -import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.Util; import org.apache.cassandra.db.composites.CellNameType; import org.apache.cassandra.db.composites.SimpleDenseCellNameType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java b/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java index 08dcf24..1abd158 100644 --- a/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java +++ b/test/unit/org/apache/cassandra/db/SecondaryIndexCellSizeTest.java @@ -31,7 +31,6 @@ import org.apache.cassandra.db.index.SecondaryIndexSearcher; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.concurrent.OpOrder; -import org.apache.cassandra.utils.memory.MemtableAllocator; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/gms/SerializationsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/gms/SerializationsTest.java b/test/unit/org/apache/cassandra/gms/SerializationsTest.java index 6317a98..a773ccf 100644 --- a/test/unit/org/apache/cassandra/gms/SerializationsTest.java +++ b/test/unit/org/apache/cassandra/gms/SerializationsTest.java @@ -26,7 +26,6 @@ import org.apache.cassandra.utils.FBUtilities; import org.junit.Test; import java.io.DataInputStream; -import java.io.DataOutputStream; import java.io.IOException; import java.net.InetAddress; import java.util.ArrayList; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/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 04396e0..5df0b29 100644 --- a/test/unit/org/apache/cassandra/io/compress/CompressorTest.java +++ b/test/unit/org/apache/cassandra/io/compress/CompressorTest.java @@ -28,7 +28,6 @@ import com.google.common.io.Files; import org.apache.cassandra.io.compress.ICompressor.WrappedArray; import org.junit.Assert; -import org.junit.Before; import org.junit.Test; import static org.junit.Assert.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java index 7993160..f14bf75 100644 --- a/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java +++ b/test/unit/org/apache/cassandra/io/util/BufferedRandomAccessFileTest.java @@ -33,7 +33,6 @@ import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; -import java.util.concurrent.atomic.AtomicInteger; import static org.apache.cassandra.Util.expectEOF; import static org.apache.cassandra.Util.expectException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java b/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java index 714520e..d9a4ef1 100644 --- a/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java +++ b/test/unit/org/apache/cassandra/locator/CloudstackSnitchTest.java @@ -19,11 +19,9 @@ package org.apache.cassandra.locator; import java.io.IOException; import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.Map; import org.junit.AfterClass; -import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -32,8 +30,6 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.gms.ApplicationState; import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.gms.VersionedValue; -import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.net.OutboundTcpConnectionPool; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.db.Keyspace; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java b/test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java index 70080a8..54ea722 100644 --- a/test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java +++ b/test/unit/org/apache/cassandra/locator/GoogleCloudSnitchTest.java @@ -23,11 +23,9 @@ package org.apache.cassandra.locator; import java.io.IOException; import java.net.InetAddress; -import java.net.UnknownHostException; import java.util.Map; import org.junit.AfterClass; -import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; @@ -37,8 +35,6 @@ import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.gms.ApplicationState; import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.gms.VersionedValue; -import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.net.OutboundTcpConnectionPool; import org.apache.cassandra.service.StorageService; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/repair/ValidatorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/repair/ValidatorTest.java b/test/unit/org/apache/cassandra/repair/ValidatorTest.java index 74d1ad3..615167c 100644 --- a/test/unit/org/apache/cassandra/repair/ValidatorTest.java +++ b/test/unit/org/apache/cassandra/repair/ValidatorTest.java @@ -39,7 +39,6 @@ import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.sstable.ColumnStats; -import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.net.MessageIn; import org.apache.cassandra.net.MessageOut; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/service/SerializationsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/SerializationsTest.java b/test/unit/org/apache/cassandra/service/SerializationsTest.java index 35e598a..6f42667 100644 --- a/test/unit/org/apache/cassandra/service/SerializationsTest.java +++ b/test/unit/org/apache/cassandra/service/SerializationsTest.java @@ -19,7 +19,6 @@ package org.apache.cassandra.service; import java.io.DataInputStream; -import java.io.DataOutputStream; import java.io.IOException; import java.net.InetAddress; import java.util.Collections; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java index d3685d9..0c1c9ae 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java @@ -22,7 +22,6 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.CancellationException; import java.util.concurrent.Future; -import java.util.concurrent.ScheduledFuture; import java.util.concurrent.TimeUnit; import org.apache.cassandra.io.sstable.format.SSTableReader; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/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 4180a8c..bc886f4 100644 --- a/test/unit/org/apache/cassandra/utils/BloomFilterTest.java +++ b/test/unit/org/apache/cassandra/utils/BloomFilterTest.java @@ -20,7 +20,6 @@ package org.apache.cassandra.utils; import java.io.ByteArrayInputStream; import java.io.DataInputStream; -import java.io.DataOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/utils/ByteBufferUtilTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/ByteBufferUtilTest.java b/test/unit/org/apache/cassandra/utils/ByteBufferUtilTest.java index 44cb20d..2cbac92 100644 --- a/test/unit/org/apache/cassandra/utils/ByteBufferUtilTest.java +++ b/test/unit/org/apache/cassandra/utils/ByteBufferUtilTest.java @@ -23,9 +23,7 @@ import static org.junit.Assert.assertEquals; import java.io.IOException; import java.io.DataInputStream; -import java.io.DataOutputStream; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; import java.util.Arrays; @@ -33,7 +31,6 @@ import java.util.Arrays; import org.junit.Test; import org.apache.cassandra.io.util.DataOutputBuffer; -import org.apache.cassandra.io.util.FastByteArrayOutputStream; public class ByteBufferUtilTest { http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java b/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java index ff8188f..2ecbee4 100644 --- a/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java +++ b/test/unit/org/apache/cassandra/utils/JVMStabilityInspectorTest.java @@ -22,14 +22,9 @@ import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.FSReadError; import org.junit.Test; -import java.io.File; -import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.IOException; -import java.net.ServerSocket; -import java.net.Socket; import java.net.SocketException; -import java.util.ArrayList; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java b/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java index a9e051e..8d6e272 100644 --- a/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java +++ b/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java @@ -23,7 +23,6 @@ import java.util.*; import com.google.common.collect.AbstractIterator; import com.google.common.io.ByteArrayDataInput; -import com.google.common.io.ByteArrayDataOutput; import com.google.common.io.ByteStreams; import org.junit.Before; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/utils/SerializationsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/SerializationsTest.java b/test/unit/org/apache/cassandra/utils/SerializationsTest.java index 976a3eb..46fa017 100644 --- a/test/unit/org/apache/cassandra/utils/SerializationsTest.java +++ b/test/unit/org/apache/cassandra/utils/SerializationsTest.java @@ -25,7 +25,6 @@ import org.apache.cassandra.service.StorageService; import org.junit.Test; import java.io.DataInputStream; -import java.io.DataOutputStream; import java.io.IOException; public class SerializationsTest extends AbstractSerializationsTester http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/utils/StreamingHistogramTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/StreamingHistogramTest.java b/test/unit/org/apache/cassandra/utils/StreamingHistogramTest.java index 13828eb..0e9b90b 100644 --- a/test/unit/org/apache/cassandra/utils/StreamingHistogramTest.java +++ b/test/unit/org/apache/cassandra/utils/StreamingHistogramTest.java @@ -20,9 +20,7 @@ package org.apache.cassandra.utils; import org.junit.Test; import java.io.ByteArrayInputStream; -import java.io.ByteArrayOutputStream; import java.io.DataInputStream; -import java.io.DataOutputStream; import java.util.*; import org.apache.cassandra.io.util.DataOutputBuffer; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/test/unit/org/apache/cassandra/utils/TopKSamplerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/TopKSamplerTest.java b/test/unit/org/apache/cassandra/utils/TopKSamplerTest.java index dc3b91c..3b8b37d 100644 --- a/test/unit/org/apache/cassandra/utils/TopKSamplerTest.java +++ b/test/unit/org/apache/cassandra/utils/TopKSamplerTest.java @@ -7,8 +7,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import junit.framework.Assert; -import org.apache.cassandra.concurrent.Stage; -import org.apache.cassandra.concurrent.StageManager; import org.apache.cassandra.utils.TopKSampler.SamplerResult; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java index 7ab8837..12bdc3e 100644 --- a/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java +++ b/tools/stress/src/org/apache/cassandra/stress/StressMetrics.java @@ -28,7 +28,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ThreadFactory; -import com.google.common.util.concurrent.Uninterruptibles; import org.apache.commons.lang3.time.DurationFormatUtils; import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.stress.settings.StressSettings; http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/tools/stress/src/org/apache/cassandra/stress/generate/PartitionIterator.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/generate/PartitionIterator.java b/tools/stress/src/org/apache/cassandra/stress/generate/PartitionIterator.java index 0466edb..3a8693d 100644 --- a/tools/stress/src/org/apache/cassandra/stress/generate/PartitionIterator.java +++ b/tools/stress/src/org/apache/cassandra/stress/generate/PartitionIterator.java @@ -38,7 +38,6 @@ import java.util.concurrent.ThreadLocalRandom; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.BytesType; -import org.apache.cassandra.stress.Operation; import org.apache.cassandra.stress.generate.values.Generator; // a partition is re-used to reduce garbage generation, as is its internal RowIterator http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java b/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java index 9713e93..9e1a5e8 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/SampledOpDistributionFactory.java @@ -32,7 +32,6 @@ import org.apache.commons.math3.util.Pair; import org.apache.cassandra.stress.Operation; import org.apache.cassandra.stress.generate.DistributionFactory; import org.apache.cassandra.stress.generate.PartitionGenerator; -import org.apache.cassandra.stress.generate.SeedManager; import org.apache.cassandra.stress.util.Timer; public abstract class SampledOpDistributionFactory<T> implements OpDistributionFactory http://git-wip-us.apache.org/repos/asf/cassandra/blob/b30cdd9a/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java ---------------------------------------------------------------------- diff --git a/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java b/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java index 6176915..afdc0b1 100644 --- a/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java +++ b/tools/stress/src/org/apache/cassandra/stress/operations/predefined/CqlOperation.java @@ -33,7 +33,6 @@ import org.apache.cassandra.stress.generate.PartitionGenerator; import org.apache.cassandra.stress.generate.SeedManager; import org.apache.cassandra.stress.settings.Command; import org.apache.cassandra.stress.settings.ConnectionStyle; -import org.apache.cassandra.stress.settings.CqlVersion; import org.apache.cassandra.stress.settings.StressSettings; import org.apache.cassandra.stress.util.JavaDriverClient; import org.apache.cassandra.stress.util.ThriftClient;