You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by sl...@apache.org on 2012/02/27 11:16:00 UTC
[28/28] [3649] Adds final to fields
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/io/sstable/BloomFilterTracker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/BloomFilterTracker.java b/src/java/org/apache/cassandra/io/sstable/BloomFilterTracker.java
index 35f6f04..221c8a2 100644
--- a/src/java/org/apache/cassandra/io/sstable/BloomFilterTracker.java
+++ b/src/java/org/apache/cassandra/io/sstable/BloomFilterTracker.java
@@ -21,8 +21,8 @@ import java.util.concurrent.atomic.AtomicLong;
public class BloomFilterTracker
{
- private AtomicLong falsePositiveCount = new AtomicLong(0);
- private AtomicLong truePositiveCount = new AtomicLong(0);
+ private final AtomicLong falsePositiveCount = new AtomicLong(0);
+ private final AtomicLong truePositiveCount = new AtomicLong(0);
private long lastFalsePositiveCount = 0L;
private long lastTruePositiveCount = 0L;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/IndexSummary.java b/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
index ad738eb..2afd66e 100644
--- a/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexSummary.java
@@ -30,8 +30,8 @@ import org.apache.cassandra.db.DecoratedKey;
*/
public class IndexSummary
{
- private ArrayList<Long> positions;
- private ArrayList<DecoratedKey<?>> keys;
+ private final ArrayList<Long> positions;
+ private final ArrayList<DecoratedKey<?>> keys;
private long keysWritten = 0;
public IndexSummary(long expectedKeys)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
index 2826b71..ee88d94 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableIdentityIterator.java
@@ -42,9 +42,9 @@ public class SSTableIdentityIterator implements Comparable<SSTableIdentityIterat
private final ColumnFamily columnFamily;
private final int columnCount;
- private long columnPosition;
+ private final long columnPosition;
- private BytesReadTracker inputWithTracker; // tracks bytes read
+ private final BytesReadTracker inputWithTracker; // tracks bytes read
// Used by lazilyCompactedRow, so that we see the same things when deserializing the first and second time
private final int expireBefore;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 dbe0e43..2f3d7e1 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableMetadata.java
@@ -46,7 +46,7 @@ import org.apache.cassandra.utils.EstimatedHistogram;
*/
public class SSTableMetadata
{
- private static Logger logger = LoggerFactory.getLogger(SSTableMetadata.class);
+ private static final Logger logger = LoggerFactory.getLogger(SSTableMetadata.class);
public static final SSTableMetadataSerializer serializer = new SSTableMetadataSerializer();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
index 3f1c15f..c674c0c 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableReader.java
@@ -84,7 +84,7 @@ public class SSTableReader extends SSTable
private InstrumentingCache<KeyCacheKey, Long> keyCache;
- private BloomFilterTracker bloomFilterTracker = new BloomFilterTracker();
+ private final BloomFilterTracker bloomFilterTracker = new BloomFilterTracker();
private final AtomicInteger references = new AtomicInteger(1);
// technically isCompacted is not necessary since it should never be unreferenced unless it is also compacted,
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 b35175f..87ff96c 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableScanner.java
@@ -35,7 +35,7 @@ import org.apache.cassandra.utils.CloseableIterator;
public class SSTableScanner implements CloseableIterator<IColumnIterator>
{
- private static Logger logger = LoggerFactory.getLogger(SSTableScanner.class);
+ private static final Logger logger = LoggerFactory.getLogger(SSTableScanner.class);
protected final RandomAccessReader file;
public final SSTableReader sstable;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
index d3d1a9a..cd6d3e6 100644
--- a/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
+++ b/src/java/org/apache/cassandra/io/sstable/SSTableWriter.java
@@ -41,14 +41,14 @@ import org.apache.cassandra.utils.*;
public class SSTableWriter extends SSTable
{
- private static Logger logger = LoggerFactory.getLogger(SSTableWriter.class);
+ private static final Logger logger = LoggerFactory.getLogger(SSTableWriter.class);
private IndexWriter iwriter;
private SegmentedFile.Builder dbuilder;
private final SequentialWriter dataFile;
private DecoratedKey<?> lastWrittenKey;
private FileMark dataMark;
- private SSTableMetadata.Collector sstableMetadataCollector;
+ private final SSTableMetadata.Collector sstableMetadataCollector;
public SSTableWriter(String filename, long keyCount) throws IOException
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/io/util/ColumnSortedMap.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/ColumnSortedMap.java b/src/java/org/apache/cassandra/io/util/ColumnSortedMap.java
index fa63567..2c73084 100644
--- a/src/java/org/apache/cassandra/io/util/ColumnSortedMap.java
+++ b/src/java/org/apache/cassandra/io/util/ColumnSortedMap.java
@@ -148,7 +148,7 @@ class ColumnSet implements Set<Map.Entry<ByteBuffer, IColumn>>
private final ColumnSerializer serializer;
private final DataInput dis;
private final int length;
- private IColumnSerializer.Flag flag;
+ private final IColumnSerializer.Flag flag;
private final int expireBefore;
public ColumnSet(ColumnSerializer serializer, DataInput dis, int length, IColumnSerializer.Flag flag, int expireBefore)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/io/util/FileUtils.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/FileUtils.java b/src/java/org/apache/cassandra/io/util/FileUtils.java
index 21cc32c..5834cc9 100644
--- a/src/java/org/apache/cassandra/io/util/FileUtils.java
+++ b/src/java/org/apache/cassandra/io/util/FileUtils.java
@@ -31,7 +31,7 @@ import org.apache.cassandra.utils.WrappedRunnable;
public class FileUtils
{
- private static Logger logger = LoggerFactory.getLogger(FileUtils.class);
+ private static final Logger logger = LoggerFactory.getLogger(FileUtils.class);
private static final double KB = 1024d;
private static final double MB = 1024*1024d;
private static final double GB = 1024*1024*1024d;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/io/util/RandomAccessReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/RandomAccessReader.java b/src/java/org/apache/cassandra/io/util/RandomAccessReader.java
index b9a4d1b..b1b4495 100644
--- a/src/java/org/apache/cassandra/io/util/RandomAccessReader.java
+++ b/src/java/org/apache/cassandra/io/util/RandomAccessReader.java
@@ -234,7 +234,7 @@ public class RandomAccessReader extends RandomAccessFile implements FileDataInpu
*/
protected static class BufferedRandomAccessFileMark implements FileMark
{
- long pointer;
+ final long pointer;
public BufferedRandomAccessFileMark(long pointer)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 ceeda3f..15487d4 100644
--- a/src/java/org/apache/cassandra/io/util/SequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/util/SequentialWriter.java
@@ -340,7 +340,7 @@ public class SequentialWriter extends OutputStream
*/
protected static class BufferedFileWriterMark implements FileMark
{
- long pointer;
+ final long pointer;
public BufferedFileWriterMark(long pointer)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
index 52163c4..1e91119 100644
--- a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
+++ b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitch.java
@@ -42,10 +42,10 @@ public class DynamicEndpointSnitch extends AbstractEndpointSnitch implements ILa
private static final int UPDATES_PER_INTERVAL = 10000;
private static final int WINDOW_SIZE = 100;
- private int UPDATE_INTERVAL_IN_MS = DatabaseDescriptor.getDynamicUpdateInterval();
- private int RESET_INTERVAL_IN_MS = DatabaseDescriptor.getDynamicResetInterval();
- private double BADNESS_THRESHOLD = DatabaseDescriptor.getDynamicBadnessThreshold();
- private String mbeanName;
+ private final int UPDATE_INTERVAL_IN_MS = DatabaseDescriptor.getDynamicUpdateInterval();
+ private final int RESET_INTERVAL_IN_MS = DatabaseDescriptor.getDynamicResetInterval();
+ private final double BADNESS_THRESHOLD = DatabaseDescriptor.getDynamicBadnessThreshold();
+ private final String mbeanName;
private boolean registered = false;
private final ConcurrentHashMap<InetAddress, Double> scores = new ConcurrentHashMap<InetAddress, Double>();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/locator/Ec2Snitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/Ec2Snitch.java b/src/java/org/apache/cassandra/locator/Ec2Snitch.java
index 381c325..fd1756c 100644
--- a/src/java/org/apache/cassandra/locator/Ec2Snitch.java
+++ b/src/java/org/apache/cassandra/locator/Ec2Snitch.java
@@ -41,7 +41,7 @@ import org.apache.cassandra.utils.FBUtilities;
*/
public class Ec2Snitch extends AbstractNetworkTopologySnitch
{
- protected static Logger logger = LoggerFactory.getLogger(Ec2Snitch.class);
+ protected static final Logger logger = LoggerFactory.getLogger(Ec2Snitch.class);
protected static final String ZONE_NAME_QUERY_URL = "http://169.254.169.254/latest/meta-data/placement/availability-zone";
private static final String DEFAULT_DC = "UNKNOWN-DC";
private static final String DEFAULT_RACK = "UNKNOWN-RACK";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 da00ea8..7905575 100644
--- a/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
+++ b/src/java/org/apache/cassandra/locator/SimpleSeedProvider.java
@@ -31,7 +31,7 @@ public class SimpleSeedProvider implements SeedProvider
{
private static final Logger logger = LoggerFactory.getLogger(SimpleSeedProvider.class);
- private List<InetAddress> seeds;
+ private final List<InetAddress> seeds;
public SimpleSeedProvider(Map<String, String> args)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 620979b..dcbbc8d 100644
--- a/src/java/org/apache/cassandra/locator/TokenMetadata.java
+++ b/src/java/org/apache/cassandra/locator/TokenMetadata.java
@@ -37,10 +37,10 @@ import org.apache.cassandra.service.StorageService;
public class TokenMetadata
{
- private static Logger logger = LoggerFactory.getLogger(TokenMetadata.class);
+ private static final Logger logger = LoggerFactory.getLogger(TokenMetadata.class);
/* Maintains token to endpoint map of every node in the cluster. */
- private BiMap<Token, InetAddress> tokenToEndpointMap;
+ private final BiMap<Token, InetAddress> tokenToEndpointMap;
// Prior to CASSANDRA-603, we just had <tt>Map<Range, InetAddress> pendingRanges<tt>,
// which was added to when a node began bootstrap and removed from when it finished.
@@ -66,14 +66,14 @@ public class TokenMetadata
// Finally, note that recording the tokens of joining nodes in bootstrapTokens also
// means we can detect and reject the addition of multiple nodes at the same token
// before one becomes part of the ring.
- private BiMap<Token, InetAddress> bootstrapTokens = Maps.synchronizedBiMap(HashBiMap.<Token, InetAddress>create());
+ private final BiMap<Token, InetAddress> bootstrapTokens = Maps.synchronizedBiMap(HashBiMap.<Token, InetAddress>create());
// (don't need to record Token here since it's still part of tokenToEndpointMap until it's done leaving)
- private Set<InetAddress> leavingEndpoints = new HashSet<InetAddress>();
+ private final Set<InetAddress> leavingEndpoints = new HashSet<InetAddress>();
// this is a cache of the calculation from {tokenToEndpointMap, bootstrapTokens, leavingEndpoints}
- private ConcurrentMap<String, Multimap<Range<Token>, InetAddress>> pendingRanges = new ConcurrentHashMap<String, Multimap<Range<Token>, InetAddress>>();
+ private final ConcurrentMap<String, Multimap<Range<Token>, InetAddress>> pendingRanges = new ConcurrentHashMap<String, Multimap<Range<Token>, InetAddress>>();
// nodes which are migrating to the new tokens in the ring
- private Set<Pair<Token, InetAddress>> movingEndpoints = new HashSet<Pair<Token, InetAddress>>();
+ private final Set<Pair<Token, InetAddress>> movingEndpoints = new HashSet<Pair<Token, InetAddress>>();
/* Use this lock for manipulating the token map */
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 3f31270..bb34779 100644
--- a/src/java/org/apache/cassandra/net/AsyncResult.java
+++ b/src/java/org/apache/cassandra/net/AsyncResult.java
@@ -33,10 +33,10 @@ class AsyncResult implements IAsyncResult
private static final Logger logger = LoggerFactory.getLogger(AsyncResult.class);
private byte[] result;
- private AtomicBoolean done = new AtomicBoolean(false);
- private Lock lock = new ReentrantLock();
- private Condition condition;
- private long startTime;
+ private final AtomicBoolean done = new AtomicBoolean(false);
+ private final Lock lock = new ReentrantLock();
+ private final Condition condition;
+ private final long startTime;
private InetAddress from;
public AsyncResult()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/net/Header.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/Header.java b/src/java/org/apache/cassandra/net/Header.java
index c5eccb2..c668048 100644
--- a/src/java/org/apache/cassandra/net/Header.java
+++ b/src/java/org/apache/cassandra/net/Header.java
@@ -32,7 +32,7 @@ import com.google.common.collect.Maps;
public class Header
{
- private static IVersionedSerializer<Header> serializer;
+ private static final IVersionedSerializer<Header> serializer;
static
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/net/HeaderTypes.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/HeaderTypes.java b/src/java/org/apache/cassandra/net/HeaderTypes.java
index 97f9839..d866510 100644
--- a/src/java/org/apache/cassandra/net/HeaderTypes.java
+++ b/src/java/org/apache/cassandra/net/HeaderTypes.java
@@ -20,5 +20,5 @@ package org.apache.cassandra.net;
public class HeaderTypes
{
public final static String TASK_PROFILE_CHAIN = "TASK_PROFILE_CHAIN";
- public static String TASK_ID = "TASK_ID";
+ public static final String TASK_ID = "TASK_ID";
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
index 510479c..921ae3a 100644
--- a/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
+++ b/src/java/org/apache/cassandra/net/IncomingTcpConnection.java
@@ -31,18 +31,18 @@ import org.apache.cassandra.streaming.StreamHeader;
public class IncomingTcpConnection extends Thread
{
- private static Logger logger = LoggerFactory.getLogger(IncomingTcpConnection.class);
+ private static final Logger logger = LoggerFactory.getLogger(IncomingTcpConnection.class);
private static final int CHUNK_SIZE = 1024 * 1024;
- private Socket socket;
- public InetAddress from;
+ private final Socket socket;
+ public final InetAddress from;
public IncomingTcpConnection(Socket socket)
{
assert socket != null;
this.socket = socket;
- from = socket.getInetAddress(); // maximize chance of this not being nulled by disconnect
+ this.from = socket.getInetAddress(); // maximize chance of this not being nulled by disconnect
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessageDeliveryTask.java b/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
index 145666b..7a90e00 100644
--- a/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
+++ b/src/java/org/apache/cassandra/net/MessageDeliveryTask.java
@@ -27,7 +27,7 @@ public class MessageDeliveryTask implements Runnable
{
private static final Logger logger = LoggerFactory.getLogger(MessageDeliveryTask.class);
- private Message message;
+ private final Message message;
private final long constructionTime = System.currentTimeMillis();
private final String id;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/net/MessagingService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/MessagingService.java b/src/java/org/apache/cassandra/net/MessagingService.java
index 6789655..dbd5d15 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -103,7 +103,7 @@ public final class MessagingService implements MessagingServiceMBean
private static final Logger logger = LoggerFactory.getLogger(MessagingService.class);
private static final int LOG_DROPPED_INTERVAL_IN_MS = 5000;
- private List<SocketThread> socketThreads = Lists.newArrayList();
+ private final List<SocketThread> socketThreads = Lists.newArrayList();
private final SimpleCondition listenGate;
/**
@@ -356,7 +356,7 @@ public final class MessagingService implements MessagingServiceMBean
return messageId;
}
- private static AtomicInteger idGen = new AtomicInteger(0);
+ private static final AtomicInteger idGen = new AtomicInteger(0);
// TODO make these integers to avoid unnecessary int -> string -> int conversions
private static String nextId()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
index fdefba7..cf63979 100644
--- a/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
+++ b/src/java/org/apache/cassandra/net/OutboundTcpConnectionPool.java
@@ -30,7 +30,7 @@ import org.apache.cassandra.utils.FBUtilities;
public class OutboundTcpConnectionPool
{
- private IEndpointSnitch snitch = DatabaseDescriptor.getEndpointSnitch();
+ private final IEndpointSnitch snitch = DatabaseDescriptor.getEndpointSnitch();
// pointer for the real Address.
private final InetAddress id;
public final OutboundTcpConnection cmdCon;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/net/sink/SinkManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/sink/SinkManager.java b/src/java/org/apache/cassandra/net/sink/SinkManager.java
index bb46938..2cf67a6 100644
--- a/src/java/org/apache/cassandra/net/sink/SinkManager.java
+++ b/src/java/org/apache/cassandra/net/sink/SinkManager.java
@@ -25,7 +25,7 @@ import org.apache.cassandra.net.Message;
public class SinkManager
{
- private static List<IMessageSink> sinks = new ArrayList<IMessageSink>();
+ private static final List<IMessageSink> sinks = new ArrayList<IMessageSink>();
public static void add(IMessageSink ms)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java b/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java
index 1f7ca54..e4aff96 100644
--- a/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java
+++ b/src/java/org/apache/cassandra/notifications/SSTableAddedNotification.java
@@ -21,7 +21,7 @@ import org.apache.cassandra.io.sstable.SSTableReader;
public class SSTableAddedNotification implements INotification
{
- public SSTableReader added;
+ public final SSTableReader added;
public SSTableAddedNotification(SSTableReader added)
{
this.added = added;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java b/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java
index c363114..770fd48 100644
--- a/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java
+++ b/src/java/org/apache/cassandra/notifications/SSTableListChangedNotification.java
@@ -21,8 +21,8 @@ import org.apache.cassandra.io.sstable.SSTableReader;
public class SSTableListChangedNotification implements INotification
{
- public Iterable<SSTableReader> removed;
- public Iterable<SSTableReader> added;
+ public final Iterable<SSTableReader> removed;
+ public final Iterable<SSTableReader> added;
public SSTableListChangedNotification(Iterable<SSTableReader> added, Iterable<SSTableReader> removed)
{
this.removed = removed;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/scheduler/RoundRobinScheduler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/scheduler/RoundRobinScheduler.java b/src/java/org/apache/cassandra/scheduler/RoundRobinScheduler.java
index d945e47..fd14ed5 100644
--- a/src/java/org/apache/cassandra/scheduler/RoundRobinScheduler.java
+++ b/src/java/org/apache/cassandra/scheduler/RoundRobinScheduler.java
@@ -47,8 +47,8 @@ public class RoundRobinScheduler implements IRequestScheduler
// Used by the the scheduler thread so we don't need to busy-wait until there is a request to process
private final Semaphore queueSize = new Semaphore(0, false);
- private int defaultWeight;
- private Map<String, Integer> weights;
+ private final int defaultWeight;
+ private final Map<String, Integer> weights;
public RoundRobinScheduler(RequestSchedulerOptions options)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java b/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
index 08266ce..e15d781 100644
--- a/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/AbstractCassandraDaemon.java
@@ -100,7 +100,7 @@ public abstract class AbstractCassandraDaemon implements CassandraDaemon
}
}
- private static Logger logger = LoggerFactory.getLogger(AbstractCassandraDaemon.class);
+ private static final Logger logger = LoggerFactory.getLogger(AbstractCassandraDaemon.class);
static final AtomicInteger exceptions = new AtomicInteger();
@@ -394,7 +394,7 @@ public abstract class AbstractCassandraDaemon implements CassandraDaemon
*/
public static class CleaningThreadPool extends ThreadPoolExecutor
{
- private ThreadLocal<ClientState> state;
+ private final ThreadLocal<ClientState> state;
public CleaningThreadPool(ThreadLocal<ClientState> state, int minWorkerThread, int maxWorkerThreads)
{
super(minWorkerThread, maxWorkerThreads, 60, TimeUnit.SECONDS, new SynchronousQueue<Runnable>(), new NamedThreadFactory("Thrift"));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/service/AbstractRowResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AbstractRowResolver.java b/src/java/org/apache/cassandra/service/AbstractRowResolver.java
index 7f611a5..a3283a5 100644
--- a/src/java/org/apache/cassandra/service/AbstractRowResolver.java
+++ b/src/java/org/apache/cassandra/service/AbstractRowResolver.java
@@ -37,7 +37,7 @@ import org.cliffc.high_scale_lib.NonBlockingHashMap;
public abstract class AbstractRowResolver implements IResponseResolver<Row>
{
- protected static Logger logger = LoggerFactory.getLogger(AbstractRowResolver.class);
+ protected static final Logger logger = LoggerFactory.getLogger(AbstractRowResolver.class);
private static final Message FAKE_MESSAGE = new Message(FBUtilities.getBroadcastAddress(), StorageService.Verb.INTERNAL_RESPONSE, ArrayUtils.EMPTY_BYTE_ARRAY, -1);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/service/AntiEntropyService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AntiEntropyService.java b/src/java/org/apache/cassandra/service/AntiEntropyService.java
index 7873173..1b7fc25 100644
--- a/src/java/org/apache/cassandra/service/AntiEntropyService.java
+++ b/src/java/org/apache/cassandra/service/AntiEntropyService.java
@@ -959,14 +959,13 @@ public class AntiEntropyService
public final String cfname;
public final TreeResponse r1;
public final TreeResponse r2;
- public List<Range<Token>> differences;
+ public final List<Range<Token>> differences = new ArrayList<Range<Token>>();
Differencer(String cfname, TreeResponse r1, TreeResponse r2)
{
this.cfname = cfname;
this.r1 = r1;
this.r2 = r2;
- this.differences = new ArrayList<Range<Token>>();
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/service/ClientState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ClientState.java b/src/java/org/apache/cassandra/service/ClientState.java
index 6e7a39d..9e1c4bc 100644
--- a/src/java/org/apache/cassandra/service/ClientState.java
+++ b/src/java/org/apache/cassandra/service/ClientState.java
@@ -41,7 +41,7 @@ import org.apache.cassandra.utils.SemanticVersion;
public class ClientState
{
private static final int MAX_CACHE_PREPARED = 10000; // Enough to keep buggy clients from OOM'ing us
- private static Logger logger = LoggerFactory.getLogger(ClientState.class);
+ private static final Logger logger = LoggerFactory.getLogger(ClientState.class);
public static final SemanticVersion DEFAULT_CQL_VERSION = org.apache.cassandra.cql.QueryProcessor.CQL_VERSION;
// Current user for the session
@@ -52,13 +52,13 @@ public class ClientState
private SemanticVersion cqlVersion = DEFAULT_CQL_VERSION;
// An LRU map of prepared statements
- private Map<Integer, CQLStatement> prepared = new LinkedHashMap<Integer, CQLStatement>(16, 0.75f, true) {
+ private final Map<Integer, CQLStatement> prepared = new LinkedHashMap<Integer, CQLStatement>(16, 0.75f, true) {
protected boolean removeEldestEntry(Map.Entry<Integer, CQLStatement> eldest) {
return size() > MAX_CACHE_PREPARED;
}
};
- private Map<Integer, org.apache.cassandra.cql3.CQLStatement> cql3Prepared = new LinkedHashMap<Integer, org.apache.cassandra.cql3.CQLStatement>(16, 0.75f, true) {
+ private final Map<Integer, org.apache.cassandra.cql3.CQLStatement> cql3Prepared = new LinkedHashMap<Integer, org.apache.cassandra.cql3.CQLStatement>(16, 0.75f, true) {
protected boolean removeEldestEntry(Map.Entry<Integer, org.apache.cassandra.cql3.CQLStatement> eldest) {
return size() > MAX_CACHE_PREPARED;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java b/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
index f42da8c..a0b3a8b 100644
--- a/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
@@ -47,7 +47,7 @@ public class DatacenterSyncWriteResponseHandler extends AbstractWriteResponseHan
}
private final NetworkTopologyStrategy strategy;
- private HashMap<String, AtomicInteger> responses = new HashMap<String, AtomicInteger>();
+ private final HashMap<String, AtomicInteger> responses = new HashMap<String, AtomicInteger>();
protected DatacenterSyncWriteResponseHandler(Collection<InetAddress> writeEndpoints, ConsistencyLevel consistencyLevel, String table)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/service/GCInspector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/GCInspector.java b/src/java/org/apache/cassandra/service/GCInspector.java
index e317cc0..770dfd4 100644
--- a/src/java/org/apache/cassandra/service/GCInspector.java
+++ b/src/java/org/apache/cassandra/service/GCInspector.java
@@ -44,11 +44,11 @@ public class GCInspector
public static final GCInspector instance = new GCInspector();
- private HashMap<String, Long> gctimes = new HashMap<String, Long>();
- private HashMap<String, Long> gccounts = new HashMap<String, Long>();
+ private final HashMap<String, Long> gctimes = new HashMap<String, Long>();
+ private final HashMap<String, Long> gccounts = new HashMap<String, Long>();
- List<GarbageCollectorMXBean> beans = new ArrayList<GarbageCollectorMXBean>();
- MemoryMXBean membean = ManagementFactory.getMemoryMXBean();
+ final List<GarbageCollectorMXBean> beans = new ArrayList<GarbageCollectorMXBean>();
+ final MemoryMXBean membean = ManagementFactory.getMemoryMXBean();
private volatile boolean cacheSizesReduced;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/service/LoadBroadcaster.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/LoadBroadcaster.java b/src/java/org/apache/cassandra/service/LoadBroadcaster.java
index 7d1999c..4bcb7f1 100644
--- a/src/java/org/apache/cassandra/service/LoadBroadcaster.java
+++ b/src/java/org/apache/cassandra/service/LoadBroadcaster.java
@@ -34,7 +34,7 @@ public class LoadBroadcaster implements IEndpointStateChangeSubscriber
private static final Logger logger = LoggerFactory.getLogger(LoadBroadcaster.class);
- private Map<InetAddress, Double> loadInfo = new HashMap<InetAddress, Double>();
+ private final Map<InetAddress, Double> loadInfo = new HashMap<InetAddress, Double>();
private LoadBroadcaster()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/service/SocketSessionManagementService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/SocketSessionManagementService.java b/src/java/org/apache/cassandra/service/SocketSessionManagementService.java
index 2226f80..ad42a3e 100644
--- a/src/java/org/apache/cassandra/service/SocketSessionManagementService.java
+++ b/src/java/org/apache/cassandra/service/SocketSessionManagementService.java
@@ -25,7 +25,7 @@ public class SocketSessionManagementService
{
public final static SocketSessionManagementService instance = new SocketSessionManagementService();
public final static ThreadLocal<SocketAddress> remoteSocket = new ThreadLocal<SocketAddress>();
- private Map<SocketAddress, ClientState> activeSocketSessions = new ConcurrentHashMap<SocketAddress, ClientState>();
+ private final Map<SocketAddress, ClientState> activeSocketSessions = new ConcurrentHashMap<SocketAddress, ClientState>();
public ClientState get(SocketAddress key)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index 51f9a3d..495dfef 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -76,7 +76,7 @@ import org.apache.cassandra.utils.WrappedRunnable;
*/
public class StorageService implements IEndpointStateChangeSubscriber, StorageServiceMBean
{
- private static Logger logger = LoggerFactory.getLogger(StorageService.class);
+ private static final Logger logger = LoggerFactory.getLogger(StorageService.class);
public static final int RING_DELAY = getRingDelay(); // delay after which we assume ring has stablized
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/service/TruncateResponseHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/TruncateResponseHandler.java b/src/java/org/apache/cassandra/service/TruncateResponseHandler.java
index 18a706e..6e9bf1e 100644
--- a/src/java/org/apache/cassandra/service/TruncateResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/TruncateResponseHandler.java
@@ -34,7 +34,7 @@ public class TruncateResponseHandler implements IAsyncCallback
protected static final Logger logger = LoggerFactory.getLogger(TruncateResponseHandler.class);
protected final SimpleCondition condition = new SimpleCondition();
private final int responseCount;
- protected AtomicInteger responses = new AtomicInteger(0);
+ protected final AtomicInteger responses = new AtomicInteger(0);
private final long startTime;
public TruncateResponseHandler(int responseCount)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/streaming/FileStreamTask.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/FileStreamTask.java b/src/java/org/apache/cassandra/streaming/FileStreamTask.java
index 7251387..23621cf 100644
--- a/src/java/org/apache/cassandra/streaming/FileStreamTask.java
+++ b/src/java/org/apache/cassandra/streaming/FileStreamTask.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
public class FileStreamTask extends WrappedRunnable
{
- private static Logger logger = LoggerFactory.getLogger(FileStreamTask.class);
+ private static final Logger logger = LoggerFactory.getLogger(FileStreamTask.class);
public static final int CHUNK_SIZE = 64 * 1024;
// around 10 minutes at the default rpctimeout
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/streaming/PendingFile.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/PendingFile.java b/src/java/org/apache/cassandra/streaming/PendingFile.java
index a56cfe1..b4ac557 100644
--- a/src/java/org/apache/cassandra/streaming/PendingFile.java
+++ b/src/java/org/apache/cassandra/streaming/PendingFile.java
@@ -32,7 +32,7 @@ import org.apache.cassandra.utils.Pair;
*/
public class PendingFile
{
- private static PendingFileSerializer serializer = new PendingFileSerializer();
+ private static final PendingFileSerializer serializer = new PendingFileSerializer();
public static PendingFileSerializer serializer()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/streaming/ReplicationFinishedVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/ReplicationFinishedVerbHandler.java b/src/java/org/apache/cassandra/streaming/ReplicationFinishedVerbHandler.java
index 8acbebb..c4583d9 100644
--- a/src/java/org/apache/cassandra/streaming/ReplicationFinishedVerbHandler.java
+++ b/src/java/org/apache/cassandra/streaming/ReplicationFinishedVerbHandler.java
@@ -28,7 +28,7 @@ import org.apache.cassandra.service.StorageService;
public class ReplicationFinishedVerbHandler implements IVerbHandler
{
- private static Logger logger = LoggerFactory.getLogger(ReplicationFinishedVerbHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(ReplicationFinishedVerbHandler.class);
public void doVerb(Message msg, String id)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/streaming/StreamHeader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamHeader.java b/src/java/org/apache/cassandra/streaming/StreamHeader.java
index 7375401..ddb52ee 100644
--- a/src/java/org/apache/cassandra/streaming/StreamHeader.java
+++ b/src/java/org/apache/cassandra/streaming/StreamHeader.java
@@ -32,7 +32,7 @@ import org.apache.cassandra.utils.FBUtilities;
public class StreamHeader
{
- private static IVersionedSerializer<StreamHeader> serializer;
+ private static final IVersionedSerializer<StreamHeader> serializer;
static
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/streaming/StreamIn.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamIn.java b/src/java/org/apache/cassandra/streaming/StreamIn.java
index 3b2c0be..b46f894 100644
--- a/src/java/org/apache/cassandra/streaming/StreamIn.java
+++ b/src/java/org/apache/cassandra/streaming/StreamIn.java
@@ -41,7 +41,7 @@ import org.apache.cassandra.utils.FBUtilities;
*/
public class StreamIn
{
- private static Logger logger = LoggerFactory.getLogger(StreamIn.class);
+ private static final Logger logger = LoggerFactory.getLogger(StreamIn.class);
/** Request ranges for all column families in the given keyspace. */
public static void requestRanges(InetAddress source, String tableName, Collection<Range<Token>> ranges, Runnable callback, OperationType type)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/streaming/StreamInSession.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamInSession.java b/src/java/org/apache/cassandra/streaming/StreamInSession.java
index 5a731d4..ee75fa6 100644
--- a/src/java/org/apache/cassandra/streaming/StreamInSession.java
+++ b/src/java/org/apache/cassandra/streaming/StreamInSession.java
@@ -43,7 +43,7 @@ public class StreamInSession
{
private static final Logger logger = LoggerFactory.getLogger(StreamInSession.class);
- private static ConcurrentMap<Pair<InetAddress, Long>, StreamInSession> sessions = new NonBlockingHashMap<Pair<InetAddress, Long>, StreamInSession>();
+ private static final ConcurrentMap<Pair<InetAddress, Long>, StreamInSession> sessions = new NonBlockingHashMap<Pair<InetAddress, Long>, StreamInSession>();
private final Set<PendingFile> files = new NonBlockingHashSet<PendingFile>();
private final Pair<InetAddress, Long> context;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/streaming/StreamOut.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamOut.java b/src/java/org/apache/cassandra/streaming/StreamOut.java
index cd43bef..3d4a413 100644
--- a/src/java/org/apache/cassandra/streaming/StreamOut.java
+++ b/src/java/org/apache/cassandra/streaming/StreamOut.java
@@ -74,7 +74,7 @@ import org.apache.cassandra.utils.Pair;
*/
public class StreamOut
{
- private static Logger logger = LoggerFactory.getLogger(StreamOut.class);
+ private static final Logger logger = LoggerFactory.getLogger(StreamOut.class);
/**
* Stream the given ranges to the target endpoint from each CF in the given keyspace.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/streaming/StreamReplyVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamReplyVerbHandler.java b/src/java/org/apache/cassandra/streaming/StreamReplyVerbHandler.java
index 5c85d50..8b03b1f 100644
--- a/src/java/org/apache/cassandra/streaming/StreamReplyVerbHandler.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReplyVerbHandler.java
@@ -31,7 +31,7 @@ import org.apache.cassandra.net.Message;
public class StreamReplyVerbHandler implements IVerbHandler
{
- private static Logger logger = LoggerFactory.getLogger(StreamReplyVerbHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(StreamReplyVerbHandler.class);
public void doVerb(Message message, String id)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/streaming/StreamRequestMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamRequestMessage.java b/src/java/org/apache/cassandra/streaming/StreamRequestMessage.java
index 978c399..484409c 100644
--- a/src/java/org/apache/cassandra/streaming/StreamRequestMessage.java
+++ b/src/java/org/apache/cassandra/streaming/StreamRequestMessage.java
@@ -46,7 +46,7 @@ import org.apache.cassandra.utils.FBUtilities;
*/
class StreamRequestMessage implements MessageProducer
{
- private static IVersionedSerializer<StreamRequestMessage> serializer;
+ private static final IVersionedSerializer<StreamRequestMessage> serializer;
static
{
serializer = new StreamRequestMessageSerializer();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java b/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java
index 67ba7d6..ae3473c 100644
--- a/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java
+++ b/src/java/org/apache/cassandra/streaming/StreamRequestVerbHandler.java
@@ -34,7 +34,7 @@ import org.apache.cassandra.net.Message;
*/
public class StreamRequestVerbHandler implements IVerbHandler
{
- private static Logger logger = LoggerFactory.getLogger(StreamRequestVerbHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(StreamRequestVerbHandler.class);
public void doVerb(Message message, String id)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CassandraDaemon.java b/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
index 80cca29..9d0339e 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraDaemon.java
@@ -60,7 +60,7 @@ public class CassandraDaemon extends org.apache.cassandra.service.AbstractCassan
AbstractCassandraDaemon.initLog4j();
}
- private static Logger logger = LoggerFactory.getLogger(CassandraDaemon.class);
+ private static final Logger logger = LoggerFactory.getLogger(CassandraDaemon.class);
private final static String SYNC = "sync";
private final static String ASYNC = "async";
private final static String HSHA = "hsha";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 67f7001..fb95bf2 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -60,7 +60,7 @@ import org.apache.thrift.TException;
public class CassandraServer implements Cassandra.Iface
{
- private static Logger logger = LoggerFactory.getLogger(CassandraServer.class);
+ private static final Logger logger = LoggerFactory.getLogger(CassandraServer.class);
private final static int COUNT_PAGE_SIZE = 1024;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java b/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java
index 110e9e0..5462280 100644
--- a/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTHsHaServer.java
@@ -46,9 +46,9 @@ import org.slf4j.LoggerFactory;
public class CustomTHsHaServer extends TNonblockingServer
{
private static final Logger LOGGER = LoggerFactory.getLogger(CustomTHsHaServer.class.getName());
- private Set<SelectorThread> ioThreads = new HashSet<SelectorThread>();
+ private final Set<SelectorThread> ioThreads = new HashSet<SelectorThread>();
private volatile boolean stopped = true;
- private ExecutorService invoker;
+ private final ExecutorService invoker;
/**
* All the arguments to Non Blocking Server will apply here. In addition,
@@ -86,7 +86,7 @@ public class CustomTHsHaServer extends TNonblockingServer
protected class Invocation implements Runnable
{
private final FrameBuffer frameBuffer;
- private SelectorThread thread;
+ private final SelectorThread thread;
public Invocation(final FrameBuffer frameBuffer, SelectorThread thread)
{
@@ -147,8 +147,8 @@ public class CustomTHsHaServer extends TNonblockingServer
protected class SelectorThread extends Thread
{
private final Selector selector;
- private TNonblockingServerTransport serverTransport;
- private Set<FrameBuffer> selectInterestChanges = new HashSet<FrameBuffer>();
+ private final TNonblockingServerTransport serverTransport;
+ private final Set<FrameBuffer> selectInterestChanges = new HashSet<FrameBuffer>();
public SelectorThread(String name)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
index f34a72b..130691b 100644
--- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
@@ -47,13 +47,13 @@ public class CustomTThreadPoolServer extends TServer
private static final Logger logger = LoggerFactory.getLogger(CustomTThreadPoolServer.class.getName());
// Executor service for handling client connections
- private ExecutorService executorService;
+ private final ExecutorService executorService;
// Flag for stopping the server
private volatile boolean stopped;
// Server options
- private TThreadPoolServer.Args args;
+ private final TThreadPoolServer.Args args;
//Track and Limit the number of connected clients
private final AtomicInteger activeClients = new AtomicInteger(0);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/thrift/ThriftValidation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/ThriftValidation.java b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
index 8d03bd4..b550673 100644
--- a/src/java/org/apache/cassandra/thrift/ThriftValidation.java
+++ b/src/java/org/apache/cassandra/thrift/ThriftValidation.java
@@ -50,7 +50,7 @@ import org.apache.cassandra.utils.FBUtilities;
*/
public class ThriftValidation
{
- private static Logger logger = LoggerFactory.getLogger(ThriftValidation.class);
+ private static final Logger logger = LoggerFactory.getLogger(ThriftValidation.class);
public static void validateKey(CFMetaData metadata, ByteBuffer key) throws InvalidRequestException
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 691e074..7bd122c 100644
--- a/src/java/org/apache/cassandra/tools/BulkLoader.java
+++ b/src/java/org/apache/cassandra/tools/BulkLoader.java
@@ -168,8 +168,8 @@ public class BulkLoader
{
private final Map<String, Set<String>> knownCfs = new HashMap<String, Set<String>>();
private final SSTableLoader.OutputHandler outputHandler;
- private Set<InetAddress> hosts = new HashSet<InetAddress>();
- private int rpcPort;
+ private final Set<InetAddress> hosts;
+ private final int rpcPort;
public ExternalClient(SSTableLoader.OutputHandler outputHandler, Set<InetAddress> hosts, int port)
{
@@ -248,8 +248,8 @@ public class BulkLoader
public int rpcPort = 9160;
public int throttle = 0;
- public Set<InetAddress> hosts = new HashSet<InetAddress>();
- public Set<InetAddress> ignores = new HashSet<InetAddress>();
+ public final Set<InetAddress> hosts = new HashSet<InetAddress>();
+ public final Set<InetAddress> ignores = new HashSet<InetAddress>();
LoaderOptions(File directory)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/tools/NodeCmd.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeCmd.java b/src/java/org/apache/cassandra/tools/NodeCmd.java
index 264249c..2bd08b9 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -52,14 +52,12 @@ public class NodeCmd
private static final String DEFAULT_HOST = "127.0.0.1";
private static final int DEFAULT_PORT = 7199;
- private static ToolOptions options = null;
+ private static final ToolOptions options = new ToolOptions();
- private NodeProbe probe;
+ private final NodeProbe probe;
static
{
- options = new ToolOptions();
-
options.addOption(HOST_OPT, true, "node hostname or ip address");
options.addOption(PORT_OPT, true, "remote jmx agent port number");
options.addOption(USERNAME_OPT, true, "remote jmx agent username");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/tools/NodeProbe.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/NodeProbe.java b/src/java/org/apache/cassandra/tools/NodeProbe.java
index 5760d11..ff0ee03 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -697,8 +697,8 @@ class ColumnFamilyStoreMBeanIterator implements Iterator<Map.Entry<String, Colum
class ThreadPoolProxyMBeanIterator implements Iterator<Map.Entry<String, JMXEnabledThreadPoolExecutorMBean>>
{
- private Iterator<ObjectName> resIter;
- private MBeanServerConnection mbeanServerConn;
+ private final Iterator<ObjectName> resIter;
+ private final MBeanServerConnection mbeanServerConn;
public ThreadPoolProxyMBeanIterator(MBeanServerConnection mbeanServerConn)
throws MalformedObjectNameException, NullPointerException, IOException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/tools/SSTableExport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableExport.java b/src/java/org/apache/cassandra/tools/SSTableExport.java
index baf8e02..ae3a07d 100644
--- a/src/java/org/apache/cassandra/tools/SSTableExport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableExport.java
@@ -46,19 +46,17 @@ import static org.apache.cassandra.utils.ByteBufferUtil.hexToBytes;
*/
public class SSTableExport
{
- private static ObjectMapper jsonMapper = new ObjectMapper();
+ private static final ObjectMapper jsonMapper = new ObjectMapper();
private static final String KEY_OPTION = "k";
private static final String EXCLUDEKEY_OPTION = "x";
private static final String ENUMERATEKEYS_OPTION = "e";
- private static Options options;
+ private static final Options options = new Options();
private static CommandLine cmd;
static
{
- options = new Options();
-
Option optKey = new Option(KEY_OPTION, true, "Row key");
// Number of times -k <key> can be passed on the command line.
optKey.setArgs(500);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/tools/SSTableImport.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/SSTableImport.java b/src/java/org/apache/cassandra/tools/SSTableImport.java
index 388431d..c4f5e3d 100644
--- a/src/java/org/apache/cassandra/tools/SSTableImport.java
+++ b/src/java/org/apache/cassandra/tools/SSTableImport.java
@@ -55,18 +55,16 @@ public class SSTableImport
private static final String KEY_COUNT_OPTION = "n";
private static final String IS_SORTED_OPTION = "s";
- private static Options options;
+ private static final Options options = new Options();
private static CommandLine cmd;
private static Integer keyCountToImport = null;
private static boolean isSorted = false;
- private static JsonFactory factory = new MappingJsonFactory().configure(JsonParser.Feature.INTERN_FIELD_NAMES, false);
+ private static final JsonFactory factory = new MappingJsonFactory().configure(JsonParser.Feature.INTERN_FIELD_NAMES, false);
static
{
- options = new Options();
-
Option optKeyspace = new Option(KEYSPACE_OPTION, true, "Keyspace name.");
optKeyspace.setRequired(true);
options.addOption(optKeyspace);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/utils/BloomFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/BloomFilter.java b/src/java/org/apache/cassandra/utils/BloomFilter.java
index c2bb455..f664264 100644
--- a/src/java/org/apache/cassandra/utils/BloomFilter.java
+++ b/src/java/org/apache/cassandra/utils/BloomFilter.java
@@ -28,9 +28,9 @@ public class BloomFilter extends Filter
{
private static final Logger logger = LoggerFactory.getLogger(BloomFilter.class);
private static final int EXCESS = 20;
- static BloomFilterSerializer serializer = new BloomFilterSerializer();
+ static final BloomFilterSerializer serializer = new BloomFilterSerializer();
- public OpenBitSet bitset;
+ public final OpenBitSet bitset;
BloomFilter(int hashes, OpenBitSet bs)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/utils/BytesReadTracker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/BytesReadTracker.java b/src/java/org/apache/cassandra/utils/BytesReadTracker.java
index 280b633..f363513 100644
--- a/src/java/org/apache/cassandra/utils/BytesReadTracker.java
+++ b/src/java/org/apache/cassandra/utils/BytesReadTracker.java
@@ -28,7 +28,7 @@ public class BytesReadTracker implements DataInput
{
private long bytesRead;
- private DataInput source;
+ private final DataInput source;
public BytesReadTracker(DataInput source)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/utils/CLibrary.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/CLibrary.java b/src/java/org/apache/cassandra/utils/CLibrary.java
index 2d8a9c5..69a8607 100644
--- a/src/java/org/apache/cassandra/utils/CLibrary.java
+++ b/src/java/org/apache/cassandra/utils/CLibrary.java
@@ -34,7 +34,7 @@ import com.sun.jna.Native;
public final class CLibrary
{
- private static Logger logger = LoggerFactory.getLogger(CLibrary.class);
+ private static final Logger logger = LoggerFactory.getLogger(CLibrary.class);
private static final int MCL_CURRENT = 1;
private static final int MCL_FUTURE = 2;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
index 99743aa..89dec6a 100644
--- a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
+++ b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
@@ -29,7 +29,7 @@ import org.apache.cassandra.io.ISerializer;
public class EstimatedHistogram
{
- public static EstimatedHistogramSerializer serializer = new EstimatedHistogramSerializer();
+ public static final EstimatedHistogramSerializer serializer = new EstimatedHistogramSerializer();
/**
* The series of values to which the counts in `buckets` correspond:
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/utils/FBUtilities.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/FBUtilities.java b/src/java/org/apache/cassandra/utils/FBUtilities.java
index 811cff0..3c883b7 100644
--- a/src/java/org/apache/cassandra/utils/FBUtilities.java
+++ b/src/java/org/apache/cassandra/utils/FBUtilities.java
@@ -56,7 +56,7 @@ import org.apache.thrift.TSerializer;
public class FBUtilities
{
- private static Logger logger = LoggerFactory.getLogger(FBUtilities.class);
+ private static final Logger logger = LoggerFactory.getLogger(FBUtilities.class);
public static final BigInteger TWO = new BigInteger("2");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/utils/GuidGenerator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/GuidGenerator.java b/src/java/org/apache/cassandra/utils/GuidGenerator.java
index 1028246..a9c7b7e 100644
--- a/src/java/org/apache/cassandra/utils/GuidGenerator.java
+++ b/src/java/org/apache/cassandra/utils/GuidGenerator.java
@@ -24,9 +24,9 @@ import java.security.SecureRandom;
import java.util.Random;
public class GuidGenerator {
- private static Random myRand;
- private static SecureRandom mySecureRand;
- private static String s_id;
+ private static final Random myRand;
+ private static final SecureRandom mySecureRand;
+ private static final String s_id;
static {
if (System.getProperty("java.security.egd") == null) {
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/utils/LatencyTracker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/LatencyTracker.java b/src/java/org/apache/cassandra/utils/LatencyTracker.java
index 2bc6617a..02a07e9 100644
--- a/src/java/org/apache/cassandra/utils/LatencyTracker.java
+++ b/src/java/org/apache/cassandra/utils/LatencyTracker.java
@@ -25,8 +25,8 @@ public class LatencyTracker
private final AtomicLong totalLatency = new AtomicLong(0);
private long lastLatency = 0;
private long lastOpCount = 0;
- private EstimatedHistogram totalHistogram = new EstimatedHistogram();
- private EstimatedHistogram recentHistogram = new EstimatedHistogram();
+ private final EstimatedHistogram totalHistogram = new EstimatedHistogram();
+ private final EstimatedHistogram recentHistogram = new EstimatedHistogram();
/** takes nanoseconds **/
public void addNano(long nanos)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/utils/LegacyBloomFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/LegacyBloomFilter.java b/src/java/org/apache/cassandra/utils/LegacyBloomFilter.java
index cf61718..9942fbc 100644
--- a/src/java/org/apache/cassandra/utils/LegacyBloomFilter.java
+++ b/src/java/org/apache/cassandra/utils/LegacyBloomFilter.java
@@ -27,7 +27,7 @@ public class LegacyBloomFilter extends Filter
{
private static final int EXCESS = 20;
private static final Logger logger = LoggerFactory.getLogger(LegacyBloomFilter.class);
- static LegacyBloomFilterSerializer serializer = new LegacyBloomFilterSerializer();
+ static final LegacyBloomFilterSerializer serializer = new LegacyBloomFilterSerializer();
public static LegacyBloomFilterSerializer serializer()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/utils/MerkleTree.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/MerkleTree.java b/src/java/org/apache/cassandra/utils/MerkleTree.java
index f29c4d2..e9bb5da 100644
--- a/src/java/org/apache/cassandra/utils/MerkleTree.java
+++ b/src/java/org/apache/cassandra/utils/MerkleTree.java
@@ -626,7 +626,7 @@ public class MerkleTree implements Serializable
private Hashable lchild;
private Hashable rchild;
- private static InnerSerializer serializer = new InnerSerializer();
+ private static final InnerSerializer serializer = new InnerSerializer();
/**
* Constructs an Inner with the given token and children, and a null hash.
@@ -738,7 +738,7 @@ public class MerkleTree implements Serializable
{
public static final long serialVersionUID = 1L;
static final byte IDENT = 1;
- private static LeafSerializer serializer = new LeafSerializer();
+ private static final LeafSerializer serializer = new LeafSerializer();
/**
* Constructs a null hash.
@@ -821,7 +821,7 @@ public class MerkleTree implements Serializable
static abstract class Hashable implements Serializable
{
private static final long serialVersionUID = 1L;
- private static IVersionedSerializer<Hashable> serializer = new HashableSerializer();
+ private static final IVersionedSerializer<Hashable> serializer = new HashableSerializer();
protected byte[] hash;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 fd29951..430c494 100644
--- a/src/java/org/apache/cassandra/utils/NodeId.java
+++ b/src/java/org/apache/cassandra/utils/NodeId.java
@@ -42,7 +42,7 @@ public class NodeId implements Comparable<NodeId>
static final LocalNodeIdHistory instance = new LocalNodeIdHistory();
}
- private ByteBuffer id;
+ private final ByteBuffer id;
private static LocalNodeIdHistory localIds()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/utils/ResourceWatcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/ResourceWatcher.java b/src/java/org/apache/cassandra/utils/ResourceWatcher.java
index 57f787f..e7ae449 100644
--- a/src/java/org/apache/cassandra/utils/ResourceWatcher.java
+++ b/src/java/org/apache/cassandra/utils/ResourceWatcher.java
@@ -34,9 +34,9 @@ public class ResourceWatcher
public static class WatchedResource implements Runnable
{
- private static Logger logger = LoggerFactory.getLogger(WatchedResource.class);
- private String resource;
- private Runnable callback;
+ private static final Logger logger = LoggerFactory.getLogger(WatchedResource.class);
+ private final String resource;
+ private final Runnable callback;
private long lastLoaded;
public WatchedResource(String resource, Runnable callback)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/utils/SlabAllocator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/SlabAllocator.java b/src/java/org/apache/cassandra/utils/SlabAllocator.java
index dd7799a..5a780f1 100644
--- a/src/java/org/apache/cassandra/utils/SlabAllocator.java
+++ b/src/java/org/apache/cassandra/utils/SlabAllocator.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
*/
public class SlabAllocator extends Allocator
{
- private static Logger logger = LoggerFactory.getLogger(SlabAllocator.class);
+ private static final Logger logger = LoggerFactory.getLogger(SlabAllocator.class);
private final static int REGION_SIZE = 1024 * 1024;
private final static int MAX_CLONED_SIZE = 128 * 1024; // bigger than this don't go in the region
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/utils/Throttle.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/Throttle.java b/src/java/org/apache/cassandra/utils/Throttle.java
index 39a5bbb..2a149a7 100644
--- a/src/java/org/apache/cassandra/utils/Throttle.java
+++ b/src/java/org/apache/cassandra/utils/Throttle.java
@@ -26,7 +26,7 @@ import org.slf4j.LoggerFactory;
*/
public class Throttle
{
- private static Logger logger = LoggerFactory.getLogger(Throttle.class);
+ private static final Logger logger = LoggerFactory.getLogger(Throttle.class);
private final String name;
private final ThroughputFunction fun;