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
[27/28] git commit: [3649] Adds final to fields
[3649] Adds final to fields
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/5a6e2b0e
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/5a6e2b0e
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/5a6e2b0e
Branch: refs/heads/trunk
Commit: 5a6e2b0eabc3cfb2e347c4c59e12246a98a3e277
Parents: 37f6a9f
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Feb 24 16:45:15 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Feb 27 11:00:09 2012 +0100
----------------------------------------------------------------------
.../org/apache/cassandra/cache/FreeableMemory.java | 2 +-
src/java/org/apache/cassandra/cli/CliClient.java | 8 +++---
.../org/apache/cassandra/cli/CliCompleter.java | 4 +-
src/java/org/apache/cassandra/cli/CliMain.java | 4 +-
src/java/org/apache/cassandra/cli/CliOptions.java | 2 +-
.../concurrent/CreationTimeAwareFuture.java | 6 +---
.../concurrent/DebuggableThreadPoolExecutor.java | 2 +-
.../apache/cassandra/concurrent/StageManager.java | 2 +-
.../org/apache/cassandra/config/CFMetaData.java | 2 +-
.../cassandra/config/DatabaseDescriptor.java | 2 +-
src/java/org/apache/cassandra/cql/CFPropDefs.java | 2 +-
.../org/apache/cassandra/cql/CQLStatement.java | 6 ++--
.../cassandra/cql/CreateColumnFamilyStatement.java | 4 +-
.../cassandra/cql/CreateKeyspaceStatement.java | 2 +-
src/java/org/apache/cassandra/cql/Relation.java | 6 ++--
.../org/apache/cassandra/cql/SelectExpression.java | 9 ++++--
.../org/apache/cassandra/cql/UpdateStatement.java | 2 +-
src/java/org/apache/cassandra/cql/WhereClause.java | 6 ++--
src/java/org/apache/cassandra/cql3/CFPropDefs.java | 2 +-
.../statements/CreateColumnFamilyStatement.java | 6 ++--
.../cql3/statements/CreateKeyspaceStatement.java | 2 +-
.../cassandra/db/AbstractColumnContainer.java | 2 +-
.../apache/cassandra/db/CollationController.java | 2 +-
src/java/org/apache/cassandra/db/Column.java | 4 +-
src/java/org/apache/cassandra/db/ColumnFamily.java | 2 +-
.../org/apache/cassandra/db/ColumnFamilyStore.java | 8 +++---
.../cassandra/db/CounterMutationVerbHandler.java | 2 +-
src/java/org/apache/cassandra/db/DataTracker.java | 4 +--
src/java/org/apache/cassandra/db/Directories.java | 2 +-
.../org/apache/cassandra/db/MeteredFlusher.java | 2 +-
src/java/org/apache/cassandra/db/ReadCommand.java | 2 +-
src/java/org/apache/cassandra/db/ReadResponse.java | 2 +-
.../org/apache/cassandra/db/ReadVerbHandler.java | 2 +-
src/java/org/apache/cassandra/db/Row.java | 2 +-
src/java/org/apache/cassandra/db/RowMutation.java | 16 +++++------
.../cassandra/db/RowMutationVerbHandler.java | 2 +-
src/java/org/apache/cassandra/db/SuperColumn.java | 6 ++--
src/java/org/apache/cassandra/db/SystemTable.java | 2 +-
.../org/apache/cassandra/db/TruncateResponse.java | 2 +-
.../apache/cassandra/db/TruncateVerbHandler.java | 2 +-
src/java/org/apache/cassandra/db/Truncation.java | 2 +-
.../org/apache/cassandra/db/WriteResponse.java | 2 +-
.../db/columniterator/IndexedSliceReader.java | 8 +++---
.../db/columniterator/SSTableNamesIterator.java | 2 +-
.../db/columniterator/SSTableSliceIterator.java | 2 +-
.../cassandra/db/commitlog/CommitLogSegment.java | 4 +-
.../db/compaction/AbstractCompactionIterable.java | 2 +-
.../db/compaction/AbstractCompactionTask.java | 2 +-
.../db/compaction/CompactionController.java | 6 ++--
.../db/compaction/CompactionIterable.java | 2 +-
.../cassandra/db/compaction/CompactionManager.java | 4 +-
.../cassandra/db/compaction/LeveledManifest.java | 2 +-
.../db/compaction/ParallelCompactionIterable.java | 2 +-
.../cassandra/db/compaction/PrecompactedRow.java | 2 +-
.../apache/cassandra/db/filter/ExtendedFilter.java | 2 +-
.../cassandra/db/filter/SliceQueryFilter.java | 2 +-
.../apache/cassandra/db/index/SecondaryIndex.java | 2 +-
.../cassandra/db/index/SecondaryIndexSearcher.java | 6 ++--
.../org/apache/cassandra/dht/AbstractBounds.java | 2 +-
.../org/apache/cassandra/gms/EndpointState.java | 4 +-
.../org/apache/cassandra/gms/FailureDetector.java | 10 +++---
.../org/apache/cassandra/gms/GossipDigest.java | 8 +++---
.../cassandra/gms/GossipDigestAck2Message.java | 4 +-
.../cassandra/gms/GossipDigestAck2VerbHandler.java | 2 +-
.../cassandra/gms/GossipDigestAckMessage.java | 6 ++--
.../cassandra/gms/GossipDigestAckVerbHandler.java | 2 +-
.../cassandra/gms/GossipDigestSynMessage.java | 6 ++--
.../cassandra/gms/GossipDigestSynVerbHandler.java | 2 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 20 +++++++-------
.../org/apache/cassandra/gms/HeartBeatState.java | 2 +-
src/java/org/apache/cassandra/gms/PureRandom.java | 2 +-
.../org/apache/cassandra/gms/VersionGenerator.java | 2 +-
.../org/apache/cassandra/gms/VersionedValue.java | 2 +-
.../apache/cassandra/hadoop/BulkRecordWriter.java | 6 ++--
.../io/compress/CompressedSequentialWriter.java | 10 +++---
.../cassandra/io/sstable/BloomFilterTracker.java | 4 +-
.../apache/cassandra/io/sstable/IndexSummary.java | 4 +-
.../io/sstable/SSTableIdentityIterator.java | 4 +-
.../cassandra/io/sstable/SSTableMetadata.java | 2 +-
.../apache/cassandra/io/sstable/SSTableReader.java | 2 +-
.../cassandra/io/sstable/SSTableScanner.java | 2 +-
.../apache/cassandra/io/sstable/SSTableWriter.java | 4 +-
.../apache/cassandra/io/util/ColumnSortedMap.java | 2 +-
.../org/apache/cassandra/io/util/FileUtils.java | 2 +-
.../cassandra/io/util/RandomAccessReader.java | 2 +-
.../apache/cassandra/io/util/SequentialWriter.java | 2 +-
.../cassandra/locator/DynamicEndpointSnitch.java | 8 +++---
.../org/apache/cassandra/locator/Ec2Snitch.java | 2 +-
.../cassandra/locator/SimpleSeedProvider.java | 2 +-
.../apache/cassandra/locator/TokenMetadata.java | 12 ++++----
src/java/org/apache/cassandra/net/AsyncResult.java | 8 +++---
src/java/org/apache/cassandra/net/Header.java | 2 +-
src/java/org/apache/cassandra/net/HeaderTypes.java | 2 +-
.../cassandra/net/IncomingTcpConnection.java | 8 +++---
.../apache/cassandra/net/MessageDeliveryTask.java | 2 +-
.../org/apache/cassandra/net/MessagingService.java | 4 +-
.../cassandra/net/OutboundTcpConnectionPool.java | 2 +-
.../org/apache/cassandra/net/sink/SinkManager.java | 2 +-
.../notifications/SSTableAddedNotification.java | 2 +-
.../SSTableListChangedNotification.java | 4 +-
.../cassandra/scheduler/RoundRobinScheduler.java | 4 +-
.../cassandra/service/AbstractCassandraDaemon.java | 4 +-
.../cassandra/service/AbstractRowResolver.java | 2 +-
.../cassandra/service/AntiEntropyService.java | 3 +-
.../org/apache/cassandra/service/ClientState.java | 6 ++--
.../DatacenterSyncWriteResponseHandler.java | 2 +-
.../org/apache/cassandra/service/GCInspector.java | 8 +++---
.../apache/cassandra/service/LoadBroadcaster.java | 2 +-
.../service/SocketSessionManagementService.java | 2 +-
.../apache/cassandra/service/StorageService.java | 2 +-
.../cassandra/service/TruncateResponseHandler.java | 2 +-
.../apache/cassandra/streaming/FileStreamTask.java | 2 +-
.../apache/cassandra/streaming/PendingFile.java | 2 +-
.../streaming/ReplicationFinishedVerbHandler.java | 2 +-
.../apache/cassandra/streaming/StreamHeader.java | 2 +-
.../org/apache/cassandra/streaming/StreamIn.java | 2 +-
.../cassandra/streaming/StreamInSession.java | 2 +-
.../org/apache/cassandra/streaming/StreamOut.java | 2 +-
.../streaming/StreamReplyVerbHandler.java | 2 +-
.../cassandra/streaming/StreamRequestMessage.java | 2 +-
.../streaming/StreamRequestVerbHandler.java | 2 +-
.../apache/cassandra/thrift/CassandraDaemon.java | 2 +-
.../apache/cassandra/thrift/CassandraServer.java | 2 +-
.../apache/cassandra/thrift/CustomTHsHaServer.java | 10 +++---
.../cassandra/thrift/CustomTThreadPoolServer.java | 4 +-
.../apache/cassandra/thrift/ThriftValidation.java | 2 +-
.../org/apache/cassandra/tools/BulkLoader.java | 8 +++---
src/java/org/apache/cassandra/tools/NodeCmd.java | 6 +---
src/java/org/apache/cassandra/tools/NodeProbe.java | 4 +-
.../org/apache/cassandra/tools/SSTableExport.java | 6 +---
.../org/apache/cassandra/tools/SSTableImport.java | 6 +---
.../org/apache/cassandra/utils/BloomFilter.java | 4 +-
.../apache/cassandra/utils/BytesReadTracker.java | 2 +-
src/java/org/apache/cassandra/utils/CLibrary.java | 2 +-
.../apache/cassandra/utils/EstimatedHistogram.java | 2 +-
.../org/apache/cassandra/utils/FBUtilities.java | 2 +-
.../org/apache/cassandra/utils/GuidGenerator.java | 6 ++--
.../org/apache/cassandra/utils/LatencyTracker.java | 4 +-
.../apache/cassandra/utils/LegacyBloomFilter.java | 2 +-
.../org/apache/cassandra/utils/MerkleTree.java | 6 ++--
src/java/org/apache/cassandra/utils/NodeId.java | 2 +-
.../apache/cassandra/utils/ResourceWatcher.java | 6 ++--
.../org/apache/cassandra/utils/SlabAllocator.java | 2 +-
src/java/org/apache/cassandra/utils/Throttle.java | 2 +-
144 files changed, 260 insertions(+), 270 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cache/FreeableMemory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/FreeableMemory.java b/src/java/org/apache/cassandra/cache/FreeableMemory.java
index 39bded9..a3423d4 100644
--- a/src/java/org/apache/cassandra/cache/FreeableMemory.java
+++ b/src/java/org/apache/cassandra/cache/FreeableMemory.java
@@ -23,7 +23,7 @@ import org.apache.cassandra.io.util.Memory;
public class FreeableMemory extends Memory
{
- AtomicInteger references = new AtomicInteger(1);
+ private final AtomicInteger references = new AtomicInteger(1);
public FreeableMemory(long size)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cli/CliClient.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliClient.java b/src/java/org/apache/cassandra/cli/CliClient.java
index 5c87156..6e53b03 100644
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -140,12 +140,12 @@ public class CliClient
private final String NEWLINE = System.getProperty("line.separator");
private final String TAB = " ";
- private Cassandra.Client thriftClient = null;
- private CliSessionState sessionState = null;
+ private final Cassandra.Client thriftClient;
+ private final CliSessionState sessionState;
private String keySpace = null;
private String username = null;
- private Map<String, KsDef> keyspacesMap = new HashMap<String, KsDef>();
- private Map<String, AbstractType<?>> cfKeysComparators;
+ private final Map<String, KsDef> keyspacesMap = new HashMap<String, KsDef>();
+ private final Map<String, AbstractType<?>> cfKeysComparators;
private ConsistencyLevel consistencyLevel = ConsistencyLevel.ONE;
private CliUserHelp help;
public CliClient(CliSessionState cliSessionState, Cassandra.Client thriftClient)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cli/CliCompleter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliCompleter.java b/src/java/org/apache/cassandra/cli/CliCompleter.java
index 0f03bad..72d254a 100644
--- a/src/java/org/apache/cassandra/cli/CliCompleter.java
+++ b/src/java/org/apache/cassandra/cli/CliCompleter.java
@@ -21,7 +21,7 @@ import jline.SimpleCompletor;
public class CliCompleter extends SimpleCompletor
{
- private static String[] commands = {
+ private static final String[] commands = {
"connect",
"describe keyspace",
"exit",
@@ -62,7 +62,7 @@ public class CliCompleter extends SimpleCompletor
"help truncate",
"help consistencylevel"
};
- private static String[] keyspaceCommands = {
+ private static final String[] keyspaceCommands = {
"get",
"set",
"count",
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cli/CliMain.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliMain.java b/src/java/org/apache/cassandra/cli/CliMain.java
index cf74442..43c24d7 100644
--- a/src/java/org/apache/cassandra/cli/CliMain.java
+++ b/src/java/org/apache/cassandra/cli/CliMain.java
@@ -43,9 +43,9 @@ public class CliMain
private static TTransport transport = null;
private static Cassandra.Client thriftClient = null;
- public static CliSessionState sessionState = new CliSessionState();
+ public static final CliSessionState sessionState = new CliSessionState();
private static CliClient cliClient;
- private static CliCompleter completer = new CliCompleter();
+ private static final CliCompleter completer = new CliCompleter();
private static int lineNumber = 1;
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cli/CliOptions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cli/CliOptions.java b/src/java/org/apache/cassandra/cli/CliOptions.java
index f54652a..178ba29 100644
--- a/src/java/org/apache/cassandra/cli/CliOptions.java
+++ b/src/java/org/apache/cassandra/cli/CliOptions.java
@@ -26,7 +26,7 @@ import org.apache.commons.cli.*;
*/
public class CliOptions
{
- private static CLIOptions options = null; // Info about command line options
+ private static final CLIOptions options; // Info about command line options
// Name of the command line tool (used for error messages)
private static final String TOOL_NAME = "cassandra-cli";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/concurrent/CreationTimeAwareFuture.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/CreationTimeAwareFuture.java b/src/java/org/apache/cassandra/concurrent/CreationTimeAwareFuture.java
index 7121d8c..6c06495 100644
--- a/src/java/org/apache/cassandra/concurrent/CreationTimeAwareFuture.java
+++ b/src/java/org/apache/cassandra/concurrent/CreationTimeAwareFuture.java
@@ -35,14 +35,12 @@ import java.util.concurrent.TimeoutException;
public class CreationTimeAwareFuture<V> implements Future<V>
{
- private long creationTime = System.currentTimeMillis();
-
- private Future<V> future;
+ private final long creationTime = System.currentTimeMillis();
+ private final Future<V> future;
public CreationTimeAwareFuture(Future<V> future)
{
this.future = future;
- creationTime = System.currentTimeMillis();
}
public V get(long timeout, TimeUnit unit) throws InterruptedException, ExecutionException, TimeoutException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java b/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
index bdce4de..61f8cc4 100644
--- a/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
+++ b/src/java/org/apache/cassandra/concurrent/DebuggableThreadPoolExecutor.java
@@ -41,7 +41,7 @@ import org.slf4j.LoggerFactory;
*/
public class DebuggableThreadPoolExecutor extends ThreadPoolExecutor
{
- protected static Logger logger = LoggerFactory.getLogger(DebuggableThreadPoolExecutor.class);
+ protected static final Logger logger = LoggerFactory.getLogger(DebuggableThreadPoolExecutor.class);
public static final RejectedExecutionHandler blockingExecutionHandler = new RejectedExecutionHandler()
{
public void rejectedExecution(Runnable task, ThreadPoolExecutor executor)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/concurrent/StageManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/StageManager.java b/src/java/org/apache/cassandra/concurrent/StageManager.java
index af7a81b..b8e098e 100644
--- a/src/java/org/apache/cassandra/concurrent/StageManager.java
+++ b/src/java/org/apache/cassandra/concurrent/StageManager.java
@@ -32,7 +32,7 @@ import static org.apache.cassandra.config.DatabaseDescriptor.*;
*/
public class StageManager
{
- private static EnumMap<Stage, ThreadPoolExecutor> stages = new EnumMap<Stage, ThreadPoolExecutor>(Stage.class);
+ private static final EnumMap<Stage, ThreadPoolExecutor> stages = new EnumMap<Stage, ThreadPoolExecutor>(Stage.class);
public static final long KEEPALIVE = 60; // seconds to keep "extra" threads alive for when idle
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index 68d5a89..bb16c57 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -59,7 +59,7 @@ public final class CFMetaData
// for how to do so safely.
//
- private static Logger logger = LoggerFactory.getLogger(CFMetaData.class);
+ private static final Logger logger = LoggerFactory.getLogger(CFMetaData.class);
public final static double DEFAULT_READ_REPAIR_CHANCE = 0.1;
public final static double DEFAULT_DCLOCAL_READ_REPAIR_CHANCE = 0.0;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 d965ba1..dde24eb 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -58,7 +58,7 @@ import org.yaml.snakeyaml.error.YAMLException;
public class DatabaseDescriptor
{
- private static Logger logger = LoggerFactory.getLogger(DatabaseDescriptor.class);
+ private static final Logger logger = LoggerFactory.getLogger(DatabaseDescriptor.class);
private static IEndpointSnitch snitch;
private static InetAddress listenAddress; // leave null so we can fall through to getLocalHost
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cql/CFPropDefs.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/CFPropDefs.java b/src/java/org/apache/cassandra/cql/CFPropDefs.java
index 9d16e4f..465c2c2 100644
--- a/src/java/org/apache/cassandra/cql/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql/CFPropDefs.java
@@ -35,7 +35,7 @@ import java.util.Map;
import java.util.Set;
public class CFPropDefs {
- private static Logger logger = LoggerFactory.getLogger(CFPropDefs.class);
+ private static final Logger logger = LoggerFactory.getLogger(CFPropDefs.class);
public static final String KW_COMPARATOR = "comparator";
public static final String KW_COMMENT = "comment";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cql/CQLStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/CQLStatement.java b/src/java/org/apache/cassandra/cql/CQLStatement.java
index 34aa63e..b495211 100644
--- a/src/java/org/apache/cassandra/cql/CQLStatement.java
+++ b/src/java/org/apache/cassandra/cql/CQLStatement.java
@@ -19,9 +19,9 @@ package org.apache.cassandra.cql;
public class CQLStatement
{
- public StatementType type;
- public Object statement;
- public int boundTerms = 0;
+ public final StatementType type;
+ public final Object statement;
+ public final int boundTerms;
public CQLStatement(StatementType type, Object statement, int lastMarker)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java b/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
index 6b6586c..636b589 100644
--- a/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
+++ b/src/java/org/apache/cassandra/cql/CreateColumnFamilyStatement.java
@@ -38,9 +38,9 @@ public class CreateColumnFamilyStatement
{
private final String name;
private final Map<Term, String> columns = new HashMap<Term, String>();
- private List<String> keyValidator = new ArrayList<String>();
+ private final List<String> keyValidator = new ArrayList<String>();
private ByteBuffer keyAlias = null;
- private CFPropDefs cfProps = new CFPropDefs();
+ private final CFPropDefs cfProps = new CFPropDefs();
public CreateColumnFamilyStatement(String name)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cql/CreateKeyspaceStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/CreateKeyspaceStatement.java b/src/java/org/apache/cassandra/cql/CreateKeyspaceStatement.java
index 7ef861a..9899218 100644
--- a/src/java/org/apache/cassandra/cql/CreateKeyspaceStatement.java
+++ b/src/java/org/apache/cassandra/cql/CreateKeyspaceStatement.java
@@ -32,7 +32,7 @@ public class CreateKeyspaceStatement
private final String name;
private final Map<String, String> attrs;
private String strategyClass;
- private Map<String, String> strategyOptions = new HashMap<String, String>();
+ private final Map<String, String> strategyOptions = new HashMap<String, String>();
/**
* Creates a new <code>CreateKeyspaceStatement</code> instance for a given
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cql/Relation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/Relation.java b/src/java/org/apache/cassandra/cql/Relation.java
index 7f7c5b1..7569789 100644
--- a/src/java/org/apache/cassandra/cql/Relation.java
+++ b/src/java/org/apache/cassandra/cql/Relation.java
@@ -24,9 +24,9 @@ package org.apache.cassandra.cql;
*/
public class Relation
{
- private Term entity;
- private RelationType relationType;
- private Term value;
+ private final Term entity;
+ private final RelationType relationType;
+ private final Term value;
/**
* Creates a new relation.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cql/SelectExpression.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/SelectExpression.java b/src/java/org/apache/cassandra/cql/SelectExpression.java
index 3e558cb..0793cd8 100644
--- a/src/java/org/apache/cassandra/cql/SelectExpression.java
+++ b/src/java/org/apache/cassandra/cql/SelectExpression.java
@@ -34,10 +34,10 @@ public class SelectExpression
private int numColumns = MAX_COLUMNS_DEFAULT;
private boolean reverseColumns = false;
- private boolean hasFirstSet;
+ private final boolean hasFirstSet;
private final boolean wildcard;
- private Term start, finish;
- private List<Term> columns;
+ private final Term start, finish;
+ private final List<Term> columns;
/**
* Create a new SelectExpression for a range (slice) of columns.
@@ -57,6 +57,7 @@ public class SelectExpression
reverseColumns = reverse;
this.wildcard = wildcard;
hasFirstSet = firstSet;
+ this.columns = null;
}
/**
@@ -75,6 +76,8 @@ public class SelectExpression
numColumns = count;
reverseColumns = reverse;
hasFirstSet = firstSet;
+ start = null;
+ finish = null;
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cql/UpdateStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/UpdateStatement.java b/src/java/org/apache/cassandra/cql/UpdateStatement.java
index dc20b12..eea826a 100644
--- a/src/java/org/apache/cassandra/cql/UpdateStatement.java
+++ b/src/java/org/apache/cassandra/cql/UpdateStatement.java
@@ -45,7 +45,7 @@ public class UpdateStatement extends AbstractModification
{
private Map<Term, Operation> columns;
private List<Term> columnNames, columnValues;
- private List<Term> keys;
+ private final List<Term> keys;
/**
* Creates a new UpdateStatement from a column family name, columns map, consistency
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cql/WhereClause.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql/WhereClause.java b/src/java/org/apache/cassandra/cql/WhereClause.java
index ceeaa06..eda166d 100644
--- a/src/java/org/apache/cassandra/cql/WhereClause.java
+++ b/src/java/org/apache/cassandra/cql/WhereClause.java
@@ -34,11 +34,11 @@ public class WhereClause
{
// all relations (except for `<key> IN (.., .., ..)` which can be directly interpreted) from parser
// are stored into this array and are filtered to the keys/columns by extractKeysFromColumns(...)
- private List<Relation> clauseRelations = new ArrayList<Relation>();
- private List<Relation> columns = new ArrayList<Relation>();
+ private final List<Relation> clauseRelations = new ArrayList<Relation>();
+ private final List<Relation> columns = new ArrayList<Relation>();
// added to either by the parser from an IN clause or by extractKeysFromColumns
- private Set<Term> keys = new LinkedHashSet<Term>();
+ private final Set<Term> keys = new LinkedHashSet<Term>();
private Term startKey, finishKey;
private boolean includeStartKey = false, includeFinishKey = false, multiKey = false;
// set by extractKeysFromColumns
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cql3/CFPropDefs.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/CFPropDefs.java b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
index f867953..c471371 100644
--- a/src/java/org/apache/cassandra/cql3/CFPropDefs.java
+++ b/src/java/org/apache/cassandra/cql3/CFPropDefs.java
@@ -35,7 +35,7 @@ import java.util.Set;
public class CFPropDefs
{
- private static Logger logger = LoggerFactory.getLogger(CFPropDefs.class);
+ private static final Logger logger = LoggerFactory.getLogger(CFPropDefs.class);
public static final String KW_COMMENT = "comment";
public static final String KW_READREPAIRCHANCE = "read_repair_chance";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
index bc9c3fc..0ab95a8 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateColumnFamilyStatement.java
@@ -50,7 +50,7 @@ public class CreateColumnFamilyStatement extends SchemaAlteringStatement
private AbstractType<?> keyValidator;
private ByteBuffer keyAlias;
- private List<ByteBuffer> columnAliases = new ArrayList<ByteBuffer>();
+ private final List<ByteBuffer> columnAliases = new ArrayList<ByteBuffer>();
private ByteBuffer valueAlias;
private final Map<ColumnIdentifier, String> columns = new HashMap<ColumnIdentifier, String>();
@@ -132,10 +132,10 @@ public class CreateColumnFamilyStatement extends SchemaAlteringStatement
private final CFPropDefs properties = new CFPropDefs();
private final List<ColumnIdentifier> keyAliases = new ArrayList<ColumnIdentifier>();
- private List<ColumnIdentifier> columnAliases = new ArrayList<ColumnIdentifier>();
+ private final List<ColumnIdentifier> columnAliases = new ArrayList<ColumnIdentifier>();
private boolean useCompactStorage;
- private Multiset<ColumnIdentifier> definedNames = HashMultiset.create(1);
+ private final Multiset<ColumnIdentifier> definedNames = HashMultiset.create(1);
public RawStatement(CFName name)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/cql3/statements/CreateKeyspaceStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateKeyspaceStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateKeyspaceStatement.java
index b366309..6fe5d26 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateKeyspaceStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateKeyspaceStatement.java
@@ -42,7 +42,7 @@ public class CreateKeyspaceStatement extends SchemaAlteringStatement
private final String name;
private final Map<String, String> attrs;
private String strategyClass;
- private Map<String, String> strategyOptions = new HashMap<String, String>();
+ private final Map<String, String> strategyOptions = new HashMap<String, String>();
/**
* Creates a new <code>CreateKeyspaceStatement</code> instance for a given
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 ce6ec62..4db9304 100644
--- a/src/java/org/apache/cassandra/db/AbstractColumnContainer.java
+++ b/src/java/org/apache/cassandra/db/AbstractColumnContainer.java
@@ -34,7 +34,7 @@ import org.apache.cassandra.utils.HeapAllocator;
public abstract class AbstractColumnContainer implements IColumnContainer, IIterableColumns
{
- private static Logger logger = LoggerFactory.getLogger(AbstractColumnContainer.class);
+ private static final Logger logger = LoggerFactory.getLogger(AbstractColumnContainer.class);
protected final ISortedColumns columns;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/CollationController.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/CollationController.java b/src/java/org/apache/cassandra/db/CollationController.java
index 9f6a489..85c4422 100644
--- a/src/java/org/apache/cassandra/db/CollationController.java
+++ b/src/java/org/apache/cassandra/db/CollationController.java
@@ -37,7 +37,7 @@ import org.apache.cassandra.utils.CloseableIterator;
public class CollationController
{
- private static Logger logger = LoggerFactory.getLogger(CollationController.class);
+ private static final Logger logger = LoggerFactory.getLogger(CollationController.class);
private final ColumnFamilyStore cfs;
private final boolean mutableColumns;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 12c141b..ef1abcc 100644
--- a/src/java/org/apache/cassandra/db/Column.java
+++ b/src/java/org/apache/cassandra/db/Column.java
@@ -41,8 +41,8 @@ import org.apache.cassandra.utils.HeapAllocator;
public class Column implements IColumn
{
- private static Logger logger = LoggerFactory.getLogger(Column.class);
- private static ColumnSerializer serializer = new ColumnSerializer();
+ private static final Logger logger = LoggerFactory.getLogger(Column.class);
+ private static final ColumnSerializer serializer = new ColumnSerializer();
public static ColumnSerializer serializer()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/ColumnFamily.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamily.java b/src/java/org/apache/cassandra/db/ColumnFamily.java
index c4c162f..6a5d1b2 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamily.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamily.java
@@ -38,7 +38,7 @@ import org.apache.cassandra.utils.HeapAllocator;
public class ColumnFamily extends AbstractColumnContainer
{
/* The column serializer for this Column Family. Create based on config. */
- private static ColumnFamilySerializer serializer = new ColumnFamilySerializer();
+ private static final ColumnFamilySerializer serializer = new ColumnFamilySerializer();
private final CFMetaData cfm;
public static ColumnFamilySerializer serializer()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
index 1714e60..fcb3e39 100644
--- a/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
+++ b/src/java/org/apache/cassandra/db/ColumnFamilyStore.java
@@ -65,7 +65,7 @@ import org.cliffc.high_scale_lib.NonBlockingHashMap;
public class ColumnFamilyStore implements ColumnFamilyStoreMBean
{
- private static Logger logger = LoggerFactory.getLogger(ColumnFamilyStore.class);
+ private static final Logger logger = LoggerFactory.getLogger(ColumnFamilyStore.class);
/*
* maybeSwitchMemtable puts Memtable.getSortedContents on the writer executor. When the write is complete,
@@ -108,12 +108,12 @@ public class ColumnFamilyStore implements ColumnFamilyStoreMBean
private volatile int memtableSwitchCount = 0;
/* This is used to generate the next index for a SSTable */
- private AtomicInteger fileIndexGenerator = new AtomicInteger(0);
+ private final AtomicInteger fileIndexGenerator = new AtomicInteger(0);
public final SecondaryIndexManager indexManager;
- private LatencyTracker readStats = new LatencyTracker();
- private LatencyTracker writeStats = new LatencyTracker();
+ private final LatencyTracker readStats = new LatencyTracker();
+ private final LatencyTracker writeStats = new LatencyTracker();
// counts of sstables accessed by reads
private final EstimatedHistogram recentSSTablesPerRead = new EstimatedHistogram(35);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java b/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java
index 12360f4..d8e09bb 100644
--- a/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/CounterMutationVerbHandler.java
@@ -32,7 +32,7 @@ import org.apache.cassandra.thrift.UnavailableException;
public class CounterMutationVerbHandler implements IVerbHandler
{
- private static Logger logger = LoggerFactory.getLogger(CounterMutationVerbHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(CounterMutationVerbHandler.class);
public void doVerb(Message message, String id)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/DataTracker.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DataTracker.java b/src/java/org/apache/cassandra/db/DataTracker.java
index 2e6fc8e..d346eab 100644
--- a/src/java/org/apache/cassandra/db/DataTracker.java
+++ b/src/java/org/apache/cassandra/db/DataTracker.java
@@ -43,10 +43,8 @@ public class DataTracker
{
private static final Logger logger = LoggerFactory.getLogger(DataTracker.class);
- public Collection<INotificationConsumer> subscribers = new CopyOnWriteArrayList<INotificationConsumer>();
-
+ public final Collection<INotificationConsumer> subscribers = new CopyOnWriteArrayList<INotificationConsumer>();
public final ColumnFamilyStore cfstore;
-
private final AtomicReference<View> view;
// On disk live and total size
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/Directories.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Directories.java b/src/java/org/apache/cassandra/db/Directories.java
index fde9efd..d54c2cf 100644
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@ -59,7 +59,7 @@ import org.apache.cassandra.utils.Pair;
*/
public class Directories
{
- private static Logger logger = LoggerFactory.getLogger(Directories.class);
+ private static final Logger logger = LoggerFactory.getLogger(Directories.class);
public static final String BACKUPS_SUBDIR = "backups";
public static final String SNAPSHOT_SUBDIR = "snapshots";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/MeteredFlusher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/MeteredFlusher.java b/src/java/org/apache/cassandra/db/MeteredFlusher.java
index 29ad2e1..f8d249d 100644
--- a/src/java/org/apache/cassandra/db/MeteredFlusher.java
+++ b/src/java/org/apache/cassandra/db/MeteredFlusher.java
@@ -31,7 +31,7 @@ import org.apache.cassandra.config.DatabaseDescriptor;
class MeteredFlusher implements Runnable
{
- private static Logger logger = LoggerFactory.getLogger(MeteredFlusher.class);
+ private static final Logger logger = LoggerFactory.getLogger(MeteredFlusher.class);
public void run()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/ReadCommand.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadCommand.java b/src/java/org/apache/cassandra/db/ReadCommand.java
index bb526eb..96a42fc 100644
--- a/src/java/org/apache/cassandra/db/ReadCommand.java
+++ b/src/java/org/apache/cassandra/db/ReadCommand.java
@@ -40,7 +40,7 @@ public abstract class ReadCommand implements MessageProducer, IReadCommand
public static final byte CMD_TYPE_GET_SLICE_BY_NAMES = 1;
public static final byte CMD_TYPE_GET_SLICE = 2;
- private static ReadCommandSerializer serializer = new ReadCommandSerializer();
+ private static final ReadCommandSerializer serializer = new ReadCommandSerializer();
public static ReadCommandSerializer serializer()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/ReadResponse.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadResponse.java b/src/java/org/apache/cassandra/db/ReadResponse.java
index 73402f5..9ccfb06 100644
--- a/src/java/org/apache/cassandra/db/ReadResponse.java
+++ b/src/java/org/apache/cassandra/db/ReadResponse.java
@@ -32,7 +32,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
*/
public class ReadResponse
{
-private static IVersionedSerializer<ReadResponse> serializer;
+private static final IVersionedSerializer<ReadResponse> serializer;
static
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/ReadVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ReadVerbHandler.java b/src/java/org/apache/cassandra/db/ReadVerbHandler.java
index 49ba823..ea7f21c 100644
--- a/src/java/org/apache/cassandra/db/ReadVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/ReadVerbHandler.java
@@ -33,7 +33,7 @@ import org.apache.cassandra.utils.FBUtilities;
public class ReadVerbHandler implements IVerbHandler
{
- private static Logger logger = LoggerFactory.getLogger( ReadVerbHandler.class );
+ private static final Logger logger = LoggerFactory.getLogger( ReadVerbHandler.class );
public void doVerb(Message message, String id)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/Row.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Row.java b/src/java/org/apache/cassandra/db/Row.java
index 2176f32..9b20189 100644
--- a/src/java/org/apache/cassandra/db/Row.java
+++ b/src/java/org/apache/cassandra/db/Row.java
@@ -26,7 +26,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
public class Row
{
- private static RowSerializer serializer = new RowSerializer();
+ private static final RowSerializer serializer = new RowSerializer();
public static RowSerializer serializer()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/RowMutation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RowMutation.java b/src/java/org/apache/cassandra/db/RowMutation.java
index f7206fb..8251f03 100644
--- a/src/java/org/apache/cassandra/db/RowMutation.java
+++ b/src/java/org/apache/cassandra/db/RowMutation.java
@@ -45,7 +45,7 @@ import org.apache.cassandra.utils.UUIDGen;
public class RowMutation implements IMutation, MessageProducer
{
- private static RowMutationSerializer serializer = new RowMutationSerializer();
+ private static final RowMutationSerializer serializer = new RowMutationSerializer();
public static final String FORWARD_HEADER = "FORWARD";
public static RowMutationSerializer serializer()
@@ -53,23 +53,21 @@ public class RowMutation implements IMutation, MessageProducer
return serializer;
}
- private String table;
- private ByteBuffer key;
+ private final String table;
+ private final ByteBuffer key;
// map of column family id to mutations for that column family.
- protected Map<Integer, ColumnFamily> modifications = new HashMap<Integer, ColumnFamily>();
+ protected final Map<Integer, ColumnFamily> modifications;
- private Map<Integer, byte[]> preserializedBuffers = new HashMap<Integer, byte[]>();
+ private final Map<Integer, byte[]> preserializedBuffers = new HashMap<Integer, byte[]>();
public RowMutation(String table, ByteBuffer key)
{
- this.table = table;
- this.key = key;
+ this(table, key, new HashMap<Integer, ColumnFamily>());
}
public RowMutation(String table, Row row)
{
- this.table = table;
- this.key = row.key.key;
+ this(table, row.key.key);
add(row.cf);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java b/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java
index 867b434..7614053 100644
--- a/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/RowMutationVerbHandler.java
@@ -32,7 +32,7 @@ import org.apache.cassandra.net.MessagingService;
public class RowMutationVerbHandler implements IVerbHandler
{
- private static Logger logger = LoggerFactory.getLogger(RowMutationVerbHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(RowMutationVerbHandler.class);
public void doVerb(Message message, String id)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/SuperColumn.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SuperColumn.java b/src/java/org/apache/cassandra/db/SuperColumn.java
index d12ba35..70ccca7 100644
--- a/src/java/org/apache/cassandra/db/SuperColumn.java
+++ b/src/java/org/apache/cassandra/db/SuperColumn.java
@@ -41,7 +41,7 @@ import org.cliffc.high_scale_lib.NonBlockingHashMap;
public class SuperColumn extends AbstractColumnContainer implements IColumn
{
- private static NonBlockingHashMap<Comparator, SuperColumnSerializer> serializers = new NonBlockingHashMap<Comparator, SuperColumnSerializer>();
+ private static final NonBlockingHashMap<Comparator, SuperColumnSerializer> serializers = new NonBlockingHashMap<Comparator, SuperColumnSerializer>();
public static SuperColumnSerializer serializer(AbstractType<?> comparator)
{
SuperColumnSerializer serializer = serializers.get(comparator);
@@ -53,7 +53,7 @@ public class SuperColumn extends AbstractColumnContainer implements IColumn
return serializer;
}
- private ByteBuffer name;
+ private final ByteBuffer name;
public SuperColumn(ByteBuffer name, AbstractType<?> comparator)
{
@@ -337,7 +337,7 @@ public class SuperColumn extends AbstractColumnContainer implements IColumn
class SuperColumnSerializer implements IColumnSerializer
{
- private AbstractType<?> comparator;
+ private final AbstractType<?> comparator;
public SuperColumnSerializer(AbstractType<?> comparator)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/SystemTable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/SystemTable.java b/src/java/org/apache/cassandra/db/SystemTable.java
index 1fd97dd..94f08e0 100644
--- a/src/java/org/apache/cassandra/db/SystemTable.java
+++ b/src/java/org/apache/cassandra/db/SystemTable.java
@@ -48,7 +48,7 @@ import org.apache.cassandra.utils.NodeId;
public class SystemTable
{
- private static Logger logger = LoggerFactory.getLogger(SystemTable.class);
+ private static final Logger logger = LoggerFactory.getLogger(SystemTable.class);
public static final String STATUS_CF = "LocationInfo"; // keep the old CF string for backwards-compatibility
public static final String INDEX_CF = "IndexInfo";
public static final String NODE_ID_CF = "NodeIdInfo";
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/TruncateResponse.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/TruncateResponse.java b/src/java/org/apache/cassandra/db/TruncateResponse.java
index e5d0ee1..c1162aa 100644
--- a/src/java/org/apache/cassandra/db/TruncateResponse.java
+++ b/src/java/org/apache/cassandra/db/TruncateResponse.java
@@ -31,7 +31,7 @@ import org.apache.cassandra.utils.FBUtilities;
*/
public class TruncateResponse
{
- private static TruncateResponseSerializer serializer = new TruncateResponseSerializer();
+ private static final TruncateResponseSerializer serializer = new TruncateResponseSerializer();
public static TruncateResponseSerializer serializer()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/TruncateVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/TruncateVerbHandler.java b/src/java/org/apache/cassandra/db/TruncateVerbHandler.java
index 6b3b9fe..724e39e 100644
--- a/src/java/org/apache/cassandra/db/TruncateVerbHandler.java
+++ b/src/java/org/apache/cassandra/db/TruncateVerbHandler.java
@@ -31,7 +31,7 @@ import org.apache.cassandra.net.MessagingService;
public class TruncateVerbHandler implements IVerbHandler
{
- private static Logger logger = LoggerFactory.getLogger(TruncateVerbHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(TruncateVerbHandler.class);
public void doVerb(Message message, String id)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/Truncation.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Truncation.java b/src/java/org/apache/cassandra/db/Truncation.java
index 9ee9300..c04d85f 100644
--- a/src/java/org/apache/cassandra/db/Truncation.java
+++ b/src/java/org/apache/cassandra/db/Truncation.java
@@ -31,7 +31,7 @@ import org.apache.cassandra.utils.FBUtilities;
*/
public class Truncation implements MessageProducer
{
- private static IVersionedSerializer<Truncation> serializer;
+ private static final IVersionedSerializer<Truncation> serializer;
public final String keyspace;
public final String columnFamily;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/WriteResponse.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/WriteResponse.java b/src/java/org/apache/cassandra/db/WriteResponse.java
index 39ad6a6..42661e9 100644
--- a/src/java/org/apache/cassandra/db/WriteResponse.java
+++ b/src/java/org/apache/cassandra/db/WriteResponse.java
@@ -35,7 +35,7 @@ import org.apache.cassandra.utils.FBUtilities;
*/
public class WriteResponse
{
- private static WriteResponseSerializer serializer = new WriteResponseSerializer();
+ private static final WriteResponseSerializer serializer = new WriteResponseSerializer();
public static WriteResponseSerializer serializer()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
index 46d6526..cd9f04d 100644
--- a/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
+++ b/src/java/org/apache/cassandra/db/columniterator/IndexedSliceReader.java
@@ -51,9 +51,9 @@ class IndexedSliceReader extends AbstractIterator<IColumn> implements IColumnIte
private final ByteBuffer finishColumn;
private final boolean reversed;
- private BlockFetcher fetcher;
- private Deque<IColumn> blockColumns = new ArrayDeque<IColumn>();
- private AbstractType<?> comparator;
+ private final BlockFetcher fetcher;
+ private final Deque<IColumn> blockColumns = new ArrayDeque<IColumn>();
+ private final AbstractType<?> comparator;
public IndexedSliceReader(SSTableReader sstable, FileDataInput input, ByteBuffer startColumn, ByteBuffer finishColumn, boolean reversed)
{
@@ -61,7 +61,7 @@ class IndexedSliceReader extends AbstractIterator<IColumn> implements IColumnIte
this.startColumn = startColumn;
this.finishColumn = finishColumn;
this.reversed = reversed;
- comparator = sstable.metadata.comparator;
+ this.comparator = sstable.metadata.comparator;
try
{
IndexHelper.skipBloomFilter(file);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 fdf9fcf..2d791c4 100644
--- a/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
+++ b/src/java/org/apache/cassandra/db/columniterator/SSTableNamesIterator.java
@@ -42,7 +42,7 @@ import org.apache.cassandra.utils.Filter;
public class SSTableNamesIterator extends SimpleAbstractColumnIterator implements IColumnIterator
{
- private static Logger logger = LoggerFactory.getLogger(SSTableNamesIterator.class);
+ private static final Logger logger = LoggerFactory.getLogger(SSTableNamesIterator.class);
private ColumnFamily cf;
private Iterator<IColumn> iter;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java b/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java
index 63fe5b2..8e374b3 100644
--- a/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java
+++ b/src/java/org/apache/cassandra/db/columniterator/SSTableSliceIterator.java
@@ -36,7 +36,7 @@ public class SSTableSliceIterator implements IColumnIterator
{
private final FileDataInput fileToClose;
private IColumnIterator reader;
- private DecoratedKey key;
+ private final DecoratedKey key;
public SSTableSliceIterator(SSTableReader sstable, DecoratedKey key, ByteBuffer startColumn, ByteBuffer finishColumn, boolean reversed)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index c278095..323ae0a 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@ -52,7 +52,7 @@ public class CommitLogSegment
private static final String FILENAME_PREFIX = "CommitLog-";
private static final String FILENAME_EXTENSION = ".log";
- private static Pattern COMMIT_LOG_FILE_PATTERN = Pattern.compile(FILENAME_PREFIX + "(\\d+)" + FILENAME_EXTENSION);
+ private static final Pattern COMMIT_LOG_FILE_PATTERN = Pattern.compile(FILENAME_PREFIX + "(\\d+)" + FILENAME_EXTENSION);
// The commit log entry overhead in bytes (int: length + long: head checksum + long: tail checksum)
static final int ENTRY_OVERHEAD_SIZE = 4 + 8 + 8;
@@ -63,7 +63,7 @@ public class CommitLogSegment
public final long id;
private final File logFile;
- private RandomAccessFile logFileAccessor;
+ private final RandomAccessFile logFileAccessor;
private boolean needsSync = false;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 0c1f12b..45275a6 100644
--- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
+++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionIterable.java
@@ -33,7 +33,7 @@ import org.apache.cassandra.utils.Throttle;
public abstract class AbstractCompactionIterable extends CompactionInfo.Holder implements Iterable<AbstractCompactedRow>
{
- private static Logger logger = LoggerFactory.getLogger(AbstractCompactionIterable.class);
+ private static final Logger logger = LoggerFactory.getLogger(AbstractCompactionIterable.class);
protected final OperationType type;
protected final CompactionController controller;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 33aeefa..e39a533 100644
--- a/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java
+++ b/src/java/org/apache/cassandra/db/compaction/AbstractCompactionTask.java
@@ -27,7 +27,7 @@ import org.apache.cassandra.db.compaction.CompactionManager.CompactionExecutorSt
public abstract class AbstractCompactionTask
{
- protected ColumnFamilyStore cfs;
+ protected final ColumnFamilyStore cfs;
protected Collection<SSTableReader> sstables;
public AbstractCompactionTask(ColumnFamilyStore cfs, Collection<SSTableReader> sstables)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/compaction/CompactionController.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionController.java b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
index 069858d..decbdfa 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionController.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionController.java
@@ -36,14 +36,14 @@ import org.apache.cassandra.service.CacheService;
*/
public class CompactionController
{
- private static Logger logger = LoggerFactory.getLogger(CompactionController.class);
+ private static final Logger logger = LoggerFactory.getLogger(CompactionController.class);
private final ColumnFamilyStore cfs;
private final Set<SSTableReader> sstables;
private final boolean forceDeserialize;
public final int gcBefore;
- public boolean keyExistenceIsExpensive;
+ public final boolean keyExistenceIsExpensive;
public final int mergeShardBefore;
public CompactionController(ColumnFamilyStore cfs, Collection<SSTableReader> sstables, int gcBefore, boolean forceDeserialize)
@@ -58,7 +58,7 @@ public class CompactionController
// current 'stop all write during memtable switch' situation).
this.mergeShardBefore = (int) ((cfs.oldestUnflushedMemtable() + 5 * 3600) / 1000);
this.forceDeserialize = forceDeserialize;
- keyExistenceIsExpensive = cfs.getCompactionStrategy().isKeyExistenceExpensive(this.sstables);
+ this.keyExistenceIsExpensive = cfs.getCompactionStrategy().isKeyExistenceExpensive(this.sstables);
}
public String getKeyspace()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 b640458..8ef5a5a 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionIterable.java
@@ -34,7 +34,7 @@ import org.apache.cassandra.utils.MergeIterator;
public class CompactionIterable extends AbstractCompactionIterable
{
- private static Logger logger = LoggerFactory.getLogger(CompactionIterable.class);
+ private static final Logger logger = LoggerFactory.getLogger(CompactionIterable.class);
private long row;
private final List<SSTableScanner> scanners;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index 3c6cb65..284b0cc 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -93,8 +93,8 @@ public class CompactionManager implements CompactionManagerMBean
}
}
- private CompactionExecutor executor = new CompactionExecutor();
- private CompactionExecutor validationExecutor = new ValidationExecutor();
+ private final CompactionExecutor executor = new CompactionExecutor();
+ private final CompactionExecutor validationExecutor = new ValidationExecutor();
/**
* @return A lock, for which acquisition means no compactions can run.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
index b66426e..069d289 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledManifest.java
@@ -51,7 +51,7 @@ public class LeveledManifest
* uses a pessimistic estimate of how many keys overlap (none), so we risk wasting memory
* or even OOMing when compacting highly overlapping sstables
*/
- static int MAX_COMPACTING_L0 = 32;
+ static final int MAX_COMPACTING_L0 = 32;
private final ColumnFamilyStore cfs;
private final List<SSTableReader>[] generations;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
index 2daa9fa..34488b8 100644
--- a/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
+++ b/src/java/org/apache/cassandra/db/compaction/ParallelCompactionIterable.java
@@ -54,7 +54,7 @@ import org.apache.cassandra.utils.*;
*/
public class ParallelCompactionIterable extends AbstractCompactionIterable
{
- private static Logger logger = LoggerFactory.getLogger(ParallelCompactionIterable.class);
+ private static final Logger logger = LoggerFactory.getLogger(ParallelCompactionIterable.class);
private final List<SSTableScanner> scanners;
private final int maxInMemorySize;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 83ab240..242b58d 100644
--- a/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
+++ b/src/java/org/apache/cassandra/db/compaction/PrecompactedRow.java
@@ -40,7 +40,7 @@ import org.apache.cassandra.utils.HeapAllocator;
*/
public class PrecompactedRow extends AbstractCompactedRow
{
- private static Logger logger = LoggerFactory.getLogger(PrecompactedRow.class);
+ private static final Logger logger = LoggerFactory.getLogger(PrecompactedRow.class);
private final ColumnFamily compactedCf;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java b/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
index d4f109e..308c06a 100644
--- a/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/ExtendedFilter.java
@@ -37,7 +37,7 @@ import org.apache.cassandra.utils.ByteBufferUtil;
*/
public abstract class ExtendedFilter
{
- private static Logger logger = LoggerFactory.getLogger(ExtendedFilter.class);
+ private static final Logger logger = LoggerFactory.getLogger(ExtendedFilter.class);
public final ColumnFamilyStore cfs;
protected final IFilter originalFilter;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
index 7062f8c..7b603e5 100644
--- a/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
+++ b/src/java/org/apache/cassandra/db/filter/SliceQueryFilter.java
@@ -37,7 +37,7 @@ import org.apache.cassandra.io.util.FileDataInput;
public class SliceQueryFilter implements IFilter
{
- private static Logger logger = LoggerFactory.getLogger(SliceQueryFilter.class);
+ private static final Logger logger = LoggerFactory.getLogger(SliceQueryFilter.class);
public final ByteBuffer start; public final ByteBuffer finish;
public final boolean reversed;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndex.java b/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
index f02e26c..f51be46 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndex.java
@@ -56,7 +56,7 @@ public abstract class SecondaryIndex
/**
* The column definitions which this index is responsible for
*/
- protected Set<ColumnDefinition> columnDefs = Collections.newSetFromMap(new ConcurrentHashMap<ColumnDefinition,Boolean>());
+ protected final Set<ColumnDefinition> columnDefs = Collections.newSetFromMap(new ConcurrentHashMap<ColumnDefinition,Boolean>());
/**
* Perform any initialization work
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java b/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
index 783f7e8..f7f3a54 100644
--- a/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
+++ b/src/java/org/apache/cassandra/db/index/SecondaryIndexSearcher.java
@@ -27,9 +27,9 @@ import org.apache.cassandra.thrift.IndexExpression;
public abstract class SecondaryIndexSearcher
{
- protected SecondaryIndexManager indexManager;
- protected Set<ByteBuffer> columns;
- protected ColumnFamilyStore baseCfs;
+ protected final SecondaryIndexManager indexManager;
+ protected final Set<ByteBuffer> columns;
+ protected final ColumnFamilyStore baseCfs;
public SecondaryIndexSearcher(SecondaryIndexManager indexManager, Set<ByteBuffer> columns)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/dht/AbstractBounds.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/AbstractBounds.java b/src/java/org/apache/cassandra/dht/AbstractBounds.java
index 063f947..de66fb2 100644
--- a/src/java/org/apache/cassandra/dht/AbstractBounds.java
+++ b/src/java/org/apache/cassandra/dht/AbstractBounds.java
@@ -31,7 +31,7 @@ import org.apache.cassandra.utils.Pair;
public abstract class AbstractBounds<T extends RingPosition> implements Serializable
{
private static final long serialVersionUID = 1L;
- private static AbstractBoundsSerializer serializer = new AbstractBoundsSerializer();
+ private static final AbstractBoundsSerializer serializer = new AbstractBoundsSerializer();
public static AbstractBoundsSerializer serializer()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/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 bc77687..3a1f631 100644
--- a/src/java/org/apache/cassandra/gms/EndpointState.java
+++ b/src/java/org/apache/cassandra/gms/EndpointState.java
@@ -34,7 +34,7 @@ import org.cliffc.high_scale_lib.NonBlockingHashMap;
public class EndpointState
{
- protected static Logger logger = LoggerFactory.getLogger(EndpointState.class);
+ protected static final Logger logger = LoggerFactory.getLogger(EndpointState.class);
private final static IVersionedSerializer<EndpointState> serializer = new EndpointStateSerializer();
@@ -116,7 +116,7 @@ public class EndpointState
class EndpointStateSerializer implements IVersionedSerializer<EndpointState>
{
- private static Logger logger = LoggerFactory.getLogger(EndpointStateSerializer.class);
+ private static final Logger logger = LoggerFactory.getLogger(EndpointStateSerializer.class);
public void serialize(EndpointState epState, DataOutput dos, int version) throws IOException
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/gms/FailureDetector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/FailureDetector.java b/src/java/org/apache/cassandra/gms/FailureDetector.java
index 00a4e55..b5a5c4c 100644
--- a/src/java/org/apache/cassandra/gms/FailureDetector.java
+++ b/src/java/org/apache/cassandra/gms/FailureDetector.java
@@ -46,11 +46,11 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
private static final int SAMPLE_SIZE = 1000;
public static final IFailureDetector instance = new FailureDetector();
- private static Logger logger = LoggerFactory.getLogger(FailureDetector.class);
+ private static final Logger logger = LoggerFactory.getLogger(FailureDetector.class);
private static int phiConvictThreshold;
- private Map<InetAddress, ArrivalWindow> arrivalSamples = new Hashtable<InetAddress, ArrivalWindow>();
- private List<IFailureDetectionEventListener> fdEvntListeners = new CopyOnWriteArrayList<IFailureDetectionEventListener>();
+ private final Map<InetAddress, ArrivalWindow> arrivalSamples = new Hashtable<InetAddress, ArrivalWindow>();
+ private final List<IFailureDetectionEventListener> fdEvntListeners = new CopyOnWriteArrayList<IFailureDetectionEventListener>();
public FailureDetector()
{
@@ -234,9 +234,9 @@ public class FailureDetector implements IFailureDetector, FailureDetectorMBean
class ArrivalWindow
{
- private static Logger logger = LoggerFactory.getLogger(ArrivalWindow.class);
+ private static final Logger logger = LoggerFactory.getLogger(ArrivalWindow.class);
private double tLast = 0L;
- private BoundedStatsDeque arrivalIntervals;
+ private final BoundedStatsDeque arrivalIntervals;
// this is useless except to provide backwards compatibility in phi_convict_threshold,
// because everyone seems pretty accustomed to the default of 8, and users who have
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/gms/GossipDigest.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/GossipDigest.java b/src/java/org/apache/cassandra/gms/GossipDigest.java
index 09eb399..26a54dc 100644
--- a/src/java/org/apache/cassandra/gms/GossipDigest.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigest.java
@@ -30,15 +30,15 @@ import org.apache.cassandra.net.CompactEndpointSerializationHelper;
public class GossipDigest implements Comparable<GossipDigest>
{
- private static IVersionedSerializer<GossipDigest> serializer;
+ private static final IVersionedSerializer<GossipDigest> serializer;
static
{
serializer = new GossipDigestSerializer();
}
- InetAddress endpoint;
- int generation;
- int maxVersion;
+ final InetAddress endpoint;
+ final int generation;
+ final int maxVersion;
public static IVersionedSerializer<GossipDigest> serializer()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/gms/GossipDigestAck2Message.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/GossipDigestAck2Message.java b/src/java/org/apache/cassandra/gms/GossipDigestAck2Message.java
index 260cdcc..ae2faff 100644
--- a/src/java/org/apache/cassandra/gms/GossipDigestAck2Message.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigestAck2Message.java
@@ -31,13 +31,13 @@ import org.apache.cassandra.io.IVersionedSerializer;
class GossipDigestAck2Message
{
- private static IVersionedSerializer<GossipDigestAck2Message> serializer;
+ private static final IVersionedSerializer<GossipDigestAck2Message> serializer;
static
{
serializer = new GossipDigestAck2MessageSerializer();
}
- Map<InetAddress, EndpointState> epStateMap;
+ final Map<InetAddress, EndpointState> epStateMap;
public static IVersionedSerializer<GossipDigestAck2Message> serializer()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java b/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
index d674741..a4f1f09 100644
--- a/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigestAck2VerbHandler.java
@@ -31,7 +31,7 @@ import org.apache.cassandra.net.Message;
public class GossipDigestAck2VerbHandler implements IVerbHandler
{
- private static Logger logger = LoggerFactory.getLogger(GossipDigestAck2VerbHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(GossipDigestAck2VerbHandler.class);
public void doVerb(Message message, String id)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/gms/GossipDigestAckMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/GossipDigestAckMessage.java b/src/java/org/apache/cassandra/gms/GossipDigestAckMessage.java
index de22794..3e07931 100644
--- a/src/java/org/apache/cassandra/gms/GossipDigestAckMessage.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigestAckMessage.java
@@ -33,14 +33,14 @@ import org.apache.cassandra.io.IVersionedSerializer;
class GossipDigestAckMessage
{
- private static IVersionedSerializer<GossipDigestAckMessage> serializer;
+ private static final IVersionedSerializer<GossipDigestAckMessage> serializer;
static
{
serializer = new GossipDigestAckMessageSerializer();
}
- List<GossipDigest> gDigestList;
- Map<InetAddress, EndpointState> epStateMap;
+ final List<GossipDigest> gDigestList;
+ final Map<InetAddress, EndpointState> epStateMap;
static IVersionedSerializer<GossipDigestAckMessage> serializer()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java b/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java
index 3d7439c..54d9233 100644
--- a/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigestAckVerbHandler.java
@@ -34,7 +34,7 @@ import org.apache.cassandra.net.MessagingService;
public class GossipDigestAckVerbHandler implements IVerbHandler
{
- private static Logger logger = LoggerFactory.getLogger(GossipDigestAckVerbHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(GossipDigestAckVerbHandler.class);
public void doVerb(Message message, String id)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java b/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java
index 54ae4e7..219394e 100644
--- a/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigestSynMessage.java
@@ -36,14 +36,14 @@ import org.apache.cassandra.net.CompactEndpointSerializationHelper;
class GossipDigestSynMessage
{
- private static IVersionedSerializer<GossipDigestSynMessage> serializer;
+ private static final IVersionedSerializer<GossipDigestSynMessage> serializer;
static
{
serializer = new GossipDigestSynMessageSerializer();
}
- String clusterId;
- List<GossipDigest> gDigests = new ArrayList<GossipDigest>();
+ final String clusterId;
+ final List<GossipDigest> gDigests;
public static IVersionedSerializer<GossipDigestSynMessage> serializer()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java b/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java
index 58331f8..8230482 100644
--- a/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java
+++ b/src/java/org/apache/cassandra/gms/GossipDigestSynVerbHandler.java
@@ -33,7 +33,7 @@ import org.apache.cassandra.net.MessagingService;
public class GossipDigestSynVerbHandler implements IVerbHandler
{
- private static Logger logger = LoggerFactory.getLogger( GossipDigestSynVerbHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger( GossipDigestSynVerbHandler.class);
public void doVerb(Message message, String id)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/gms/Gossiper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/Gossiper.java b/src/java/org/apache/cassandra/gms/Gossiper.java
index b166dd2..d04b054 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -68,13 +68,13 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
private ScheduledFuture<?> scheduledGossipTask;
public final static int intervalInMillis = 1000;
public final static int QUARANTINE_DELAY = StorageService.RING_DELAY * 2;
- private static Logger logger = LoggerFactory.getLogger(Gossiper.class);
+ private static final Logger logger = LoggerFactory.getLogger(Gossiper.class);
public static final Gossiper instance = new Gossiper();
public static final long aVeryLongTime = 259200 * 1000; // 3 days
private long FatClientTimeout;
- private Random random = new Random();
- private Comparator<InetAddress> inetcomparator = new Comparator<InetAddress>()
+ private final Random random = new Random();
+ private final Comparator<InetAddress> inetcomparator = new Comparator<InetAddress>()
{
public int compare(InetAddress addr1, InetAddress addr2)
{
@@ -83,27 +83,27 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
};
/* subscribers for interest in EndpointState change */
- private List<IEndpointStateChangeSubscriber> subscribers = new CopyOnWriteArrayList<IEndpointStateChangeSubscriber>();
+ private final List<IEndpointStateChangeSubscriber> subscribers = new CopyOnWriteArrayList<IEndpointStateChangeSubscriber>();
/* live member set */
- private Set<InetAddress> liveEndpoints = new ConcurrentSkipListSet<InetAddress>(inetcomparator);
+ private final Set<InetAddress> liveEndpoints = new ConcurrentSkipListSet<InetAddress>(inetcomparator);
/* unreachable member set */
- private Map<InetAddress, Long> unreachableEndpoints = new ConcurrentHashMap<InetAddress, Long>();
+ private final Map<InetAddress, Long> unreachableEndpoints = new ConcurrentHashMap<InetAddress, Long>();
/* initial seeds for joining the cluster */
- private Set<InetAddress> seeds = new ConcurrentSkipListSet<InetAddress>(inetcomparator);
+ private final Set<InetAddress> seeds = new ConcurrentSkipListSet<InetAddress>(inetcomparator);
/* map where key is the endpoint and value is the state associated with the endpoint */
- Map<InetAddress, EndpointState> endpointStateMap = new ConcurrentHashMap<InetAddress, EndpointState>();
+ final Map<InetAddress, EndpointState> endpointStateMap = new ConcurrentHashMap<InetAddress, EndpointState>();
/* map where key is endpoint and value is timestamp when this endpoint was removed from
* gossip. We will ignore any gossip regarding these endpoints for QUARANTINE_DELAY time
* after removal to prevent nodes from falsely reincarnating during the time when removal
* gossip gets propagated to all nodes */
- private Map<InetAddress, Long> justRemovedEndpoints = new ConcurrentHashMap<InetAddress, Long>();
+ private final Map<InetAddress, Long> justRemovedEndpoints = new ConcurrentHashMap<InetAddress, Long>();
- private Map<InetAddress, Long> expireTimeEndpointMap = new ConcurrentHashMap<InetAddress, Long>();
+ private final Map<InetAddress, Long> expireTimeEndpointMap = new ConcurrentHashMap<InetAddress, Long>();
// protocol versions of the other nodes in the cluster
private final ConcurrentMap<InetAddress, Integer> versions = new NonBlockingHashMap<InetAddress, Integer>();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/gms/HeartBeatState.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/HeartBeatState.java b/src/java/org/apache/cassandra/gms/HeartBeatState.java
index b959f27..9f0de57 100644
--- a/src/java/org/apache/cassandra/gms/HeartBeatState.java
+++ b/src/java/org/apache/cassandra/gms/HeartBeatState.java
@@ -28,7 +28,7 @@ import org.apache.cassandra.io.IVersionedSerializer;
class HeartBeatState
{
- private static IVersionedSerializer<HeartBeatState> serializer;
+ private static final IVersionedSerializer<HeartBeatState> serializer;
static
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/gms/PureRandom.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/PureRandom.java b/src/java/org/apache/cassandra/gms/PureRandom.java
index ec10dde..37580dc 100644
--- a/src/java/org/apache/cassandra/gms/PureRandom.java
+++ b/src/java/org/apache/cassandra/gms/PureRandom.java
@@ -29,7 +29,7 @@ import java.util.Random;
class PureRandom extends Random
{
- private BitSet bs = new BitSet();
+ private final BitSet bs = new BitSet();
private int lastUb;
PureRandom()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/gms/VersionGenerator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/VersionGenerator.java b/src/java/org/apache/cassandra/gms/VersionGenerator.java
index c273f9d..5a645a8 100644
--- a/src/java/org/apache/cassandra/gms/VersionGenerator.java
+++ b/src/java/org/apache/cassandra/gms/VersionGenerator.java
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
public class VersionGenerator
{
- private static AtomicInteger version = new AtomicInteger(0);
+ private static final AtomicInteger version = new AtomicInteger(0);
public static int getNextVersion()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/gms/VersionedValue.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/VersionedValue.java b/src/java/org/apache/cassandra/gms/VersionedValue.java
index f2196ed..aab26be 100644
--- a/src/java/org/apache/cassandra/gms/VersionedValue.java
+++ b/src/java/org/apache/cassandra/gms/VersionedValue.java
@@ -90,7 +90,7 @@ public class VersionedValue implements Comparable<VersionedValue>
public static class VersionedValueFactory
{
- IPartitioner partitioner;
+ final IPartitioner partitioner;
public VersionedValueFactory(IPartitioner partitioner)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java b/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
index 79b1c85..c18acdf 100644
--- a/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
@@ -53,7 +53,7 @@ implements org.apache.hadoop.mapred.RecordWriter<ByteBuffer,List<Mutation>>
private final Configuration conf;
private SSTableSimpleUnsortedWriter writer;
private SSTableLoader loader;
- private File outputdir;
+ private final File outputdir;
private enum CFType
{
@@ -200,8 +200,8 @@ implements org.apache.hadoop.mapred.RecordWriter<ByteBuffer,List<Mutation>>
static class ExternalClient extends SSTableLoader.Client
{
private final Map<String, Set<String>> knownCfs = new HashMap<String, Set<String>>();
- private String hostlist;
- private int rpcPort;
+ private final String hostlist;
+ private final int rpcPort;
public ExternalClient(String hostlist, int port)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/5a6e2b0e/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
index 9369cbf..5134aa2 100644
--- a/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
+++ b/src/java/org/apache/cassandra/io/compress/CompressedSequentialWriter.java
@@ -51,7 +51,7 @@ public class CompressedSequentialWriter extends SequentialWriter
private long originalSize = 0, compressedSize = 0;
- private Collector sstableMetadataCollector;
+ private final Collector sstableMetadataCollector;
public CompressedSequentialWriter(File file, String indexFilePath, boolean skipIOCache, CompressionParameters parameters, Collector sstableMetadataCollector) throws IOException
{
@@ -198,12 +198,12 @@ public class CompressedSequentialWriter extends SequentialWriter
protected static class CompressedFileWriterMark implements FileMark
{
// chunk offset in the compressed file
- long chunkOffset;
+ final long chunkOffset;
// uncompressed data offset (real data offset)
- long uncDataOffset;
+ final long uncDataOffset;
- int bufferOffset;
- int nextChunkIndex;
+ final int bufferOffset;
+ final int nextChunkIndex;
public CompressedFileWriterMark(long chunkOffset, long uncDataOffset, int bufferOffset, int nextChunkIndex)
{