Updated Branches: refs/heads/trunk c517c628f -> 7588f74d0
simple warnings cleanups Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7588f74d Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7588f74d Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7588f74d Branch: refs/heads/trunk Commit: 7588f74d01afe5f65ee3ce7afe2b4423ece0970d Parents: c517c62 Author: Dave Brosius <[email protected]> Authored: Sun Jul 29 18:38:19 2012 -0400 Committer: Dave Brosius <[email protected]> Committed: Sun Jul 29 18:38:19 2012 -0400 ---------------------------------------------------------------------- .../cassandra/config/DatabaseDescriptor.java | 12 ++++++------ src/java/org/apache/cassandra/config/Schema.java | 2 -- .../apache/cassandra/config/SeedProviderDef.java | 2 +- .../cassandra/db/AbstractColumnContainer.java | 4 ---- src/java/org/apache/cassandra/db/Column.java | 4 ---- .../cassandra/db/ColumnFamilySerializer.java | 4 ---- .../org/apache/cassandra/db/ColumnSerializer.java | 5 ----- .../org/apache/cassandra/db/CounterMutation.java | 4 ---- .../db/columniterator/SSTableNamesIterator.java | 5 ----- .../db/compaction/AbstractCompactionIterable.java | 5 ----- .../db/compaction/AbstractCompactionTask.java | 1 - .../db/compaction/CompactionIterable.java | 5 ----- .../cassandra/db/compaction/CompactionTask.java | 1 - .../cassandra/db/compaction/PrecompactedRow.java | 5 ----- .../apache/cassandra/db/compaction/Scrubber.java | 1 - .../cassandra/db/context/CounterContext.java | 1 - .../apache/cassandra/db/filter/QueryFilter.java | 5 ----- .../cassandra/db/index/SecondaryIndexManager.java | 6 +----- .../cassandra/db/marshal/DynamicCompositeType.java | 5 ----- .../org/apache/cassandra/db/marshal/SetType.java | 5 ----- .../org/apache/cassandra/dht/IPartitioner.java | 2 +- .../org/apache/cassandra/gms/EndpointState.java | 2 -- .../apache/cassandra/hadoop/BulkOutputFormat.java | 4 ---- .../cassandra/hadoop/ColumnFamilyOutputFormat.java | 5 ----- .../cassandra/hadoop/pig/CassandraStorage.java | 1 - .../io/compress/CompressedRandomAccessReader.java | 4 ---- .../cassandra/io/sstable/SSTableMetadata.java | 2 -- .../cassandra/io/sstable/SSTableScanner.java | 5 ----- .../apache/cassandra/io/util/SequentialWriter.java | 1 - .../apache/cassandra/locator/TokenMetadata.java | 6 +++--- src/java/org/apache/cassandra/net/AsyncResult.java | 5 ----- .../service/RangeSliceResponseResolver.java | 4 ---- .../apache/cassandra/thrift/CassandraServer.java | 3 +-- .../apache/cassandra/tools/StandaloneScrubber.java | 2 +- src/java/org/apache/cassandra/utils/NodeId.java | 4 ++-- .../apache/cassandra/io/sstable/SSTableUtils.java | 5 ----- .../org/apache/cassandra/utils/MerkleTreeTest.java | 4 ---- 37 files changed, 16 insertions(+), 125 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java index 186b190..e3b91c6 100644 --- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java +++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java @@ -71,7 +71,7 @@ public class DatabaseDescriptor private static SeedProvider seedProvider; /* Hashing strategy Random or OPHF */ - private static IPartitioner partitioner; + private static IPartitioner<?> partitioner; private static Config.DiskAccessMode indexAccessMode; @@ -356,7 +356,7 @@ public class DatabaseDescriptor { requestSchedulerOptions = new RequestSchedulerOptions(); } - Class cls = Class.forName(conf.request_scheduler); + Class<?> cls = Class.forName(conf.request_scheduler); requestScheduler = (IRequestScheduler) cls.getConstructor(RequestSchedulerOptions.class).newInstance(requestSchedulerOptions); } catch (ClassNotFoundException e) @@ -473,7 +473,7 @@ public class DatabaseDescriptor } try { - Class seedProviderClass = Class.forName(conf.seed_provider.class_name); + Class<?> seedProviderClass = Class.forName(conf.seed_provider.class_name); seedProvider = (SeedProvider)seedProviderClass.getConstructor(Map.class).newInstance(conf.seed_provider.parameters); } // there are about 5 checked exceptions that could be thrown here. @@ -637,13 +637,13 @@ public class DatabaseDescriptor } } - public static IPartitioner getPartitioner() + public static IPartitioner<?> getPartitioner() { return partitioner; } /* For tests ONLY, don't use otherwise or all hell will break loose */ - public static void setPartitioner(IPartitioner newPartitioner) + public static void setPartitioner(IPartitioner<?> newPartitioner) { partitioner = newPartitioner; } @@ -893,7 +893,7 @@ public class DatabaseDescriptor public static Set<InetAddress> getSeeds() { - return Collections.unmodifiableSet(new HashSet(seedProvider.getSeeds())); + return Collections.unmodifiableSet(new HashSet<InetAddress>(seedProvider.getSeeds())); } public static InetAddress getListenAddress() http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/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 0c710e5..9168f96 100644 --- a/src/java/org/apache/cassandra/config/Schema.java +++ b/src/java/org/apache/cassandra/config/Schema.java @@ -21,8 +21,6 @@ import java.nio.ByteBuffer; import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import java.util.*; -import java.util.concurrent.locks.ReadWriteLock; -import java.util.concurrent.locks.ReentrantReadWriteLock; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/config/SeedProviderDef.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/config/SeedProviderDef.java b/src/java/org/apache/cassandra/config/SeedProviderDef.java index 54853df..cbe444a 100644 --- a/src/java/org/apache/cassandra/config/SeedProviderDef.java +++ b/src/java/org/apache/cassandra/config/SeedProviderDef.java @@ -27,7 +27,7 @@ public class SeedProviderDef public String class_name; public Map<String, String> parameters; - public SeedProviderDef(LinkedHashMap p) + public SeedProviderDef(LinkedHashMap<String, ?> p) { class_name = (String)p.get("class_name"); parameters = (Map<String, String>)((List)p.get("parameters")).get(0); http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/AbstractColumnContainer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/AbstractColumnContainer.java b/src/java/org/apache/cassandra/db/AbstractColumnContainer.java index 2c86070..9ad0fda 100644 --- a/src/java/org/apache/cassandra/db/AbstractColumnContainer.java +++ b/src/java/org/apache/cassandra/db/AbstractColumnContainer.java @@ -24,8 +24,6 @@ import java.util.SortedSet; import com.google.common.base.Function; import com.google.common.base.Functions; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.cassandra.db.filter.ColumnSlice; import org.apache.cassandra.db.marshal.AbstractType; @@ -35,8 +33,6 @@ import org.apache.cassandra.utils.HeapAllocator; public abstract class AbstractColumnContainer implements IColumnContainer, IIterableColumns { - private static final Logger logger = LoggerFactory.getLogger(AbstractColumnContainer.class); - protected final ISortedColumns columns; protected AbstractColumnContainer(ISortedColumns columns) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/Column.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/Column.java b/src/java/org/apache/cassandra/db/Column.java index 27fc182..23eaa7e 100644 --- a/src/java/org/apache/cassandra/db/Column.java +++ b/src/java/org/apache/cassandra/db/Column.java @@ -25,9 +25,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.marshal.*; import org.apache.cassandra.io.util.DataOutputBuffer; @@ -43,7 +40,6 @@ import org.apache.cassandra.utils.HeapAllocator; public class Column implements IColumn { - private static final Logger logger = LoggerFactory.getLogger(Column.class); private static final ColumnSerializer serializer = new ColumnSerializer(); private static final OnDiskAtom.Serializer onDiskSerializer = new OnDiskAtom.Serializer(serializer); http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java b/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java index 831fd3d..d3d6a59 100644 --- a/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java +++ b/src/java/org/apache/cassandra/db/ColumnFamilySerializer.java @@ -23,8 +23,6 @@ import java.io.IOException; import java.util.UUID; import org.apache.cassandra.config.Schema; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.cassandra.io.IColumnSerializer; import org.apache.cassandra.io.IVersionedSerializer; @@ -35,8 +33,6 @@ import org.apache.cassandra.utils.UUIDGen; public class ColumnFamilySerializer implements IVersionedSerializer<ColumnFamily>, ISSTableSerializer<ColumnFamily> { - private static final Logger logger = LoggerFactory.getLogger(ColumnFamilySerializer.class); - /* * Serialized ColumnFamily format: * http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/ColumnSerializer.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/ColumnSerializer.java b/src/java/org/apache/cassandra/db/ColumnSerializer.java index 5a691bc..d4a3e64 100644 --- a/src/java/org/apache/cassandra/db/ColumnSerializer.java +++ b/src/java/org/apache/cassandra/db/ColumnSerializer.java @@ -22,9 +22,6 @@ import java.io.DataOutput; import java.io.IOException; import java.nio.ByteBuffer; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.IColumnSerializer; import org.apache.cassandra.io.util.FileDataInput; @@ -32,8 +29,6 @@ import org.apache.cassandra.utils.ByteBufferUtil; public class ColumnSerializer implements IColumnSerializer { - private static final Logger logger = LoggerFactory.getLogger(ColumnSerializer.class); - public final static int DELETION_MASK = 0x01; public final static int EXPIRATION_MASK = 0x02; public final static int COUNTER_MASK = 0x04; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/CounterMutation.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/CounterMutation.java b/src/java/org/apache/cassandra/db/CounterMutation.java index 07ae713..601df94 100644 --- a/src/java/org/apache/cassandra/db/CounterMutation.java +++ b/src/java/org/apache/cassandra/db/CounterMutation.java @@ -26,9 +26,6 @@ import java.util.LinkedList; import java.util.List; import java.util.UUID; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.db.filter.QueryPath; import org.apache.cassandra.io.IVersionedSerializer; import org.apache.cassandra.net.MessageOut; @@ -39,7 +36,6 @@ import org.apache.cassandra.utils.HeapAllocator; public class CounterMutation implements IMutation { - private static final Logger logger = LoggerFactory.getLogger(CounterMutation.class); public static final CounterMutationSerializer serializer = new CounterMutationSerializer(); private final RowMutation rowMutation; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java b/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java index 0a5bed9..05d2bc0 100644 --- a/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java +++ b/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java @@ -21,9 +21,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.config.CFMetaData; import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.db.ColumnFamilySerializer; @@ -44,8 +41,6 @@ import org.apache.cassandra.utils.Filter; public class SSTableNamesIterator extends SimpleAbstractColumnIterator implements OnDiskAtomIterator { - private static final Logger logger = LoggerFactory.getLogger(SSTableNamesIterator.class); - private ColumnFamily cf; private final SSTableReader sstable; private FileDataInput fileToClose; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java index d23aa90..def7191 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java @@ -19,15 +19,10 @@ package org.apache.cassandra.db.compaction; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.utils.CloseableIterator; public abstract class AbstractCompactionIterable extends CompactionInfo.Holder implements Iterable<AbstractCompactedRow> { - private static final Logger logger = LoggerFactory.getLogger(AbstractCompactionIterable.class); - protected final OperationType type; protected final CompactionController controller; protected final long totalBytes; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java index 59becfe..ae4c344 100644 --- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java @@ -19,7 +19,6 @@ package org.apache.cassandra.db.compaction; import java.util.Collection; import java.util.Set; -import java.io.IOException; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.db.ColumnFamilyStore; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/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 e445866..f095a57 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java @@ -21,9 +21,6 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.io.sstable.SSTableIdentityIterator; import org.apache.cassandra.utils.CloseableIterator; @@ -31,8 +28,6 @@ import org.apache.cassandra.utils.MergeIterator; public class CompactionIterable extends AbstractCompactionIterable { - private static final Logger logger = LoggerFactory.getLogger(CompactionIterable.class); - private long row; private static final Comparator<OnDiskAtomIterator> comparator = new Comparator<OnDiskAtomIterator>() http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/compaction/CompactionTask.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java index 7382fa9..796d56b 100644 --- a/src/java/org/apache/cassandra/db/compaction/CompactionTask.java +++ b/src/java/org/apache/cassandra/db/compaction/CompactionTask.java @@ -37,7 +37,6 @@ import org.apache.cassandra.io.sstable.SSTable; import org.apache.cassandra.io.sstable.SSTableReader; import org.apache.cassandra.io.sstable.SSTableWriter; import org.apache.cassandra.utils.CloseableIterator; -import org.apache.cassandra.utils.FBUtilities; public class CompactionTask extends AbstractCompactionTask { http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java index 292989a..8a4888b 100644 --- a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java +++ b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java @@ -22,9 +22,6 @@ import java.io.IOException; import java.security.MessageDigest; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.db.*; import org.apache.cassandra.io.sstable.ColumnStats; import org.apache.cassandra.io.sstable.SSTableIdentityIterator; @@ -36,8 +33,6 @@ import org.apache.cassandra.utils.HeapAllocator; */ public class PrecompactedRow extends AbstractCompactedRow { - private static final Logger logger = LoggerFactory.getLogger(PrecompactedRow.class); - private final ColumnFamily compactedCf; private ColumnIndex columnIndex; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/compaction/Scrubber.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/compaction/Scrubber.java b/src/java/org/apache/cassandra/db/compaction/Scrubber.java index afff988..faf7e60 100644 --- a/src/java/org/apache/cassandra/db/compaction/Scrubber.java +++ b/src/java/org/apache/cassandra/db/compaction/Scrubber.java @@ -29,7 +29,6 @@ import org.apache.cassandra.io.sstable.*; import org.apache.cassandra.io.util.FileUtils; import org.apache.cassandra.io.util.RandomAccessReader; import org.apache.cassandra.utils.ByteBufferUtil; -import org.apache.cassandra.utils.FBUtilities; import org.apache.cassandra.utils.OutputHandler; public class Scrubber implements Closeable http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/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 7abf409..42b5960 100644 --- a/src/java/org/apache/cassandra/db/context/CounterContext.java +++ b/src/java/org/apache/cassandra/db/context/CounterContext.java @@ -589,7 +589,6 @@ public class CounterContext implements IContext NodeId.NodeIdRecord currRecord = recordIterator.hasNext() ? recordIterator.next() : null; ContextState state = new ContextState(context, hlength); - ContextState foundState = null; List<NodeId> toMerge = new ArrayList<NodeId>(); long mergeTotal = 0; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/filter/QueryFilter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/filter/QueryFilter.java b/src/java/org/apache/cassandra/db/filter/QueryFilter.java index 686d2cc..786033c 100644 --- a/src/java/org/apache/cassandra/db/filter/QueryFilter.java +++ b/src/java/org/apache/cassandra/db/filter/QueryFilter.java @@ -21,9 +21,6 @@ import java.io.IOException; import java.nio.ByteBuffer; import java.util.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.db.*; import org.apache.cassandra.db.columniterator.OnDiskAtomIterator; import org.apache.cassandra.db.columniterator.IdentityQueryFilter; @@ -34,8 +31,6 @@ import org.apache.cassandra.utils.MergeIterator; public class QueryFilter { - private static final Logger logger = LoggerFactory.getLogger(QueryFilter.class); - public final DecoratedKey key; public final QueryPath path; public final IFilter filter; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java index 1189d72..554aa8d 100644 --- a/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java +++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexManager.java @@ -28,10 +28,6 @@ import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.apache.commons.lang.StringUtils; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.config.ColumnDefinition; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.db.*; @@ -609,7 +605,7 @@ public class SecondaryIndexManager for (ByteBuffer colName : indexes) indexesByColumn.get(colName).setIndexRemoved(colName); } - + public boolean validate(Column column) { SecondaryIndex index = getIndexForColumn(column.name); http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java b/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java index 40752e5..5eeccfd 100644 --- a/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java +++ b/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java @@ -25,9 +25,6 @@ import java.util.Map; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.utils.ByteBufferUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - /* * The encoding of a DynamicCompositeType column name should be: * <component><component><component> ... @@ -49,8 +46,6 @@ import org.slf4j.LoggerFactory; */ public class DynamicCompositeType extends AbstractCompositeType { - private static final Logger logger = LoggerFactory.getLogger(DynamicCompositeType.class); - private final Map<Byte, AbstractType<?>> aliases; // interning instances http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/db/marshal/SetType.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/db/marshal/SetType.java b/src/java/org/apache/cassandra/db/marshal/SetType.java index 1090d09..a4fa9e3 100644 --- a/src/java/org/apache/cassandra/db/marshal/SetType.java +++ b/src/java/org/apache/cassandra/db/marshal/SetType.java @@ -24,9 +24,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.db.IColumn; import org.apache.cassandra.config.ConfigurationException; import org.apache.cassandra.utils.ByteBufferUtil; @@ -35,8 +32,6 @@ import org.apache.cassandra.utils.Pair; public class SetType extends CollectionType { - private static final Logger logger = LoggerFactory.getLogger(SetType.class); - // interning instances private static final Map<AbstractType<?>, SetType> instances = new HashMap<AbstractType<?>, SetType>(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/dht/IPartitioner.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/dht/IPartitioner.java b/src/java/org/apache/cassandra/dht/IPartitioner.java index e00e5c4e..98b3658 100644 --- a/src/java/org/apache/cassandra/dht/IPartitioner.java +++ b/src/java/org/apache/cassandra/dht/IPartitioner.java @@ -84,5 +84,5 @@ public interface IPartitioner<T extends Token> */ public Map<Token, Float> describeOwnership(List<Token> sortedTokens); - public <T extends RingPosition> T minValue(Class<T> klass); + public <R extends RingPosition> R minValue(Class<R> klass); } http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/gms/EndpointState.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/gms/EndpointState.java b/src/java/org/apache/cassandra/gms/EndpointState.java index 94bd865..6cf7a06 100644 --- a/src/java/org/apache/cassandra/gms/EndpointState.java +++ b/src/java/org/apache/cassandra/gms/EndpointState.java @@ -112,8 +112,6 @@ public class EndpointState class EndpointStateSerializer implements IVersionedSerializer<EndpointState> { - private static final Logger logger = LoggerFactory.getLogger(EndpointStateSerializer.class); - public void serialize(EndpointState epState, DataOutput dos, int version) throws IOException { /* serialize the HeartBeatState */ http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/hadoop/BulkOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/BulkOutputFormat.java b/src/java/org/apache/cassandra/hadoop/BulkOutputFormat.java index d9b5f90..7a6a1d7 100644 --- a/src/java/org/apache/cassandra/hadoop/BulkOutputFormat.java +++ b/src/java/org/apache/cassandra/hadoop/BulkOutputFormat.java @@ -21,8 +21,6 @@ package org.apache.cassandra.hadoop; import java.io.IOException; import java.nio.ByteBuffer; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.cassandra.thrift.Mutation; import org.apache.hadoop.conf.Configuration; @@ -31,8 +29,6 @@ import org.apache.hadoop.mapreduce.*; public class BulkOutputFormat extends OutputFormat<ByteBuffer,List<Mutation>> implements org.apache.hadoop.mapred.OutputFormat<ByteBuffer,List<Mutation>> { - private static final Logger logger = LoggerFactory.getLogger(BulkOutputFormat.class); - @Override public void checkOutputSpecs(JobContext context) { http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java index eaf9f80..f663df6 100644 --- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java +++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyOutputFormat.java @@ -24,9 +24,6 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.auth.IAuthenticator; import org.apache.cassandra.thrift.*; import org.apache.hadoop.conf.Configuration; @@ -59,8 +56,6 @@ import org.apache.thrift.transport.TSocket; public class ColumnFamilyOutputFormat extends OutputFormat<ByteBuffer,List<Mutation>> implements org.apache.hadoop.mapred.OutputFormat<ByteBuffer,List<Mutation>> { - private static final Logger logger = LoggerFactory.getLogger(ColumnFamilyOutputFormat.class); - public static final String BATCH_THRESHOLD = "mapreduce.output.columnfamilyoutputformat.batch.threshold"; public static final String QUEUE_SIZE = "mapreduce.output.columnfamilyoutputformat.queue.size"; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java index 05a0943..33bddfe 100644 --- a/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java +++ b/src/java/org/apache/cassandra/hadoop/pig/CassandraStorage.java @@ -456,7 +456,6 @@ public class CassandraStorage extends LoadFunc implements StoreFuncInterface, Lo private void setLocationFromUri(String location) throws IOException { // parse uri into keyspace and columnfamily - String names[]; try { if (!location.startsWith("cassandra://")) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java index 2bc0c44..252ba64 100644 --- a/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java +++ b/src/java/org/apache/cassandra/io/compress/CompressedRandomAccessReader.java @@ -26,8 +26,6 @@ import java.util.zip.CRC32; import java.util.zip.Checksum; import com.google.common.primitives.Ints; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.cassandra.io.FSReadError; import org.apache.cassandra.io.sstable.CorruptSSTableException; @@ -37,8 +35,6 @@ import org.apache.cassandra.utils.FBUtilities; // TODO refactor this to separate concept of "buffer to avoid lots of read() syscalls" and "compression buffer" public class CompressedRandomAccessReader extends RandomAccessReader { - private static final Logger logger = LoggerFactory.getLogger(CompressedRandomAccessReader.class); - public static RandomAccessReader open(String dataFilePath, CompressionMetadata metadata) { return open(dataFilePath, metadata, false); http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java index 0413871..40a898f 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java @@ -45,8 +45,6 @@ import org.apache.cassandra.utils.EstimatedHistogram; */ public class SSTableMetadata { - private static final Logger logger = LoggerFactory.getLogger(SSTableMetadata.class); - public static final SSTableMetadataSerializer serializer = new SSTableMetadataSerializer(); public final EstimatedHistogram estimatedRowSize; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java b/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java index dafb12b..6566387 100644 --- a/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java +++ b/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java @@ -21,9 +21,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.Iterator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.db.compaction.ICompactionScanner; import org.apache.cassandra.db.DecoratedKey; import org.apache.cassandra.db.RowIndexEntry; @@ -36,8 +33,6 @@ import org.apache.cassandra.utils.ByteBufferUtil; public class SSTableScanner implements ICompactionScanner { - private static final Logger logger = LoggerFactory.getLogger(SSTableScanner.class); - protected final RandomAccessReader dfile; protected final RandomAccessReader ifile; public final SSTableReader sstable; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/io/util/SequentialWriter.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/io/util/SequentialWriter.java b/src/java/org/apache/cassandra/io/util/SequentialWriter.java index a80c687..3377226 100644 --- a/src/java/org/apache/cassandra/io/util/SequentialWriter.java +++ b/src/java/org/apache/cassandra/io/util/SequentialWriter.java @@ -23,7 +23,6 @@ import java.security.MessageDigest; import java.security.NoSuchAlgorithmException; import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.io.FSWriteError; import org.apache.cassandra.utils.CLibrary; public class SequentialWriter extends OutputStream http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/locator/TokenMetadata.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/locator/TokenMetadata.java b/src/java/org/apache/cassandra/locator/TokenMetadata.java index 7ad962b..f606475 100644 --- a/src/java/org/apache/cassandra/locator/TokenMetadata.java +++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java @@ -101,7 +101,7 @@ public class TokenMetadata return ByteBuffer.wrap(o1.getAddress()).compareTo(ByteBuffer.wrap(o2.getAddress())); } }; - + public TokenMetadata() { this(SortedBiMultiValMap.<Token, InetAddress>create(null, inetaddressCmp), new Topology()); @@ -271,7 +271,7 @@ public class TokenMetadata lock.writeLock().lock(); try { - + InetAddress oldEndpoint; for (Token token : tokens) @@ -279,7 +279,7 @@ public class TokenMetadata oldEndpoint = bootstrapTokens.get(token); if (oldEndpoint != null && !oldEndpoint.equals(endpoint)) throw new RuntimeException("Bootstrap Token collision between " + oldEndpoint + " and " + endpoint + " (token " + token); - + oldEndpoint = tokenToEndpointMap.get(token); if (oldEndpoint != null && !oldEndpoint.equals(endpoint)) throw new RuntimeException("Bootstrap Token collision between " + oldEndpoint + " and " + endpoint + " (token " + token); http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/net/AsyncResult.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/net/AsyncResult.java b/src/java/org/apache/cassandra/net/AsyncResult.java index 83023e1..bb166b6 100644 --- a/src/java/org/apache/cassandra/net/AsyncResult.java +++ b/src/java/org/apache/cassandra/net/AsyncResult.java @@ -25,13 +25,8 @@ import java.util.concurrent.locks.Condition; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - class AsyncResult<T> implements IAsyncResult<T> { - private static final Logger logger = LoggerFactory.getLogger(AsyncResult.class); - private T result; private final AtomicBoolean done = new AtomicBoolean(false); private final Lock lock = new ReentrantLock(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java b/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java index ba6b6bc..20ebddd 100644 --- a/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java +++ b/src/java/org/apache/cassandra/service/RangeSliceResponseResolver.java @@ -22,8 +22,6 @@ import java.net.InetAddress; import java.util.*; import java.util.concurrent.LinkedBlockingQueue; import com.google.common.collect.AbstractIterator; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.apache.cassandra.db.*; import org.apache.cassandra.net.IAsyncResult; @@ -38,8 +36,6 @@ import org.apache.cassandra.utils.MergeIterator; */ public class RangeSliceResponseResolver implements IResponseResolver<RangeSliceReply, Iterable<Row>> { - private static final Logger logger = LoggerFactory.getLogger(RangeSliceResponseResolver.class); - private static final Comparator<Pair<Row,InetAddress>> pairComparator = new Comparator<Pair<Row, InetAddress>>() { public int compare(Pair<Row, InetAddress> o1, Pair<Row, InetAddress> o2) http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/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 e594236..0b5205a 100644 --- a/src/java/org/apache/cassandra/thrift/CassandraServer.java +++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java @@ -433,7 +433,6 @@ public class CassandraServer implements Cassandra.Iface if (columns.isEmpty()) break; - ColumnOrSuperColumn firstColumn = columns.get(columns.size() - 1); ByteBuffer firstName = getName(columns.get(0)); int newColumns = pages == 0 || !firstName.equals(predicate.slice_range.start) ? columns.size() : columns.size() - 1; totalCount += newColumns; @@ -853,7 +852,7 @@ public class CassandraServer implements Cassandra.Iface { return StorageService.instance.describeRing(keyspace); } - + public Map<String, String> describe_token_map() throws InvalidRequestException { return StorageService.instance.getTokenToEndpointMap(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/tools/StandaloneScrubber.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java index 7e42d75..ac31a41 100644 --- a/src/java/org/apache/cassandra/tools/StandaloneScrubber.java +++ b/src/java/org/apache/cassandra/tools/StandaloneScrubber.java @@ -167,7 +167,7 @@ public class StandaloneScrubber System.out.println(String.format("Checking leveled manifest")); for (int i = 1; i <= manifest.getLevelCount(); ++i) { - List<SSTableReader> sstables = new ArrayList(manifest.getLevel(i)); + List<SSTableReader> sstables = new ArrayList<SSTableReader>(manifest.getLevel(i)); Collections.sort(sstables, SSTable.sstableComparator); if (sstables.isEmpty()) continue; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/src/java/org/apache/cassandra/utils/NodeId.java ---------------------------------------------------------------------- diff --git a/src/java/org/apache/cassandra/utils/NodeId.java b/src/java/org/apache/cassandra/utils/NodeId.java index 430c494..56fde68 100644 --- a/src/java/org/apache/cassandra/utils/NodeId.java +++ b/src/java/org/apache/cassandra/utils/NodeId.java @@ -199,13 +199,13 @@ public class NodeId implements Comparable<NodeId> logger.info("No saved local node id, using newly generated: {}", id); SystemTable.writeCurrentLocalNodeId(null, id, FBUtilities.timestampMicros()); current = new AtomicReference<NodeId>(id); - olds = new CopyOnWriteArrayList(); + olds = new CopyOnWriteArrayList<NodeIdRecord>(); } else { logger.info("Saved local node id: {}", id); current = new AtomicReference<NodeId>(id); - olds = new CopyOnWriteArrayList(SystemTable.getOldLocalNodeIds()); + olds = new CopyOnWriteArrayList<NodeIdRecord>(SystemTable.getOldLocalNodeIds()); } } http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java b/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java index 596db9e..2b0a13a 100644 --- a/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java +++ b/test/unit/org/apache/cassandra/io/sstable/SSTableUtils.java @@ -23,9 +23,6 @@ import java.io.File; import java.io.IOException; import java.util.*; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - import org.apache.cassandra.db.Column; import org.apache.cassandra.db.ColumnFamily; import org.apache.cassandra.db.DecoratedKey; @@ -39,8 +36,6 @@ import static org.junit.Assert.assertEquals; public class SSTableUtils { - private static Logger logger = LoggerFactory.getLogger(SSTableUtils.class); - // first configured table and cf public static String TABLENAME = "Keyspace1"; public static String CFNAME = "Standard1"; http://git-wip-us.apache.org/repos/asf/cassandra/blob/7588f74d/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java ---------------------------------------------------------------------- diff --git a/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java b/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java index ebb52ec..abf8630 100644 --- a/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java +++ b/test/unit/org/apache/cassandra/utils/MerkleTreeTest.java @@ -48,15 +48,11 @@ import org.apache.cassandra.utils.MerkleTree.TreeRange; import org.apache.cassandra.utils.MerkleTree.TreeRangeIterator; import org.junit.Before; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import com.google.common.collect.AbstractIterator; public class MerkleTreeTest { - private static final Logger logger = LoggerFactory.getLogger(MerkleTreeTest.class); - public static byte[] DUMMY = "blah".getBytes(); /**
