Repository: cassandra Updated Branches: refs/heads/trunk 0a0ee442f -> 3ca9576c9
imports cleanup Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/3ca9576c Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/3ca9576c Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/3ca9576c Branch: refs/heads/trunk Commit: 3ca9576c91386e920a0a3356fc9fa10e2f9c580b Parents: 0a0ee44 Author: Dave Brosius <dbros...@mebigfatguy.com> Authored: Fri Aug 22 19:38:05 2014 -0400 Committer: Dave Brosius <dbros...@mebigfatguy.com> Committed: Fri Aug 22 19:38:05 2014 -0400 ---------------------------------------------------------------------- src/java/org/apache/cassandra/config/UFMetaData.java | 2 -- .../org/apache/cassandra/cql3/statements/CQL3CasRequest.java | 1 - src/java/org/apache/cassandra/db/AtomicBTreeColumns.java | 1 - src/java/org/apache/cassandra/db/BufferDecoratedKey.java | 2 -- src/java/org/apache/cassandra/db/DecoratedKey.java | 3 --- src/java/org/apache/cassandra/db/DeletionInfo.java | 1 - src/java/org/apache/cassandra/db/Memtable.java | 1 - src/java/org/apache/cassandra/db/NativeDecoratedKey.java | 1 - src/java/org/apache/cassandra/db/RangeTombstoneList.java | 1 - .../org/apache/cassandra/db/compaction/LeveledManifest.java | 2 -- .../db/composites/AbstractCompoundCellNameType.java | 2 -- src/java/org/apache/cassandra/db/composites/SimpleCType.java | 2 -- src/java/org/apache/cassandra/db/filter/ExtendedFilter.java | 3 --- .../org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java | 8 -------- .../org/apache/cassandra/io/sstable/ColumnNameHelper.java | 1 - .../org/apache/cassandra/locator/SimpleSeedProvider.java | 6 ------ src/java/org/apache/cassandra/net/ResponseVerbHandler.java | 1 - src/java/org/apache/cassandra/service/MigrationManager.java | 1 - .../org/apache/cassandra/streaming/StreamTransferTask.java | 2 -- src/java/org/apache/cassandra/thrift/CassandraServer.java | 1 - .../apache/cassandra/tools/BulkLoadConnectionFactory.java | 2 -- src/java/org/apache/cassandra/tools/BulkLoader.java | 1 - src/java/org/apache/cassandra/tools/StandaloneSplitter.java | 1 - src/java/org/apache/cassandra/tools/StandaloneUpgrader.java | 1 - src/java/org/apache/cassandra/utils/memory/MemoryUtil.java | 1 - 25 files changed, 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/config/UFMetaData.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/UFMetaData.java b/src/java/org/apache/cassandra/config/UFMetaData.java index f11d7ac..4d5f6d3 100644 --- a/src/java/org/apache/cassandra/config/UFMetaData.java +++ b/src/java/org/apache/cassandra/config/UFMetaData.java @@ -50,9 +50,7 @@ import org.apache.cassandra.db.composites.Composite; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.db.marshal.UTF8Type; -import org.apache.cassandra.exceptions.ConfigurationException; import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.cassandra.exceptions.SyntaxException; /** * Defined (and loaded) user functions. http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java index b04c624..06f80e0 100644 --- a/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java +++ b/src/java/org/apache/cassandra/cql3/statements/CQL3CasRequest.java @@ -25,7 +25,6 @@ import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.*; import org.apache.cassandra.db.composites.Composite; import org.apache.cassandra.db.filter.*; -import org.apache.cassandra.db.marshal.CompositeType; import org.apache.cassandra.exceptions.InvalidRequestException; import org.apache.cassandra.service.CASRequest; import org.apache.cassandra.utils.Pair; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java index 2ce4fda..0572c4a 100644 --- a/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java +++ b/src/java/org/apache/cassandra/db/AtomicBTreeColumns.java @@ -42,7 +42,6 @@ import org.apache.cassandra.utils.btree.UpdateFunction; import org.apache.cassandra.utils.concurrent.OpOrder; import org.apache.cassandra.utils.memory.HeapAllocator; import org.apache.cassandra.utils.memory.MemtableAllocator; -import org.apache.cassandra.utils.memory.NativeAllocator; import org.apache.cassandra.utils.memory.NativePool; import static org.apache.cassandra.db.index.SecondaryIndexManager.Updater; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/db/BufferDecoratedKey.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/BufferDecoratedKey.java b/src/java/org/apache/cassandra/db/BufferDecoratedKey.java index 8a1ad59..d375162 100644 --- a/src/java/org/apache/cassandra/db/BufferDecoratedKey.java +++ b/src/java/org/apache/cassandra/db/BufferDecoratedKey.java @@ -20,8 +20,6 @@ package org.apache.cassandra.db; import java.nio.ByteBuffer; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.utils.FastByteOperations; -import org.apache.cassandra.utils.memory.MemoryUtil; public class BufferDecoratedKey extends DecoratedKey { http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/db/DecoratedKey.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/DecoratedKey.java b/src/java/org/apache/cassandra/db/DecoratedKey.java index 604cbb7..fb3d7ab 100644 --- a/src/java/org/apache/cassandra/db/DecoratedKey.java +++ b/src/java/org/apache/cassandra/db/DecoratedKey.java @@ -20,13 +20,10 @@ package org.apache.cassandra.db; import java.nio.ByteBuffer; import java.util.Comparator; -import net.nicoulaj.compilecommand.annotations.Inline; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Token; import org.apache.cassandra.service.StorageService; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FastByteOperations; -import org.apache.cassandra.utils.memory.MemoryUtil; /** * Represents a decorated key, handy for certain operations http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/db/DeletionInfo.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/DeletionInfo.java b/src/java/org/apache/cassandra/db/DeletionInfo.java index 193f8b1..3e5e845 100644 --- a/src/java/org/apache/cassandra/db/DeletionInfo.java +++ b/src/java/org/apache/cassandra/db/DeletionInfo.java @@ -34,7 +34,6 @@ import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.utils.ByteBufferUtil; import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.memory.AbstractAllocator; -import org.apache.cassandra.utils.memory.MemtableAllocator; /** * A combination of a top-level (or row) tombstone and range tombstones describing the deletions http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/db/Memtable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java index 2e22113..4825676 100644 --- a/src/java/org/apache/cassandra/db/Memtable.java +++ b/src/java/org/apache/cassandra/db/Memtable.java @@ -23,7 +23,6 @@ import java.util.Iterator; import java.util.Map; import java.util.concurrent.ConcurrentNavigableMap; import java.util.concurrent.ConcurrentSkipListMap; -import java.util.concurrent.ExecutionException; import java.util.concurrent.TimeUnit; import java.util.concurrent.atomic.AtomicLong; import java.util.concurrent.atomic.AtomicReference; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/db/NativeDecoratedKey.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/NativeDecoratedKey.java b/src/java/org/apache/cassandra/db/NativeDecoratedKey.java index 79dc53f..ca874c3 100644 --- a/src/java/org/apache/cassandra/db/NativeDecoratedKey.java +++ b/src/java/org/apache/cassandra/db/NativeDecoratedKey.java @@ -20,7 +20,6 @@ package org.apache.cassandra.db; import java.nio.ByteBuffer; import org.apache.cassandra.dht.Token; -import org.apache.cassandra.utils.FastByteOperations; import org.apache.cassandra.utils.concurrent.OpOrder; import org.apache.cassandra.utils.memory.MemoryUtil; import org.apache.cassandra.utils.memory.NativeAllocator; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/db/RangeTombstoneList.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/RangeTombstoneList.java b/src/java/org/apache/cassandra/db/RangeTombstoneList.java index cbb4abe..cd1d236 100644 --- a/src/java/org/apache/cassandra/db/RangeTombstoneList.java +++ b/src/java/org/apache/cassandra/db/RangeTombstoneList.java @@ -39,7 +39,6 @@ import org.apache.cassandra.io.util.DataOutputPlus; import org.apache.cassandra.net.MessagingService; import org.apache.cassandra.utils.ObjectSizes; import org.apache.cassandra.utils.memory.AbstractAllocator; -import org.apache.cassandra.utils.memory.HeapPool; /** * Data structure holding the range tombstones of a ColumnFamily. http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java index 6ed21c8..aac8b2d 100644 --- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java +++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java @@ -31,9 +31,7 @@ import com.google.common.primitives.Ints; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.Schema; import org.apache.cassandra.db.ColumnFamilyStore; import org.apache.cassandra.db.RowPosition; import org.apache.cassandra.dht.Bounds; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/db/composites/AbstractCompoundCellNameType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/composites/AbstractCompoundCellNameType.java b/src/java/org/apache/cassandra/db/composites/AbstractCompoundCellNameType.java index 40537ed..bf303a7 100644 --- a/src/java/org/apache/cassandra/db/composites/AbstractCompoundCellNameType.java +++ b/src/java/org/apache/cassandra/db/composites/AbstractCompoundCellNameType.java @@ -20,9 +20,7 @@ package org.apache.cassandra.db.composites; import java.io.DataInput; import java.io.IOException; import java.nio.ByteBuffer; -import java.util.Comparator; -import org.apache.cassandra.db.Cell; import org.apache.cassandra.db.marshal.AbstractType; import org.apache.cassandra.db.marshal.CompositeType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/db/composites/SimpleCType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/composites/SimpleCType.java b/src/java/org/apache/cassandra/db/composites/SimpleCType.java index c824179..7ee45ac 100644 --- a/src/java/org/apache/cassandra/db/composites/SimpleCType.java +++ b/src/java/org/apache/cassandra/db/composites/SimpleCType.java @@ -18,11 +18,9 @@ package org.apache.cassandra.db.composites; import java.nio.ByteBuffer; -import java.util.Comparator; import java.util.List; import org.apache.cassandra.db.marshal.AbstractType; -import org.apache.cassandra.utils.ByteBufferUtil; /** * A not truly-composite CType. http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java b/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java index bc59152..4941663 100644 --- a/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java +++ b/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java @@ -20,10 +20,7 @@ package org.apache.cassandra.db.filter; import java.nio.ByteBuffer; import java.util.*; -import com.google.common.base.Predicate; -import com.google.common.collect.Iterators; import org.apache.cassandra.db.marshal.CollectionType; -import org.apache.cassandra.utils.ByteBufferUtil; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java index 137bddf..73a291b 100644 --- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java +++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java @@ -28,10 +28,6 @@ import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; import java.security.UnrecoverableKeyException; import java.security.cert.CertificateException; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.Set; import javax.net.ssl.KeyManagerFactory; import javax.net.ssl.SSLContext; @@ -45,18 +41,14 @@ import org.apache.hadoop.conf.Configuration; import com.datastax.driver.core.AuthProvider; import com.datastax.driver.core.PlainTextAuthProvider; import com.datastax.driver.core.Cluster; -import com.datastax.driver.core.Host; import com.datastax.driver.core.HostDistance; import com.datastax.driver.core.PoolingOptions; import com.datastax.driver.core.ProtocolOptions; import com.datastax.driver.core.QueryOptions; import com.datastax.driver.core.SSLOptions; import com.datastax.driver.core.SocketOptions; -import com.datastax.driver.core.Statement; import com.datastax.driver.core.policies.LoadBalancingPolicy; import com.google.common.base.Optional; -import com.google.common.collect.Iterators; -import com.google.common.collect.Sets; public class CqlConfigHelper { http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/io/sstable/ColumnNameHelper.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/ColumnNameHelper.java b/src/java/org/apache/cassandra/io/sstable/ColumnNameHelper.java index f74b86f..5ed8048 100644 --- a/src/java/org/apache/cassandra/io/sstable/ColumnNameHelper.java +++ b/src/java/org/apache/cassandra/io/sstable/ColumnNameHelper.java @@ -21,7 +21,6 @@ import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.List; -import org.apache.cassandra.db.composites.CellName; import org.apache.cassandra.db.composites.CellNameType; import org.apache.cassandra.db.composites.Composite; import org.apache.cassandra.db.marshal.AbstractType; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java b/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java index 6f36cd0..665261d 100644 --- a/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java +++ b/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java @@ -17,9 +17,7 @@ */ package org.apache.cassandra.locator; -import java.io.InputStream; import java.net.InetAddress; -import java.net.URL; import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collections; @@ -28,12 +26,8 @@ import java.util.Map; import org.apache.cassandra.config.Config; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.SeedProviderDef; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.yaml.snakeyaml.Loader; -import org.yaml.snakeyaml.TypeDescription; -import org.yaml.snakeyaml.Yaml; public class SimpleSeedProvider implements SeedProvider { http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/net/ResponseVerbHandler.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/ResponseVerbHandler.java b/src/java/org/apache/cassandra/net/ResponseVerbHandler.java index 0ec91c6..1d9aa98 100644 --- a/src/java/org/apache/cassandra/net/ResponseVerbHandler.java +++ b/src/java/org/apache/cassandra/net/ResponseVerbHandler.java @@ -19,7 +19,6 @@ package org.apache.cassandra.net; import java.util.concurrent.TimeUnit; -import org.apache.cassandra.db.IMutation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/MigrationManager.java b/src/java/org/apache/cassandra/service/MigrationManager.java index c203934..6e930e6 100644 --- a/src/java/org/apache/cassandra/service/MigrationManager.java +++ b/src/java/org/apache/cassandra/service/MigrationManager.java @@ -31,7 +31,6 @@ import java.lang.management.RuntimeMXBean; import org.apache.cassandra.config.UFMetaData; import org.apache.cassandra.exceptions.InvalidRequestException; -import org.apache.cassandra.exceptions.SyntaxException; import org.slf4j.Logger; import org.slf4j.LoggerFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/streaming/StreamTransferTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java index 6e8c886..b840ee5 100644 --- a/src/java/org/apache/cassandra/streaming/StreamTransferTask.java +++ b/src/java/org/apache/cassandra/streaming/StreamTransferTask.java @@ -21,9 +21,7 @@ import java.util.*; import java.util.concurrent.*; import java.util.concurrent.ScheduledFuture; import java.util.concurrent.atomic.AtomicInteger; -import java.util.concurrent.atomic.AtomicBoolean; -import io.netty.util.concurrent.*; import org.apache.cassandra.concurrent.NamedThreadFactory; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.streaming.messages.OutgoingFileMessage; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/thrift/CassandraServer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/thrift/CassandraServer.java b/src/java/org/apache/cassandra/thrift/CassandraServer.java index 391b608..311df74 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -18,7 +18,6 @@ package org.apache.cassandra.thrift; import java.io.IOException; -import java.io.UnsupportedEncodingException; import java.nio.ByteBuffer; import java.nio.charset.CharacterCodingException; import java.nio.charset.StandardCharsets; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/tools/BulkLoadConnectionFactory.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/BulkLoadConnectionFactory.java b/src/java/org/apache/cassandra/tools/BulkLoadConnectionFactory.java index 399344e..aa23f45 100644 --- a/src/java/org/apache/cassandra/tools/BulkLoadConnectionFactory.java +++ b/src/java/org/apache/cassandra/tools/BulkLoadConnectionFactory.java @@ -22,8 +22,6 @@ import java.net.InetAddress; import java.net.InetSocketAddress; import java.net.Socket; import java.nio.channels.SocketChannel; -import java.util.HashSet; -import java.util.Set; import org.apache.cassandra.config.EncryptionOptions; import org.apache.cassandra.security.SSLFactory; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/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 50e340b..1e1def0 100644 --- a/src/java/org/apache/cassandra/tools/BulkLoader.java +++ b/src/java/org/apache/cassandra/tools/BulkLoader.java @@ -24,7 +24,6 @@ import java.util.*; import com.google.common.base.Joiner; import com.google.common.collect.HashMultimap; import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; import org.apache.commons.cli.*; import org.apache.thrift.protocol.TBinaryProtocol; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/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 befe270..bcf9869 100644 --- a/src/java/org/apache/cassandra/tools/StandaloneSplitter.java +++ b/src/java/org/apache/cassandra/tools/StandaloneSplitter.java @@ -19,7 +19,6 @@ package org.apache.cassandra.tools; import java.io.File; -import java.io.IOException; import java.util.*; import org.apache.commons.cli.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java index 1538efc..1a8a89f 100644 --- a/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java +++ b/src/java/org/apache/cassandra/tools/StandaloneUpgrader.java @@ -17,7 +17,6 @@ */ package org.apache.cassandra.tools; -import java.io.IOException; import java.util.*; import org.apache.commons.cli.*; http://git-wip-us.apache.org/repos/asf/cassandra/blob/3ca9576c/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java b/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java index 129a60b..532d071 100644 --- a/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java +++ b/src/java/org/apache/cassandra/utils/memory/MemoryUtil.java @@ -22,7 +22,6 @@ import java.nio.Buffer; import java.nio.ByteBuffer; import java.nio.ByteOrder; -import com.google.common.primitives.*; import sun.misc.Unsafe; public abstract class MemoryUtil
