Updated Branches: refs/heads/trunk 8085e6df2 -> 02fb21893
unused imports cleanup Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/02fb2189 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/02fb2189 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/02fb2189 Branch: refs/heads/trunk Commit: 02fb218930aaf35d6c1101c4a2156e4663048fa1 Parents: 8085e6d Author: Dave Brosius <[email protected]> Authored: Sun Feb 2 01:17:50 2014 -0500 Committer: Dave Brosius <[email protected]> Committed: Sun Feb 2 01:17:50 2014 -0500 ---------------------------------------------------------------------- src/java/org/apache/cassandra/cache/CounterCacheKey.java | 2 -- src/java/org/apache/cassandra/cache/RowCacheSentinel.java | 3 --- src/java/org/apache/cassandra/config/Schema.java | 4 ---- src/java/org/apache/cassandra/cql3/CQL3Type.java | 2 -- src/java/org/apache/cassandra/cql3/QueryOptions.java | 1 - src/java/org/apache/cassandra/cql3/ResultSet.java | 1 - .../apache/cassandra/cql3/statements/CreateIndexStatement.java | 1 - src/java/org/apache/cassandra/db/DeletedCell.java | 1 - src/java/org/apache/cassandra/db/Directories.java | 1 - src/java/org/apache/cassandra/db/ExpiringCell.java | 1 - src/java/org/apache/cassandra/db/commitlog/CommitLog.java | 3 --- .../apache/cassandra/db/commitlog/CommitLogSegmentManager.java | 4 ---- .../apache/cassandra/db/compaction/CompactionController.java | 1 - .../org/apache/cassandra/db/compaction/CompactionIterable.java | 1 - .../apache/cassandra/db/composites/AbstractCellNameType.java | 2 +- src/java/org/apache/cassandra/db/context/CounterContext.java | 1 - src/java/org/apache/cassandra/db/marshal/ReversedType.java | 2 +- src/java/org/apache/cassandra/gms/TokenSerializer.java | 1 - .../cassandra/io/sstable/SSTableSimpleUnsortedWriter.java | 1 - .../cassandra/io/sstable/metadata/IMetadataSerializer.java | 1 - .../cassandra/io/sstable/metadata/MetadataCollector.java | 1 - .../org/apache/cassandra/io/util/DataIntegrityMetadata.java | 1 - src/java/org/apache/cassandra/service/CacheService.java | 2 -- src/java/org/apache/cassandra/streaming/StreamSession.java | 1 - .../cassandra/streaming/compress/CompressedStreamReader.java | 1 - src/java/org/apache/cassandra/thrift/SSLTransportFactory.java | 1 - src/java/org/apache/cassandra/tools/BulkLoader.java | 2 -- src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 2 -- src/java/org/apache/cassandra/transport/CBUtil.java | 1 - src/java/org/apache/cassandra/transport/Event.java | 1 - src/java/org/apache/cassandra/transport/Frame.java | 1 - .../cassandra/transport/messages/CredentialsMessage.java | 1 - .../org/apache/cassandra/transport/messages/ErrorMessage.java | 4 ---- .../apache/cassandra/transport/messages/ExecuteMessage.java | 2 -- .../apache/cassandra/transport/messages/OptionsMessage.java | 1 - .../org/apache/cassandra/transport/messages/QueryMessage.java | 1 - .../org/apache/cassandra/transport/messages/ReadyMessage.java | 1 - .../apache/cassandra/transport/messages/RegisterMessage.java | 1 - .../org/apache/cassandra/transport/messages/ResultMessage.java | 1 - .../apache/cassandra/transport/messages/StartupMessage.java | 1 - .../apache/cassandra/transport/messages/SupportedMessage.java | 1 - src/java/org/apache/cassandra/utils/BoundedStatsDeque.java | 4 ---- src/java/org/apache/cassandra/utils/FilterFactory.java | 1 - src/java/org/apache/cassandra/utils/btree/BTree.java | 2 -- src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java | 3 +-- src/java/org/apache/cassandra/utils/memory/Pool.java | 1 - src/java/org/apache/cassandra/utils/obs/OpenBitSet.java | 6 +++--- .../org/apache/cassandra/db/compaction/CompactionsTest.java | 1 - .../org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java | 4 ---- test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java | 2 -- .../unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java | 1 - .../cassandra/service/AntiEntropyServiceTestAbstract.java | 1 - 52 files changed, 6 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/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 b6920cf..da12dd4 100644 --- a/src/java/org/apache/cassandra/cache/CounterCacheKey.java +++ b/src/java/org/apache/cassandra/cache/CounterCacheKey.java @@ -22,10 +22,8 @@ import java.util.Arrays; import java.util.UUID; import org.apache.cassandra.config.Schema; -import org.apache.cassandra.cql3.ColumnIdentifier; import org.apache.cassandra.db.composites.CellName; import org.apache.cassandra.db.composites.CellNames; -import org.apache.cassandra.db.composites.SimpleSparseCellName; import org.apache.cassandra.utils.*; public class CounterCacheKey implements CacheKey http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/cache/RowCacheSentinel.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cache/RowCacheSentinel.java b/src/java/org/apache/cassandra/cache/RowCacheSentinel.java index 01e90c0..83c49d4 100644 --- a/src/java/org/apache/cassandra/cache/RowCacheSentinel.java +++ b/src/java/org/apache/cassandra/cache/RowCacheSentinel.java @@ -19,9 +19,6 @@ package org.apache.cassandra.cache; import java.util.concurrent.atomic.AtomicLong; -import org.apache.cassandra.db.TypeSizes; -import org.apache.cassandra.utils.ObjectSizes; - import com.google.common.base.Objects; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/config/Schema.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/Schema.java b/src/java/org/apache/cassandra/config/Schema.java index e65b399..01be68a 100644 --- a/src/java/org/apache/cassandra/config/Schema.java +++ b/src/java/org/apache/cassandra/config/Schema.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.config; -import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; @@ -29,11 +28,8 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.db.*; import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.db.marshal.UserType; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.service.MigrationManager; -import org.apache.cassandra.tracing.Tracing; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.Pair; import org.cliffc.high_scale_lib.NonBlockingHashMap; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/cql3/CQL3Type.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/CQL3Type.java b/src/java/org/apache/cassandra/cql3/CQL3Type.java index 2ff6fb5..8ce89ca 100644 --- a/src/java/org/apache/cassandra/cql3/CQL3Type.java +++ b/src/java/org/apache/cassandra/cql3/CQL3Type.java @@ -17,8 +17,6 @@ */ package org.apache.cassandra.cql3; -import java.nio.ByteBuffer; - import org.apache.cassandra.config.KSMetaData; import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.marshal.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/cql3/QueryOptions.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/QueryOptions.java b/src/java/org/apache/cassandra/cql3/QueryOptions.java index 72edfbf..630c6a0 100644 --- a/src/java/org/apache/cassandra/cql3/QueryOptions.java +++ b/src/java/org/apache/cassandra/cql3/QueryOptions.java @@ -18,7 +18,6 @@ package org.apache.cassandra.cql3; import java.nio.ByteBuffer; -import java.util.ArrayList; import java.util.Collections; import java.util.EnumSet; import java.util.List; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/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 4468637..ece56a9 100644 --- a/src/java/org/apache/cassandra/cql3/ResultSet.java +++ b/src/java/org/apache/cassandra/cql3/ResultSet.java @@ -21,7 +21,6 @@ import java.nio.ByteBuffer; import java.util.*; import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; import org.apache.cassandra.transport.*; import org.apache.cassandra.db.marshal.AbstractType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/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 d0478f5..fe5508b 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/02fb2189/src/java/org/apache/cassandra/db/DeletedCell.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/DeletedCell.java b/src/java/org/apache/cassandra/db/DeletedCell.java index 64a6df3..3701ab2 100644 --- a/src/java/org/apache/cassandra/db/DeletedCell.java +++ b/src/java/org/apache/cassandra/db/DeletedCell.java @@ -27,7 +27,6 @@ import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.memory.AbstractAllocator; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.memory.HeapAllocator; public class DeletedCell extends Cell { http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/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 b3723b3..6cd9da1 100644 --- a/src/java/org/apache/cassandra/db/Directories.java +++ b/src/java/org/apache/cassandra/db/Directories.java @@ -38,7 +38,6 @@ import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSet.Builder; import com.google.common.collect.Iterables; -import com.google.common.collect.Iterators; import com.google.common.primitives.Longs; import com.google.common.util.concurrent.Uninterruptibles; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/db/ExpiringCell.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ExpiringCell.java b/src/java/org/apache/cassandra/db/ExpiringCell.java index 6742630..4e26c9e 100644 --- a/src/java/org/apache/cassandra/db/ExpiringCell.java +++ b/src/java/org/apache/cassandra/db/ExpiringCell.java @@ -27,7 +27,6 @@ import org.apache.cassandra.db.composites.CellNameType; import org.apache.cassandra.io.util.DataOutputBuffer; import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.memory.AbstractAllocator; -import org.apache.cassandra.utils.memory.HeapAllocator; /** * Alternative to Cell that have an expiring time. http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/db/commitlog/CommitLog.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java index 1181a6f..9f2b960 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLog.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLog.java @@ -21,7 +21,6 @@ import java.io.*; import java.lang.management.ManagementFactory; import java.nio.ByteBuffer; import java.util.*; -import java.util.concurrent.Future; import javax.management.MBeanServer; import javax.management.ObjectName; @@ -39,8 +38,6 @@ import org.apache.cassandra.metrics.CommitLogMetrics; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.utils.PureJavaCrc32; -import com.google.common.util.concurrent.Futures; - import static org.apache.cassandra.db.commitlog.CommitLogSegment.*; /* http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java index bc87370..7a72f79 100644 --- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java +++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegmentManager.java @@ -30,14 +30,12 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.Future; -import java.util.concurrent.FutureTask; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReferenceFieldUpdater; import com.google.common.collect.Iterables; import com.google.common.util.concurrent.*; -import org.apache.cassandra.service.paxos.Commit; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -48,8 +46,6 @@ import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.db.Mutation; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.net.MessagingService; -import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; import org.apache.cassandra.utils.concurrent.WaitQueue; import org.apache.cassandra.utils.WrappedRunnable; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/db/compaction/CompactionController.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionController.java b/src/java/org/apache/cassandra/db/compaction/CompactionController.java index 066c7e5..3a19ca7 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java @@ -30,7 +30,6 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.DataTracker; import org.apache.cassandra.db.DecoratedKey; -import org.apache.cassandra.io.sstable.SSTableIdentityIterator; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.utils.AlwaysPresentFilter; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java b/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java index 132cf25..0c9b52a 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java @@ -24,7 +24,6 @@ import java.util.List; import com.google.common.collect.ImmutableList; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; -import org.apache.cassandra.io.sstable.SSTableIdentityIterator; import org.apache.cassandra.utils.CloseableIterator; import org.apache.cassandra.utils.MergeIterator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/db/composites/AbstractCellNameType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/composites/AbstractCellNameType.java b/src/java/org/apache/cassandra/db/composites/AbstractCellNameType.java index 83030a6..96fc1eb 100644 --- a/src/java/org/apache/cassandra/db/composites/AbstractCellNameType.java +++ b/src/java/org/apache/cassandra/db/composites/AbstractCellNameType.java @@ -215,7 +215,7 @@ public abstract class AbstractCellNameType extends AbstractCType implements Cell } else { - AbstractType<?> type = (AbstractType)subtype(i); + AbstractType<?> type = subtype(i); // If it's a collection type, we need to find the right collection and use the key comparator (since we're building a cell name) if (type instanceof ColumnToCollectionType) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/db/context/CounterContext.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/context/CounterContext.java b/src/java/org/apache/cassandra/db/context/CounterContext.java index 0b66d3b..9da636c 100644 --- a/src/java/org/apache/cassandra/db/context/CounterContext.java +++ b/src/java/org/apache/cassandra/db/context/CounterContext.java @@ -31,7 +31,6 @@ import org.slf4j.LoggerFactory; import org.apache.cassandra.db.ClockAndCount; import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.db.compaction.CompactionManager; -import org.apache.cassandra.serializers.MarshalException; import org.apache.cassandra.utils.*; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/db/marshal/ReversedType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/ReversedType.java b/src/java/org/apache/cassandra/db/marshal/ReversedType.java index ef8fb92..f9ab81e 100644 --- a/src/java/org/apache/cassandra/db/marshal/ReversedType.java +++ b/src/java/org/apache/cassandra/db/marshal/ReversedType.java @@ -50,7 +50,7 @@ public class ReversedType<T> extends AbstractType<T> type = new ReversedType<T>(baseType); instances.put(baseType, type); } - return (ReversedType<T>) type; + return type; } private ReversedType(AbstractType<T> baseType) http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/gms/TokenSerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/gms/TokenSerializer.java b/src/java/org/apache/cassandra/gms/TokenSerializer.java index 3789b50..bc5bf4b 100644 --- a/src/java/org/apache/cassandra/gms/TokenSerializer.java +++ b/src/java/org/apache/cassandra/gms/TokenSerializer.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.gms; -import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Token; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/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 c881395..c8c7277 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableSimpleUnsortedWriter.java @@ -28,7 +28,6 @@ import com.google.common.base.Throwables; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.ColumnFamily; -import org.apache.cassandra.db.ColumnFamilyType; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.TreeMapBackedSortedColumns; import org.apache.cassandra.db.marshal.AbstractType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/io/sstable/metadata/IMetadataSerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/IMetadataSerializer.java b/src/java/org/apache/cassandra/io/sstable/metadata/IMetadataSerializer.java index 0875e5d..bd953ae 100644 --- a/src/java/org/apache/cassandra/io/sstable/metadata/IMetadataSerializer.java +++ b/src/java/org/apache/cassandra/io/sstable/metadata/IMetadataSerializer.java @@ -19,7 +19,6 @@ package org.apache.cassandra.io.sstable.metadata; import java.io.DataOutput; import java.io.IOException; -import java.util.Collection; import java.util.EnumSet; import java.util.Map; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java index c61b766..e20015d 100644 --- a/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java +++ b/src/java/org/apache/cassandra/io/sstable/metadata/MetadataCollector.java @@ -31,7 +31,6 @@ import org.apache.cassandra.io.sstable.*; import org.apache.cassandra.utils.EstimatedHistogram; import org.apache.cassandra.utils.MurmurHash; import org.apache.cassandra.utils.StreamingHistogram; -import org.apache.cassandra.utils.memory.HeapAllocator; public class MetadataCollector { http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java b/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java index 0606941..f3c6c63 100644 --- a/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java +++ b/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java @@ -29,7 +29,6 @@ import java.util.zip.Checksum; 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.utils.Hex; import org.apache.cassandra.utils.PureJavaCrc32; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/service/CacheService.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/CacheService.java b/src/java/org/apache/cassandra/service/CacheService.java index 4a2fc18..d8c26bc 100644 --- a/src/java/org/apache/cassandra/service/CacheService.java +++ b/src/java/org/apache/cassandra/service/CacheService.java @@ -32,7 +32,6 @@ import java.util.concurrent.locks.Lock; import javax.management.MBeanServer; import javax.management.ObjectName; -import com.google.common.collect.ImmutableSortedSet; import com.google.common.util.concurrent.Futures; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -51,7 +50,6 @@ import org.apache.cassandra.db.filter.QueryFilter; import org.apache.cassandra.io.sstable.Descriptor; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.CounterId; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.Pair; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/streaming/StreamSession.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamSession.java b/src/java/org/apache/cassandra/streaming/StreamSession.java index eb720ed..e65f2db 100644 --- a/src/java/org/apache/cassandra/streaming/StreamSession.java +++ b/src/java/org/apache/cassandra/streaming/StreamSession.java @@ -23,7 +23,6 @@ import java.util.*; import java.util.concurrent.Future; import com.google.common.collect.Lists; -import org.apache.cassandra.io.sstable.SSTableWriter; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java index 4aac941..d294e4a 100644 --- a/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java +++ b/src/java/org/apache/cassandra/streaming/compress/CompressedStreamReader.java @@ -28,7 +28,6 @@ import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Keyspace; import org.apache.cassandra.io.compress.CompressionMetadata; -import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.io.sstable.SSTableWriter; import org.apache.cassandra.streaming.ProgressInfo; import org.apache.cassandra.streaming.StreamReader; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/thrift/SSLTransportFactory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/SSLTransportFactory.java b/src/java/org/apache/cassandra/thrift/SSLTransportFactory.java index f828600..b23d28c 100644 --- a/src/java/org/apache/cassandra/thrift/SSLTransportFactory.java +++ b/src/java/org/apache/cassandra/thrift/SSLTransportFactory.java @@ -21,7 +21,6 @@ import com.google.common.collect.Sets; import org.apache.cassandra.cli.transport.FramedTransportFactory; import org.apache.thrift.transport.TSSLTransportFactory; import org.apache.thrift.transport.TTransport; -import org.apache.thrift.transport.TTransportException; import java.util.Map; import java.util.Set; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/tools/BulkLoader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/BulkLoader.java b/src/java/org/apache/cassandra/tools/BulkLoader.java index 9593a55..ec4892f 100644 --- a/src/java/org/apache/cassandra/tools/BulkLoader.java +++ b/src/java/org/apache/cassandra/tools/BulkLoader.java @@ -30,8 +30,6 @@ import org.apache.cassandra.config.EncryptionOptions; import org.apache.commons.cli.*; import org.apache.thrift.protocol.TBinaryProtocol; import org.apache.thrift.protocol.TProtocol; -import org.apache.thrift.transport.TFramedTransport; -import org.apache.thrift.transport.TSocket; import org.apache.thrift.transport.TTransport; import org.apache.cassandra.auth.IAuthenticator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/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 6783ba7..8b92586 100644 --- a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java +++ b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java @@ -25,11 +25,9 @@ import java.util.*; import org.apache.commons.cli.*; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.Directories; import org.apache.cassandra.db.Keyspace; -import org.apache.cassandra.db.compaction.LeveledManifest; import org.apache.cassandra.db.compaction.SSTableSplitter; import org.apache.cassandra.io.sstable.*; import org.apache.cassandra.utils.Pair; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/transport/CBUtil.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/CBUtil.java b/src/java/org/apache/cassandra/transport/CBUtil.java index dfd0439..2816f47 100644 --- a/src/java/org/apache/cassandra/transport/CBUtil.java +++ b/src/java/org/apache/cassandra/transport/CBUtil.java @@ -30,7 +30,6 @@ import java.util.Map; import java.util.UUID; import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; import org.jboss.netty.util.CharsetUtil; import org.apache.cassandra.db.ConsistencyLevel; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/transport/Event.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/Event.java b/src/java/org/apache/cassandra/transport/Event.java index ba9a23d..d0b673b 100644 --- a/src/java/org/apache/cassandra/transport/Event.java +++ b/src/java/org/apache/cassandra/transport/Event.java @@ -21,7 +21,6 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; public abstract class Event { http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/transport/Frame.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/Frame.java b/src/java/org/apache/cassandra/transport/Frame.java index 6472b39..e0f49e1 100644 --- a/src/java/org/apache/cassandra/transport/Frame.java +++ b/src/java/org/apache/cassandra/transport/Frame.java @@ -31,7 +31,6 @@ import org.jboss.netty.handler.codec.frame.*; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.transport.messages.ErrorMessage; -import org.apache.cassandra.utils.ByteBufferUtil; public class Frame { http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java b/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java index 2c93afd..dca8bf8 100644 --- a/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/CredentialsMessage.java @@ -24,7 +24,6 @@ import org.apache.cassandra.auth.AuthenticatedUser; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.transport.ProtocolException; import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; import org.apache.cassandra.exceptions.AuthenticationException; import org.apache.cassandra.service.QueryState; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java b/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java index 3ca5801..8f9ba6a 100644 --- a/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ErrorMessage.java @@ -17,10 +17,7 @@ */ package org.apache.cassandra.transport.messages; -import java.nio.ByteBuffer; - import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +28,6 @@ import org.apache.cassandra.transport.CBUtil; import org.apache.cassandra.transport.Message; import org.apache.cassandra.transport.ProtocolException; import org.apache.cassandra.transport.ServerError; -import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.MD5Digest; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java b/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java index c090f9f..64e4785 100644 --- a/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ExecuteMessage.java @@ -18,13 +18,11 @@ package org.apache.cassandra.transport.messages; import java.nio.ByteBuffer; -import java.util.ArrayList; import java.util.List; import java.util.UUID; import com.google.common.collect.ImmutableMap; import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; import org.apache.cassandra.cql3.CQLStatement; import org.apache.cassandra.cql3.QueryProcessor; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/transport/messages/OptionsMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/OptionsMessage.java b/src/java/org/apache/cassandra/transport/messages/OptionsMessage.java index dd99c60..f74d252 100644 --- a/src/java/org/apache/cassandra/transport/messages/OptionsMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/OptionsMessage.java @@ -23,7 +23,6 @@ import java.util.List; import java.util.Map; import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.service.QueryState; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/transport/messages/QueryMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/QueryMessage.java b/src/java/org/apache/cassandra/transport/messages/QueryMessage.java index 744e0ea..c5ff143 100644 --- a/src/java/org/apache/cassandra/transport/messages/QueryMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/QueryMessage.java @@ -23,7 +23,6 @@ import java.util.UUID; import com.google.common.collect.ImmutableMap; import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; import org.apache.cassandra.cql3.QueryProcessor; import org.apache.cassandra.cql3.QueryOptions; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/transport/messages/ReadyMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/ReadyMessage.java b/src/java/org/apache/cassandra/transport/messages/ReadyMessage.java index 10bff86..40464eb 100644 --- a/src/java/org/apache/cassandra/transport/messages/ReadyMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ReadyMessage.java @@ -18,7 +18,6 @@ package org.apache.cassandra.transport.messages; import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; import org.apache.cassandra.transport.Message; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java b/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java index fc6ade7..834d584 100644 --- a/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/RegisterMessage.java @@ -21,7 +21,6 @@ import java.util.ArrayList; import java.util.List; import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; import org.apache.cassandra.service.QueryState; import org.apache.cassandra.transport.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/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 3d41793..0a57fee 100644 --- a/src/java/org/apache/cassandra/transport/messages/ResultMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/ResultMessage.java @@ -20,7 +20,6 @@ package org.apache.cassandra.transport.messages; import java.util.*; import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; import org.apache.cassandra.cql3.ColumnSpecification; import org.apache.cassandra.cql3.CQLStatement; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/transport/messages/StartupMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/StartupMessage.java b/src/java/org/apache/cassandra/transport/messages/StartupMessage.java index d56a037..d2b4350 100644 --- a/src/java/org/apache/cassandra/transport/messages/StartupMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/StartupMessage.java @@ -21,7 +21,6 @@ import java.util.HashMap; import java.util.Map; import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; import org.apache.cassandra.config.DatabaseDescriptor; import org.apache.cassandra.exceptions.InvalidRequestException; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java b/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java index 44a95e7..1ec9b51 100644 --- a/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java +++ b/src/java/org/apache/cassandra/transport/messages/SupportedMessage.java @@ -21,7 +21,6 @@ import java.util.List; import java.util.Map; import org.jboss.netty.buffer.ChannelBuffer; -import org.jboss.netty.buffer.ChannelBuffers; import org.apache.cassandra.transport.CBUtil; import org.apache.cassandra.transport.Message; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/utils/BoundedStatsDeque.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/BoundedStatsDeque.java b/src/java/org/apache/cassandra/utils/BoundedStatsDeque.java index 3983b74..2ad28c4 100644 --- a/src/java/org/apache/cassandra/utils/BoundedStatsDeque.java +++ b/src/java/org/apache/cassandra/utils/BoundedStatsDeque.java @@ -18,12 +18,8 @@ package org.apache.cassandra.utils; import java.util.Iterator; -import java.util.NoSuchElementException; import java.util.concurrent.LinkedBlockingDeque; import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicReference; - -import com.google.common.util.concurrent.AtomicDouble; /** * bounded threadsafe deque http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/utils/FilterFactory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/FilterFactory.java b/src/java/org/apache/cassandra/utils/FilterFactory.java index e50cbda..ea81b11 100644 --- a/src/java/org/apache/cassandra/utils/FilterFactory.java +++ b/src/java/org/apache/cassandra/utils/FilterFactory.java @@ -21,7 +21,6 @@ import java.io.DataInput; import java.io.DataOutput; import java.io.IOException; -import org.apache.cassandra.db.TypeSizes; import org.apache.cassandra.utils.obs.IBitSet; import org.apache.cassandra.utils.obs.OffHeapBitSet; import org.apache.cassandra.utils.obs.OpenBitSet; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/utils/btree/BTree.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/btree/BTree.java b/src/java/org/apache/cassandra/utils/btree/BTree.java index eb7e558..40c9ca8 100644 --- a/src/java/org/apache/cassandra/utils/btree/BTree.java +++ b/src/java/org/apache/cassandra/utils/btree/BTree.java @@ -4,9 +4,7 @@ import java.util.Arrays; import java.util.Collection; import java.util.Comparator; -import com.google.common.base.Function; import org.apache.cassandra.utils.ObjectSizes; -import com.google.common.collect.Collections2; public class BTree { http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java b/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java index 9bef8c3..3b4ce5f 100644 --- a/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java +++ b/src/java/org/apache/cassandra/utils/concurrent/WaitQueue.java @@ -7,7 +7,6 @@ import java.util.ArrayList; import java.util.Iterator; import java.util.List; import java.util.concurrent.ConcurrentLinkedDeque; -import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.atomic.AtomicIntegerFieldUpdater; import java.util.concurrent.locks.LockSupport; @@ -264,7 +263,7 @@ public final class WaitQueue boolean interrupted = false; while (!isSignalled()) { - if (Thread.currentThread().interrupted()) + if (Thread.interrupted()) interrupted = true; LockSupport.park(); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/utils/memory/Pool.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/memory/Pool.java b/src/java/org/apache/cassandra/utils/memory/Pool.java index 4e59de8..927c62b 100644 --- a/src/java/org/apache/cassandra/utils/memory/Pool.java +++ b/src/java/org/apache/cassandra/utils/memory/Pool.java @@ -4,7 +4,6 @@ import org.apache.cassandra.utils.concurrent.OpOrder; import org.apache.cassandra.utils.concurrent.WaitQueue; import java.util.concurrent.atomic.AtomicLong; -import java.util.concurrent.atomic.AtomicLongFieldUpdater; /** http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/src/java/org/apache/cassandra/utils/obs/OpenBitSet.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/obs/OpenBitSet.java b/src/java/org/apache/cassandra/utils/obs/OpenBitSet.java index b5310fa..5657d41 100644 --- a/src/java/org/apache/cassandra/utils/obs/OpenBitSet.java +++ b/src/java/org/apache/cassandra/utils/obs/OpenBitSet.java @@ -307,7 +307,7 @@ public class OpenBitSet implements IBitSet long[][] thisArr = this.bits; long[][] otherArr = other.bits; int thisPageSize = PAGE_SIZE; - int otherPageSize = other.PAGE_SIZE; + int otherPageSize = OpenBitSet.PAGE_SIZE; // testing against zero can be more efficient int pos=newLen; while(--pos>=0) { @@ -357,8 +357,8 @@ public class OpenBitSet implements IBitSet a=this; } - int aPageSize = this.PAGE_SIZE; - int bPageSize = b.PAGE_SIZE; + int aPageSize = OpenBitSet.PAGE_SIZE; + int bPageSize = OpenBitSet.PAGE_SIZE; // check for any set bits out of the range of b for (int i=a.wlen-1; i>=b.wlen; i--) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java index 601836c..50f4a65 100644 --- a/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java +++ b/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java @@ -26,7 +26,6 @@ import java.util.concurrent.TimeUnit; import com.google.common.base.Function; import com.google.common.collect.Iterables; -import com.google.common.collect.SetMultimap; import com.google.common.collect.Sets; import org.junit.Test; import org.junit.runner.RunWith; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java index 0e38e16..4e191e9 100644 --- a/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/CQLSSTableWriterTest.java @@ -26,16 +26,12 @@ import org.junit.Test; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertFalse; -import org.apache.cassandra.SchemaLoader; -import org.apache.cassandra.Util; import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.Schema; import org.apache.cassandra.cql3.*; -import org.apache.cassandra.db.*; import org.apache.cassandra.dht.Range; import org.apache.cassandra.dht.Token; import org.apache.cassandra.service.StorageService; -import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.OutputHandler; http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java b/test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java index 9d0e6cf..59ef4c4 100644 --- a/test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/IndexHelperTest.java @@ -27,10 +27,8 @@ import org.junit.Test; import org.apache.cassandra.Util; import org.apache.cassandra.db.composites.*; -import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.IntegerType; import static org.apache.cassandra.io.sstable.IndexHelper.IndexInfo; -import static org.apache.cassandra.utils.ByteBufferUtil.bytes; public class IndexHelperTest { http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java index e9cca75..2253302 100644 --- a/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java +++ b/test/unit/org/apache/cassandra/io/sstable/IndexSummaryTest.java @@ -42,7 +42,6 @@ import static org.apache.cassandra.io.sstable.Downsampling.BASE_SAMPLING_LEVEL; import static org.apache.cassandra.io.sstable.Downsampling.MIN_SAMPLING_LEVEL; import static org.junit.Assert.*; -import static org.junit.Assert.assertEquals; public class IndexSummaryTest { http://git-wip-us.apache.org/repos/asf/cassandra/blob/02fb2189/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java b/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java index 1123fc0..78ae1c1 100644 --- a/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java +++ b/test/unit/org/apache/cassandra/service/AntiEntropyServiceTestAbstract.java @@ -45,7 +45,6 @@ import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.repair.RepairJobDesc; import org.apache.cassandra.utils.FBUtilities; -import static org.apache.cassandra.service.ActiveRepairService.*; import static org.junit.Assert.assertEquals; public abstract class AntiEntropyServiceTestAbstract extends SchemaLoader
