Repository: cassandra Updated Branches: refs/heads/trunk 619178bc8 -> e96ce6d13
clean up dead imports Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e96ce6d1 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e96ce6d1 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e96ce6d1 Branch: refs/heads/trunk Commit: e96ce6d132129025ff6b923129cb67eed2f97931 Parents: 619178b Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Sun Jan 29 21:22:18 2017 -0500 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Sun Jan 29 21:22:18 2017 -0500 ---------------------------------------------------------------------- build.xml | 1 + .../apache/cassandra/auth/CassandraRoleManager.java | 1 - .../org/apache/cassandra/cache/CounterCacheKey.java | 2 -- src/java/org/apache/cassandra/cache/KeyCacheKey.java | 2 -- src/java/org/apache/cassandra/cache/OHCProvider.java | 1 - .../org/apache/cassandra/cql3/ColumnIdentifier.java | 3 +-- src/java/org/apache/cassandra/cql3/ResultSet.java | 1 - .../cassandra/cql3/statements/IndexTarget.java | 5 ----- .../apache/cassandra/db/aggregation/GroupMaker.java | 2 -- .../cassandra/db/commitlog/CommitLogArchiver.java | 1 - .../compaction/writers/DefaultCompactionWriter.java | 1 - .../writers/MajorLeveledCompactionWriter.java | 1 - .../db/compaction/writers/MaxSSTableSizeWriter.java | 1 - .../writers/SplittingSizeTieredCompactionWriter.java | 1 - .../cassandra/db/lifecycle/LifecycleTransaction.java | 1 - .../apache/cassandra/db/marshal/CompositeType.java | 4 ---- .../db/rows/RowAndDeletionMergeIterator.java | 1 - .../dht/tokenallocator/TokenAllocation.java | 2 -- .../org/apache/cassandra/hadoop/ConfigHelper.java | 15 --------------- .../hints/CompressedChecksummedDataInput.java | 1 - .../hints/EncryptedChecksummedDataInput.java | 1 - .../index/internal/CassandraIndexSearcher.java | 1 - .../index/internal/CollatedViewIndexBuilder.java | 1 - .../cassandra/io/compress/CompressionMetadata.java | 1 - .../org/apache/cassandra/io/sstable/Component.java | 6 +----- .../org/apache/cassandra/io/sstable/Descriptor.java | 1 - .../cassandra/io/sstable/SSTableTxnWriter.java | 1 - .../cassandra/io/sstable/format/SSTableWriter.java | 1 - .../apache/cassandra/io/sstable/format/Version.java | 1 - .../apache/cassandra/net/OutboundTcpConnection.java | 1 - .../cassandra/service/BatchlogResponseHandler.java | 1 - .../apache/cassandra/service/CassandraDaemon.java | 1 - .../org/apache/cassandra/service/ReadCallback.java | 1 - .../org/apache/cassandra/service/StartupChecks.java | 1 - .../org/apache/cassandra/service/paxos/Commit.java | 3 --- .../apache/cassandra/service/paxos/PaxosState.java | 11 ++++------- .../cassandra/service/paxos/PrepareResponse.java | 5 ----- .../apache/cassandra/streaming/StreamSummary.java | 3 --- .../streaming/messages/IncomingFileMessage.java | 2 -- src/java/org/apache/cassandra/tools/NodeProbe.java | 1 - .../cassandra/tools/SSTableRepairedAtSetter.java | 2 -- .../apache/cassandra/tools/StandaloneSplitter.java | 1 - .../tools/nodetool/stats/TpStatsPrinter.java | 1 - .../cassandra/transport/messages/ResultMessage.java | 2 -- src/java/org/apache/cassandra/utils/MerkleTree.java | 1 - .../NoReplicationTokenAllocatorTest.java | 1 - .../io/sstable/CQLSSTableWriterLongTest.java | 2 -- .../org/apache/cassandra/cql3/KeyCacheCqlTest.java | 1 - .../cassandra/cql3/validation/entities/TypeTest.java | 1 - .../cql3/validation/operations/CreateTest.java | 1 - .../operations/SelectOrderedPartitionerTest.java | 1 - .../cql3/validation/operations/UpdateTest.java | 1 - .../org/apache/cassandra/db/SystemKeyspaceTest.java | 5 ----- .../cassandra/db/commitlog/CommitLogUpgradeTest.java | 1 - .../gms/PendingRangeCalculatorServiceTest.java | 1 - .../org/apache/cassandra/hints/AlteredHints.java | 1 - .../apache/cassandra/hints/HintsBufferPoolTest.java | 1 - .../index/internal/CustomCassandraIndex.java | 1 - .../compress/CompressedRandomAccessReaderTest.java | 1 - .../io/compress/CompressedSequentialWriterTest.java | 1 - .../io/sstable/CQLSSTableWriterClientTest.java | 1 - .../apache/cassandra/io/util/MmappedRegionsTest.java | 1 - .../cassandra/net/RateBasedBackPressureTest.java | 1 - .../apache/cassandra/service/SerializationsTest.java | 3 +-- .../apache/cassandra/streaming/SessionInfoTest.java | 1 - .../cassandra/streaming/StreamTransferTaskTest.java | 1 - .../org/apache/cassandra/transport/DataTypeTest.java | 2 -- .../org/apache/cassandra/transport/SerDeserTest.java | 1 - .../apache/cassandra/utils/CassandraVersionTest.java | 1 - 69 files changed, 8 insertions(+), 122 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/build.xml ---------------------------------------------------------------------- diff --git a/build.xml b/build.xml index 5ef1b5b..39a7d81 100644 --- a/build.xml +++ b/build.xml @@ -617,6 +617,7 @@ <!-- retrieve artifacts --> <artifact:dependencies pomRefId="build-deps-pom" filesetId="build-dependency-jars" + sourcesFilesetId="build-dependency-sources-jars" cacheDependencyRefs="true" dependencyRefsBuildFile="${build.dir}/build-dependencies.xml"> <remoteRepository refid="central"/> http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/auth/CassandraRoleManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java index bd1d176..244f786 100644 --- a/src/java/org/apache/cassandra/auth/CassandraRoleManager.java +++ b/src/java/org/apache/cassandra/auth/CassandraRoleManager.java @@ -39,7 +39,6 @@ import org.apache.cassandra.cql3.statements.SelectStatement; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.exceptions.*; -import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.transport.messages.ResultMessage; import org.apache.cassandra.utils.ByteBufferUtil; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/cache/CounterCacheKey.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/CounterCacheKey.java b/src/java/org/apache/cassandra/cache/CounterCacheKey.java index 2d123d4..dc3ce4e 100644 --- a/src/java/org/apache/cassandra/cache/CounterCacheKey.java +++ b/src/java/org/apache/cassandra/cache/CounterCacheKey.java @@ -20,10 +20,8 @@ package org.apache.cassandra.cache; import java.io.IOException; import java.nio.ByteBuffer; import java.util.Arrays; -import java.util.Collections; import java.util.List; import java.util.Objects; -import java.util.UUID; import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.ClusteringIndexFilter; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/cache/KeyCacheKey.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/KeyCacheKey.java b/src/java/org/apache/cassandra/cache/KeyCacheKey.java index 3728cae..ac6f1f9 100644 --- a/src/java/org/apache/cassandra/cache/KeyCacheKey.java +++ b/src/java/org/apache/cassandra/cache/KeyCacheKey.java @@ -19,9 +19,7 @@ package org.apache.cassandra.cache; import java.nio.ByteBuffer; import java.util.Arrays; -import java.util.Collections; import java.util.Objects; -import java.util.UUID; import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.io.sstable.Descriptor; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/cache/OHCProvider.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/OHCProvider.java b/src/java/org/apache/cassandra/cache/OHCProvider.java index a465bd9..9fb4dfb 100644 --- a/src/java/org/apache/cassandra/cache/OHCProvider.java +++ b/src/java/org/apache/cassandra/cache/OHCProvider.java @@ -20,7 +20,6 @@ package org.apache.cassandra.cache; import java.io.IOException; import java.nio.ByteBuffer; import java.util.Iterator; -import java.util.UUID; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.db.TypeSizes; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java index 7436c90..d2ce3ed 100644 --- a/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java +++ b/src/java/org/apache/cassandra/cql3/ColumnIdentifier.java @@ -23,7 +23,6 @@ import java.util.concurrent.ConcurrentMap; import java.util.regex.Matcher; import java.util.regex.Pattern; -import com.google.common.annotations.VisibleForTesting; import com.google.common.collect.MapMaker; import org.apache.cassandra.cache.IMeasurableMemory; @@ -41,7 +40,7 @@ public class ColumnIdentifier implements IMeasurableMemory, Comparable<ColumnIde { private static final Pattern PATTERN_DOUBLE_QUOTE = Pattern.compile("\"", Pattern.LITERAL); private static final String ESCAPED_DOUBLE_QUOTE = Matcher.quoteReplacement("\"\""); - + public final ByteBuffer bytes; private final String text; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/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 f0692da..82590fb 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.ReversedType; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.service.pager.PagingState; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/cql3/statements/IndexTarget.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/IndexTarget.java b/src/java/org/apache/cassandra/cql3/statements/IndexTarget.java index 12d8022..a82f600 100644 --- a/src/java/org/apache/cassandra/cql3/statements/IndexTarget.java +++ b/src/java/org/apache/cassandra/cql3/statements/IndexTarget.java @@ -17,11 +17,6 @@ */ package org.apache.cassandra.cql3.statements; -import java.util.regex.Pattern; - -import com.google.common.collect.Iterables; - -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.schema.ColumnMetadata; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.cql3.ColumnIdentifier; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/db/aggregation/GroupMaker.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/aggregation/GroupMaker.java b/src/java/org/apache/cassandra/db/aggregation/GroupMaker.java index f6ad433..ff0ecaf 100644 --- a/src/java/org/apache/cassandra/db/aggregation/GroupMaker.java +++ b/src/java/org/apache/cassandra/db/aggregation/GroupMaker.java @@ -18,12 +18,10 @@ package org.apache.cassandra.db.aggregation; import java.nio.ByteBuffer; -import java.util.Arrays; import org.apache.cassandra.db.Clustering; import org.apache.cassandra.db.ClusteringComparator; import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.utils.ByteBufferUtil; /** * A <code>GroupMaker</code> can be used to determine if some sorted rows belongs to the same group or not. http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java index c7c5971..b58a316 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java @@ -42,7 +42,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.base.Strings; -import com.google.common.base.Throwables; public class CommitLogArchiver { http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/db/compaction/writers/DefaultCompactionWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/writers/DefaultCompactionWriter.java b/src/java/org/apache/cassandra/db/compaction/writers/DefaultCompactionWriter.java index 6f2586b..4ffc747 100644 --- a/src/java/org/apache/cassandra/db/compaction/writers/DefaultCompactionWriter.java +++ b/src/java/org/apache/cassandra/db/compaction/writers/DefaultCompactionWriter.java @@ -28,7 +28,6 @@ import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.SerializationHeader; import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/db/compaction/writers/MajorLeveledCompactionWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/writers/MajorLeveledCompactionWriter.java b/src/java/org/apache/cassandra/db/compaction/writers/MajorLeveledCompactionWriter.java index 5eac658..c2d3a7d 100644 --- a/src/java/org/apache/cassandra/db/compaction/writers/MajorLeveledCompactionWriter.java +++ b/src/java/org/apache/cassandra/db/compaction/writers/MajorLeveledCompactionWriter.java @@ -26,7 +26,6 @@ import org.apache.cassandra.db.SerializationHeader; import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.compaction.LeveledManifest; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/db/compaction/writers/MaxSSTableSizeWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/writers/MaxSSTableSizeWriter.java b/src/java/org/apache/cassandra/db/compaction/writers/MaxSSTableSizeWriter.java index 862e68b..eb05a23 100644 --- a/src/java/org/apache/cassandra/db/compaction/writers/MaxSSTableSizeWriter.java +++ b/src/java/org/apache/cassandra/db/compaction/writers/MaxSSTableSizeWriter.java @@ -26,7 +26,6 @@ import org.apache.cassandra.db.SerializationHeader; import org.apache.cassandra.db.compaction.OperationType; import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/db/compaction/writers/SplittingSizeTieredCompactionWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/writers/SplittingSizeTieredCompactionWriter.java b/src/java/org/apache/cassandra/db/compaction/writers/SplittingSizeTieredCompactionWriter.java index 79f9d1a..3a3e805 100644 --- a/src/java/org/apache/cassandra/db/compaction/writers/SplittingSizeTieredCompactionWriter.java +++ b/src/java/org/apache/cassandra/db/compaction/writers/SplittingSizeTieredCompactionWriter.java @@ -29,7 +29,6 @@ import org.apache.cassandra.db.RowIndexEntry; import org.apache.cassandra.db.SerializationHeader; import org.apache.cassandra.db.rows.UnfilteredRowIterator; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.format.SSTableWriter; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java b/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java index 89b82a1..2bf81a9 100644 --- a/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java +++ b/src/java/org/apache/cassandra/db/lifecycle/LifecycleTransaction.java @@ -30,7 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.compaction.OperationType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/db/marshal/CompositeType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/CompositeType.java b/src/java/org/apache/cassandra/db/marshal/CompositeType.java index 9eadd85..12e7fc3 100644 --- a/src/java/org/apache/cassandra/db/marshal/CompositeType.java +++ b/src/java/org/apache/cassandra/db/marshal/CompositeType.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.db.marshal; -import java.io.IOException; import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Arrays; @@ -28,11 +27,8 @@ import java.util.concurrent.ConcurrentMap; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; -import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.SyntaxException; -import org.apache.cassandra.io.util.DataOutputBuffer; -import org.apache.cassandra.io.util.DataOutputBufferFixed; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.ByteBufferUtil; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/db/rows/RowAndDeletionMergeIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/rows/RowAndDeletionMergeIterator.java b/src/java/org/apache/cassandra/db/rows/RowAndDeletionMergeIterator.java index e08b370..456141e 100644 --- a/src/java/org/apache/cassandra/db/rows/RowAndDeletionMergeIterator.java +++ b/src/java/org/apache/cassandra/db/rows/RowAndDeletionMergeIterator.java @@ -21,7 +21,6 @@ import java.util.Comparator; import java.util.Iterator; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.ColumnFilter; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java b/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java index 9c50613..1d06b11 100644 --- a/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java +++ b/src/java/org/apache/cassandra/dht/tokenallocator/TokenAllocation.java @@ -35,14 +35,12 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; -import org.apache.cassandra.gms.Gossiper; import org.apache.cassandra.locator.AbstractReplicationStrategy; import org.apache.cassandra.locator.IEndpointSnitch; import org.apache.cassandra.locator.NetworkTopologyStrategy; import org.apache.cassandra.locator.SimpleStrategy; import org.apache.cassandra.locator.TokenMetadata; import org.apache.cassandra.locator.TokenMetadata.Topology; -import org.apache.cassandra.utils.FBUtilities; public class TokenAllocation { http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/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 078d712..8c0ed1e 100644 --- a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java +++ b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java @@ -20,8 +20,6 @@ */ package org.apache.cassandra.hadoop; -import java.io.IOException; -import java.util.*; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -29,7 +27,6 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.schema.CompressionParams; import org.apache.cassandra.utils.FBUtilities; -import org.apache.cassandra.utils.Hex; import org.apache.cassandra.utils.Pair; import org.apache.hadoop.conf.Configuration; @@ -396,16 +393,4 @@ public class ConfigHelper { conf.set(OUTPUT_LOCAL_DC_ONLY, Boolean.toString(localDCOnly)); } - - private static Map<String, String> getOptions(Configuration conf, Set<String> supportedOptions) - { - Map<String, String> options = new HashMap<>(); - for (String optionKey : supportedOptions) - { - String optionValue = conf.get(optionKey); - if (optionValue != null) - options.put(optionKey, optionValue); - } - return options; - } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/hints/CompressedChecksummedDataInput.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hints/CompressedChecksummedDataInput.java b/src/java/org/apache/cassandra/hints/CompressedChecksummedDataInput.java index 0766fa5..4982a03 100644 --- a/src/java/org/apache/cassandra/hints/CompressedChecksummedDataInput.java +++ b/src/java/org/apache/cassandra/hints/CompressedChecksummedDataInput.java @@ -23,7 +23,6 @@ import java.nio.ByteBuffer; import com.google.common.annotations.VisibleForTesting; -import org.apache.cassandra.hints.ChecksummedDataInput.Position; import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.compress.ICompressor; import org.apache.cassandra.io.util.ChannelProxy; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/hints/EncryptedChecksummedDataInput.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hints/EncryptedChecksummedDataInput.java b/src/java/org/apache/cassandra/hints/EncryptedChecksummedDataInput.java index b01161d..a70a443 100644 --- a/src/java/org/apache/cassandra/hints/EncryptedChecksummedDataInput.java +++ b/src/java/org/apache/cassandra/hints/EncryptedChecksummedDataInput.java @@ -25,7 +25,6 @@ import com.google.common.annotations.VisibleForTesting; import io.netty.util.concurrent.FastThreadLocal; import org.apache.cassandra.security.EncryptionUtils; -import org.apache.cassandra.hints.CompressedChecksummedDataInput.Position; import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.compress.ICompressor; import org.apache.cassandra.io.util.ChannelProxy; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/index/internal/CassandraIndexSearcher.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/internal/CassandraIndexSearcher.java b/src/java/org/apache/cassandra/index/internal/CassandraIndexSearcher.java index 005e5b9..8e56667 100644 --- a/src/java/org/apache/cassandra/index/internal/CassandraIndexSearcher.java +++ b/src/java/org/apache/cassandra/index/internal/CassandraIndexSearcher.java @@ -27,7 +27,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.db.*; import org.apache.cassandra.db.filter.*; import org.apache.cassandra.db.partitions.UnfilteredPartitionIterator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/index/internal/CollatedViewIndexBuilder.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/index/internal/CollatedViewIndexBuilder.java b/src/java/org/apache/cassandra/index/internal/CollatedViewIndexBuilder.java index 103a1ee..076346a 100644 --- a/src/java/org/apache/cassandra/index/internal/CollatedViewIndexBuilder.java +++ b/src/java/org/apache/cassandra/index/internal/CollatedViewIndexBuilder.java @@ -22,7 +22,6 @@ import java.util.UUID; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.compaction.CompactionInfo; import org.apache.cassandra.db.compaction.CompactionInterruptedException; import org.apache.cassandra.db.compaction.OperationType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java index 7d98570..be264bf 100644 --- a/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java +++ b/src/java/org/apache/cassandra/io/compress/CompressionMetadata.java @@ -52,7 +52,6 @@ import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.io.util.Memory; import org.apache.cassandra.io.util.SafeMemory; import org.apache.cassandra.schema.CompressionParams; -import org.apache.cassandra.utils.ChecksumType; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.concurrent.Transactional; import org.apache.cassandra.utils.concurrent.Ref; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/io/sstable/Component.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/Component.java b/src/java/org/apache/cassandra/io/sstable/Component.java index 469a25c..9daac7c 100644 --- a/src/java/org/apache/cassandra/io/sstable/Component.java +++ b/src/java/org/apache/cassandra/io/sstable/Component.java @@ -17,15 +17,11 @@ */ package org.apache.cassandra.io.sstable; -import java.io.File; import java.util.EnumSet; import java.util.regex.Pattern; import com.google.common.base.Objects; -import org.apache.cassandra.utils.ChecksumType; -import org.apache.cassandra.utils.Pair; - /** * SSTables are made up of multiple components in separate files. Components are * identified by a type and an id, but required unique components (such as the Data @@ -62,7 +58,7 @@ public class Component SECONDARY_INDEX("SI_.*.db"), // custom component, used by e.g. custom compaction strategy CUSTOM(null); - + final String repr; Type(String repr) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/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 3804fd8..36943ff 100644 --- a/src/java/org/apache/cassandra/io/sstable/Descriptor.java +++ b/src/java/org/apache/cassandra/io/sstable/Descriptor.java @@ -24,7 +24,6 @@ import java.util.*; import java.util.regex.Pattern; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.CharMatcher; import com.google.common.base.Objects; import com.google.common.base.Splitter; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java index fcf7cd6..75797a9 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableTxnWriter.java @@ -32,7 +32,6 @@ import org.apache.cassandra.io.sstable.format.RangeAwareSSTableWriter; import org.apache.cassandra.io.sstable.format.SSTableFormat; import org.apache.cassandra.io.sstable.format.SSTableReader; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; -import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.utils.concurrent.Transactional; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java index 26746ad..31354a0 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/format/SSTableWriter.java @@ -35,7 +35,6 @@ import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.io.sstable.Component; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.SSTable; -import org.apache.cassandra.io.sstable.format.big.BigFormat; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; import org.apache.cassandra.io.sstable.metadata.MetadataComponent; import org.apache.cassandra.io.sstable.metadata.MetadataType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/io/sstable/format/Version.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/format/Version.java b/src/java/org/apache/cassandra/io/sstable/format/Version.java index b78e434..f900fc4 100644 --- a/src/java/org/apache/cassandra/io/sstable/format/Version.java +++ b/src/java/org/apache/cassandra/io/sstable/format/Version.java @@ -19,7 +19,6 @@ package org.apache.cassandra.io.sstable.format; import java.util.regex.Pattern; -import org.apache.cassandra.utils.ChecksumType; /** * A set of feature flags associated with a SSTable format http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/net/OutboundTcpConnection.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java index f0cd746..e854f67 100644 --- a/src/java/org/apache/cassandra/net/OutboundTcpConnection.java +++ b/src/java/org/apache/cassandra/net/OutboundTcpConnection.java @@ -59,7 +59,6 @@ import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.NanoTimeToCurrentTimeMillis; import org.apache.cassandra.utils.UUIDGen; -import org.xerial.snappy.SnappyOutputStream; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/service/BatchlogResponseHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/BatchlogResponseHandler.java b/src/java/org/apache/cassandra/service/BatchlogResponseHandler.java index aabf7dd..708d1b8 100644 --- a/src/java/org/apache/cassandra/service/BatchlogResponseHandler.java +++ b/src/java/org/apache/cassandra/service/BatchlogResponseHandler.java @@ -25,7 +25,6 @@ import org.apache.cassandra.exceptions.RequestFailureReason; import org.apache.cassandra.exceptions.WriteFailureException; import org.apache.cassandra.exceptions.WriteTimeoutException; import org.apache.cassandra.net.MessageIn; -import org.apache.cassandra.net.MessagingService; public class BatchlogResponseHandler<T> extends AbstractWriteResponseHandler<T> { http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/service/CassandraDaemon.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java index 2beb039..fe84082 100644 --- a/src/java/org/apache/cassandra/service/CassandraDaemon.java +++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java @@ -47,7 +47,6 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaConstants; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/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 d63e860..2e75e1f 100644 --- a/src/java/org/apache/cassandra/service/ReadCallback.java +++ b/src/java/org/apache/cassandra/service/ReadCallback.java @@ -41,7 +41,6 @@ import org.apache.cassandra.exceptions.UnavailableException; import org.apache.cassandra.metrics.ReadRepairMetrics; import org.apache.cassandra.net.IAsyncCallbackWithFailure; import org.apache.cassandra.net.MessageIn; -import org.apache.cassandra.net.MessageOut; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.tracing.TraceState; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/service/StartupChecks.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/StartupChecks.java b/src/java/org/apache/cassandra/service/StartupChecks.java index 767bfc6..0458820 100644 --- a/src/java/org/apache/cassandra/service/StartupChecks.java +++ b/src/java/org/apache/cassandra/service/StartupChecks.java @@ -30,7 +30,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaConstants; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/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 6e23c8b..6d672f5 100644 --- a/src/java/org/apache/cassandra/service/paxos/Commit.java +++ b/src/java/org/apache/cassandra/service/paxos/Commit.java @@ -22,7 +22,6 @@ package org.apache.cassandra.service.paxos; import java.io.IOException; -import java.nio.ByteBuffer; import java.util.UUID; import com.google.common.base.Objects; @@ -34,8 +33,6 @@ import org.apache.cassandra.db.partitions.PartitionUpdate; 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.utils.ByteBufferUtil; import org.apache.cassandra.utils.UUIDGen; import org.apache.cassandra.utils.UUIDSerializer; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/service/paxos/PaxosState.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/paxos/PaxosState.java b/src/java/org/apache/cassandra/service/paxos/PaxosState.java index cf7f3d3..7d59374 100644 --- a/src/java/org/apache/cassandra/service/paxos/PaxosState.java +++ b/src/java/org/apache/cassandra/service/paxos/PaxosState.java @@ -1,5 +1,5 @@ /* - * + * * Licensed to the Apache Software Foundation (ASF) under one * or more contributor license agreements. See the NOTICE file * distributed with this work for additional information @@ -7,25 +7,22 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations * under the License. - * + * */ package org.apache.cassandra.service.paxos; -import java.util.concurrent.ExecutionException; import java.util.concurrent.locks.Lock; -import com.google.common.base.Throwables; import com.google.common.util.concurrent.Striped; -import com.google.common.util.concurrent.Uninterruptibles; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.config.DatabaseDescriptor; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/service/paxos/PrepareResponse.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/paxos/PrepareResponse.java b/src/java/org/apache/cassandra/service/paxos/PrepareResponse.java index d8699c8..2110dd7 100644 --- a/src/java/org/apache/cassandra/service/paxos/PrepareResponse.java +++ b/src/java/org/apache/cassandra/service/paxos/PrepareResponse.java @@ -22,16 +22,11 @@ package org.apache.cassandra.service.paxos; import java.io.IOException; -import java.util.UUID; import org.apache.cassandra.db.TypeSizes; -import org.apache.cassandra.db.rows.SerializationHelper; -import org.apache.cassandra.db.partitions.PartitionUpdate; 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.utils.UUIDSerializer; public class PrepareResponse { http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/streaming/StreamSummary.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamSummary.java b/src/java/org/apache/cassandra/streaming/StreamSummary.java index 0d94f57..3f957c6 100644 --- a/src/java/org/apache/cassandra/streaming/StreamSummary.java +++ b/src/java/org/apache/cassandra/streaming/StreamSummary.java @@ -19,7 +19,6 @@ package org.apache.cassandra.streaming; import java.io.IOException; import java.io.Serializable; -import java.util.UUID; import com.google.common.base.Objects; @@ -27,9 +26,7 @@ import org.apache.cassandra.db.TypeSizes; 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.schema.TableId; -import org.apache.cassandra.utils.UUIDSerializer; /** * Summary of streaming. http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java index 66480d4..03bcaed 100644 --- a/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java +++ b/src/java/org/apache/cassandra/streaming/messages/IncomingFileMessage.java @@ -20,7 +20,6 @@ package org.apache.cassandra.streaming.messages; import java.io.IOException; import java.nio.channels.Channels; import java.nio.channels.ReadableByteChannel; -import java.util.Optional; import org.apache.cassandra.io.sstable.SSTableMultiWriter; import org.apache.cassandra.io.util.DataInputPlus; @@ -32,7 +31,6 @@ import org.apache.cassandra.streaming.StreamSession; import org.apache.cassandra.streaming.compress.CompressedStreamReader; import org.apache.cassandra.utils.JVMStabilityInspector; -import static org.apache.cassandra.utils.Throwables.extractIOExceptionCause; /** * IncomingFileMessage is used to receive the part(or whole) of a SSTable data file. http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/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 9e45d6a..5463255 100644 --- a/src/java/org/apache/cassandra/tools/NodeProbe.java +++ b/src/java/org/apache/cassandra/tools/NodeProbe.java @@ -74,7 +74,6 @@ import org.apache.cassandra.metrics.TableMetrics; import org.apache.cassandra.metrics.ThreadPoolMetrics; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.net.MessagingServiceMBean; -import org.apache.cassandra.schema.CompactionParams.TombstoneOption; import org.apache.cassandra.service.CacheService; import org.apache.cassandra.service.CacheServiceMBean; import org.apache.cassandra.service.GCInspector; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java b/src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java index b97960a..a130177 100644 --- a/src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java +++ b/src/java/org/apache/cassandra/tools/SSTableRepairedAtSetter.java @@ -25,8 +25,6 @@ import java.nio.file.attribute.FileTime; import java.util.Arrays; import java.util.List; -import org.apache.cassandra.config.Config; -import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.io.sstable.Component; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.service.ActiveRepairService; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/tools/StandaloneSplitter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java index c5be02e..7a60b6f 100644 --- a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java +++ b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java @@ -35,7 +35,6 @@ import org.apache.cassandra.db.compaction.SSTableSplitter; import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.io.sstable.*; import org.apache.cassandra.utils.JVMStabilityInspector; -import org.apache.cassandra.utils.Pair; import static org.apache.cassandra.tools.BulkLoader.CmdLineOptions; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/tools/nodetool/stats/TpStatsPrinter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/nodetool/stats/TpStatsPrinter.java b/src/java/org/apache/cassandra/tools/nodetool/stats/TpStatsPrinter.java index 45fc5ee..86bdf28 100644 --- a/src/java/org/apache/cassandra/tools/nodetool/stats/TpStatsPrinter.java +++ b/src/java/org/apache/cassandra/tools/nodetool/stats/TpStatsPrinter.java @@ -20,7 +20,6 @@ package org.apache.cassandra.tools.nodetool.stats; import java.io.PrintStream; import java.util.Collections; -import java.util.HashMap; import java.util.Map; public class TpStatsPrinter http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/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 334aa89..e1ea948 100644 --- a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java @@ -17,11 +17,9 @@ */ package org.apache.cassandra.transport.messages; -import java.util.*; import io.netty.buffer.ByteBuf; -import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.ResultSet; import org.apache.cassandra.cql3.statements.SelectStatement; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/src/java/org/apache/cassandra/utils/MerkleTree.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/MerkleTree.java b/src/java/org/apache/cassandra/utils/MerkleTree.java index 4ada91c..406601b 100644 --- a/src/java/org/apache/cassandra/utils/MerkleTree.java +++ b/src/java/org/apache/cassandra/utils/MerkleTree.java @@ -34,7 +34,6 @@ import org.apache.cassandra.exceptions.ConfigurationException; 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; /** * A MerkleTree implemented as a binary tree. http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java b/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java index c53f788..202c0f2 100644 --- a/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java +++ b/test/long/org/apache/cassandra/dht/tokenallocator/NoReplicationTokenAllocatorTest.java @@ -20,7 +20,6 @@ package org.apache.cassandra.dht.tokenallocator; import java.util.Collections; import java.util.List; -import java.util.Map; import java.util.NavigableMap; import java.util.PriorityQueue; import java.util.Random; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/long/org/apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java ---------------------------------------------------------------------- diff --git a/test/long/org/apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java b/test/long/org/apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java index 9674ca3..a6f428a 100644 --- a/test/long/org/apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java +++ b/test/long/org/apache/cassandra/io/sstable/CQLSSTableWriterLongTest.java @@ -25,11 +25,9 @@ import java.util.Random; import com.google.common.io.Files; -import org.junit.AfterClass; import org.junit.BeforeClass; import org.junit.Test; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.config.Config; import org.apache.cassandra.service.StorageService; public class CQLSSTableWriterLongTest http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java b/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java index 408d489..79cb497 100644 --- a/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java +++ b/test/unit/org/apache/cassandra/cql3/KeyCacheCqlTest.java @@ -43,7 +43,6 @@ import org.apache.cassandra.service.StorageService; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertTrue; -import static org.junit.Assert.assertNull; public class KeyCacheCqlTest extends CQLTester http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/cql3/validation/entities/TypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/entities/TypeTest.java b/test/unit/org/apache/cassandra/cql3/validation/entities/TypeTest.java index 60a0fdc..bb43d75 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/entities/TypeTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/entities/TypeTest.java @@ -22,7 +22,6 @@ import org.apache.cassandra.cql3.CQLTester; import org.junit.Test; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.fail; public class TypeTest extends CQLTester { http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java index 6339a46..1a8338f 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/CreateTest.java @@ -27,7 +27,6 @@ import java.util.UUID; import org.junit.Test; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.SchemaConstants; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java index 3957305..8155038 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/SelectOrderedPartitionerTest.java @@ -30,7 +30,6 @@ import static org.junit.Assert.assertEquals; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.cql3.CQLTester; -import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.cql3.restrictions.StatementRestrictions; import org.apache.cassandra.dht.ByteOrderedPartitioner; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/cql3/validation/operations/UpdateTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/cql3/validation/operations/UpdateTest.java b/test/unit/org/apache/cassandra/cql3/validation/operations/UpdateTest.java index 72d3466..61d50db 100644 --- a/test/unit/org/apache/cassandra/cql3/validation/operations/UpdateTest.java +++ b/test/unit/org/apache/cassandra/cql3/validation/operations/UpdateTest.java @@ -29,7 +29,6 @@ import org.apache.cassandra.cql3.Attributes; import org.apache.cassandra.cql3.CQLTester; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.cql3.UntypedResultSet.Row; -import org.apache.cassandra.utils.ByteBufferUtil; public class UpdateTest extends CQLTester { http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java b/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java index 72db2a4..d1b8ff5 100644 --- a/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java +++ b/test/unit/org/apache/cassandra/db/SystemKeyspaceTest.java @@ -17,15 +17,11 @@ */ package org.apache.cassandra.db; -import java.io.File; import java.io.IOException; import java.net.InetAddress; import java.net.UnknownHostException; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.*; -import org.apache.commons.io.FileUtils; import org.junit.BeforeClass; import org.junit.Test; @@ -35,7 +31,6 @@ import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.UntypedResultSet; import org.apache.cassandra.dht.ByteOrderedPartitioner.BytesToken; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.CassandraVersion; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java index 1ca9a80..f89f16c 100644 --- a/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java +++ b/test/unit/org/apache/cassandra/db/commitlog/CommitLogUpgradeTest.java @@ -51,7 +51,6 @@ import org.apache.cassandra.schema.Tables; import org.apache.cassandra.security.EncryptionContextGenerator; import org.apache.cassandra.utils.JVMStabilityInspector; import org.apache.cassandra.utils.KillerForTests; -import org.apache.cassandra.db.commitlog.CommitLogReplayer.CommitLogReplayException; /** * Note: if you are looking to create new test cases for this test, check out http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/gms/PendingRangeCalculatorServiceTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/gms/PendingRangeCalculatorServiceTest.java b/test/unit/org/apache/cassandra/gms/PendingRangeCalculatorServiceTest.java index 90bbf1d..0939db0 100644 --- a/test/unit/org/apache/cassandra/gms/PendingRangeCalculatorServiceTest.java +++ b/test/unit/org/apache/cassandra/gms/PendingRangeCalculatorServiceTest.java @@ -32,7 +32,6 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.dht.ByteOrderedPartitioner; import org.apache.cassandra.dht.Token; import org.apache.cassandra.exceptions.ConfigurationException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/hints/AlteredHints.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/hints/AlteredHints.java b/test/unit/org/apache/cassandra/hints/AlteredHints.java index 6cc507b..9b8e32f 100644 --- a/test/unit/org/apache/cassandra/hints/AlteredHints.java +++ b/test/unit/org/apache/cassandra/hints/AlteredHints.java @@ -33,7 +33,6 @@ import org.junit.BeforeClass; import org.apache.cassandra.SchemaLoader; import org.apache.cassandra.schema.TableMetadata; -import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.schema.Schema; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.db.RowUpdateBuilder; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/hints/HintsBufferPoolTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/hints/HintsBufferPoolTest.java b/test/unit/org/apache/cassandra/hints/HintsBufferPoolTest.java index 7c8d0be..1374d80 100644 --- a/test/unit/org/apache/cassandra/hints/HintsBufferPoolTest.java +++ b/test/unit/org/apache/cassandra/hints/HintsBufferPoolTest.java @@ -28,7 +28,6 @@ import com.google.common.collect.ImmutableList; import static junit.framework.Assert.*; -import java.lang.Thread.State; import java.util.Queue; import java.util.UUID; import java.util.concurrent.ConcurrentLinkedQueue; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java b/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java index 1f1d8b9..4194ec5 100644 --- a/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java +++ b/test/unit/org/apache/cassandra/index/internal/CustomCassandraIndex.java @@ -33,7 +33,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.apache.cassandra.schema.ColumnMetadata; -import org.apache.cassandra.schema.Schema; import org.apache.cassandra.schema.TableMetadata; import org.apache.cassandra.schema.TableMetadataRef; import org.apache.cassandra.cql3.Operator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java index 6359566..ceba912 100644 --- a/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java +++ b/test/unit/org/apache/cassandra/io/compress/CompressedRandomAccessReaderTest.java @@ -35,7 +35,6 @@ import org.apache.cassandra.io.sstable.CorruptSSTableException; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; import org.apache.cassandra.io.util.*; import org.apache.cassandra.schema.CompressionParams; -import org.apache.cassandra.utils.ChecksumType; import org.apache.cassandra.utils.SyncUtil; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java index ce95d0d..b5bf161 100644 --- a/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java +++ b/test/unit/org/apache/cassandra/io/compress/CompressedSequentialWriterTest.java @@ -41,7 +41,6 @@ import org.apache.cassandra.db.marshal.UTF8Type; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; import org.apache.cassandra.io.util.*; import org.apache.cassandra.schema.CompressionParams; -import org.apache.cassandra.utils.ChecksumType; public class CompressedSequentialWriterTest extends SequentialWriterTest { http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java index 273c400..61ac017 100644 --- a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterClientTest.java @@ -23,7 +23,6 @@ import java.io.IOException; import com.google.common.io.Files; import org.junit.After; -import org.junit.AfterClass; import org.junit.Before; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java b/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java index f6e97fb..5051230 100644 --- a/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java +++ b/test/unit/org/apache/cassandra/io/util/MmappedRegionsTest.java @@ -37,7 +37,6 @@ import org.apache.cassandra.io.compress.CompressedSequentialWriter; import org.apache.cassandra.io.compress.CompressionMetadata; import org.apache.cassandra.io.sstable.metadata.MetadataCollector; import org.apache.cassandra.schema.CompressionParams; -import org.apache.cassandra.utils.ChecksumType; import static junit.framework.Assert.assertNull; import static org.junit.Assert.assertEquals; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/net/RateBasedBackPressureTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/net/RateBasedBackPressureTest.java b/test/unit/org/apache/cassandra/net/RateBasedBackPressureTest.java index b94b6ee..93fe32e 100644 --- a/test/unit/org/apache/cassandra/net/RateBasedBackPressureTest.java +++ b/test/unit/org/apache/cassandra/net/RateBasedBackPressureTest.java @@ -27,7 +27,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.Sets; import com.google.common.util.concurrent.RateLimiter; -import org.junit.Assert; import org.junit.Test; import org.apache.cassandra.utils.TestTimeSource; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/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 4f3c80e..66fdeec 100644 --- a/test/unit/org/apache/cassandra/service/SerializationsTest.java +++ b/test/unit/org/apache/cassandra/service/SerializationsTest.java @@ -39,7 +39,6 @@ import org.apache.cassandra.dht.Token; import org.apache.cassandra.io.util.DataInputPlus.DataInputStreamPlus; import org.apache.cassandra.io.util.DataOutputStreamPlus; import org.apache.cassandra.net.MessageIn; -import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.repair.NodePair; import org.apache.cassandra.repair.RepairJobDesc; import org.apache.cassandra.repair.Validator; @@ -69,7 +68,7 @@ public class SerializationsTest extends AbstractSerializationsTester { partitionerSwitcher.close(); } - + private void testRepairMessageWrite(String fileName, RepairMessage... messages) throws IOException { try (DataOutputStreamPlus out = getOutput(fileName)) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/streaming/SessionInfoTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/streaming/SessionInfoTest.java b/test/unit/org/apache/cassandra/streaming/SessionInfoTest.java index ae18be9..bc24979 100644 --- a/test/unit/org/apache/cassandra/streaming/SessionInfoTest.java +++ b/test/unit/org/apache/cassandra/streaming/SessionInfoTest.java @@ -21,7 +21,6 @@ import java.net.InetAddress; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; -import java.util.UUID; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/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 edd9d9c..ffe26a2 100644 --- a/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java +++ b/test/unit/org/apache/cassandra/streaming/StreamTransferTaskTest.java @@ -45,7 +45,6 @@ import org.apache.cassandra.schema.TableId; import org.apache.cassandra.streaming.messages.OutgoingFileMessage; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.concurrent.Ref; -import org.hsqldb.Table; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNull; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/transport/DataTypeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/transport/DataTypeTest.java b/test/unit/org/apache/cassandra/transport/DataTypeTest.java index 6f086c9..a8b535a 100644 --- a/test/unit/org/apache/cassandra/transport/DataTypeTest.java +++ b/test/unit/org/apache/cassandra/transport/DataTypeTest.java @@ -19,9 +19,7 @@ package org.apache.cassandra.transport; import java.util.ArrayList; -import java.util.Collections; import java.util.List; -import java.util.Map; import org.junit.Test; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/transport/SerDeserTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/transport/SerDeserTest.java b/test/unit/org/apache/cassandra/transport/SerDeserTest.java index 1eaa5ac..a1260ba 100644 --- a/test/unit/org/apache/cassandra/transport/SerDeserTest.java +++ b/test/unit/org/apache/cassandra/transport/SerDeserTest.java @@ -32,7 +32,6 @@ import org.apache.cassandra.cql3.*; import org.apache.cassandra.db.ConsistencyLevel; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.serializers.CollectionSerializer; -import org.apache.cassandra.service.pager.PagingState; import org.apache.cassandra.transport.Event.TopologyChange; import org.apache.cassandra.transport.Event.SchemaChange; import org.apache.cassandra.transport.Event.StatusChange; http://git-wip-us.apache.org/repos/asf/cassandra/blob/e96ce6d1/test/unit/org/apache/cassandra/utils/CassandraVersionTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/CassandraVersionTest.java b/test/unit/org/apache/cassandra/utils/CassandraVersionTest.java index da7e266..683d9e4 100644 --- a/test/unit/org/apache/cassandra/utils/CassandraVersionTest.java +++ b/test/unit/org/apache/cassandra/utils/CassandraVersionTest.java @@ -23,7 +23,6 @@ import java.util.Arrays; import org.junit.Test; import static org.junit.Assert.assertArrayEquals; -import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertThat; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail;