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
[24/28] git commit: [3649] Remove tabulations
[3649] Remove tabulations
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/686139af
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/686139af
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/686139af
Branch: refs/heads/trunk
Commit: 686139af7952c985431604abbe41ded6f8b40f07
Parents: 910b663
Author: Sylvain Lebresne <sy...@datastax.com>
Authored: Fri Feb 24 13:52:47 2012 +0100
Committer: Sylvain Lebresne <sy...@datastax.com>
Committed: Mon Feb 27 11:00:09 2012 +0100
----------------------------------------------------------------------
.../apache/cassandra/cache/SerializingCache.java | 2 +-
src/java/org/apache/cassandra/cli/CliClient.java | 22 +++---
src/java/org/apache/cassandra/cli/CliMain.java | 2 +-
src/java/org/apache/cassandra/cli/CliOptions.java | 6 +-
.../JMXConfigurableThreadPoolExecutor.java | 6 +-
.../cassandra/config/DatabaseDescriptor.java | 2 +-
.../org/apache/cassandra/db/ColumnIndexer.java | 13 ++--
src/java/org/apache/cassandra/db/DBConstants.java | 10 ++--
.../apache/cassandra/db/HintedHandOffManager.java | 2 +-
src/java/org/apache/cassandra/db/ReadResponse.java | 40 ++++++------
src/java/org/apache/cassandra/db/SuperColumn.java | 52 +++++++-------
.../org/apache/cassandra/db/TruncateResponse.java | 13 ++--
.../org/apache/cassandra/db/WriteResponse.java | 41 ++++++------
.../org/apache/cassandra/dht/IPartitioner.java | 8 +-
.../apache/cassandra/dht/RandomPartitioner.java | 2 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 38 +++++-----
src/java/org/apache/cassandra/gms/PureRandom.java | 10 ++--
.../org/apache/cassandra/gms/VersionedValue.java | 4 +-
.../apache/cassandra/hadoop/BulkRecordWriter.java | 6 +-
.../cassandra/hadoop/ColumnFamilyInputFormat.java | 6 +-
.../org/apache/cassandra/hadoop/ConfigHelper.java | 8 +-
.../apache/cassandra/io/sstable/IndexHelper.java | 8 +-
.../org/apache/cassandra/io/util/FileUtils.java | 4 +-
.../org/apache/cassandra/net/IAsyncCallback.java | 8 +-
src/java/org/apache/cassandra/net/Message.java | 10 ++--
.../org/apache/cassandra/net/MessagingService.java | 4 +-
.../cassandra/service/AntiEntropyService.java | 4 +-
.../cassandra/service/DatacenterReadCallback.java | 6 +-
.../DatacenterSyncWriteResponseHandler.java | 4 +-
.../cassandra/service/IResponseResolver.java | 22 +++---
.../cassandra/service/RowDigestResolver.java | 8 +-
.../cassandra/service/RowRepairResolver.java | 2 +-
.../apache/cassandra/streaming/StreamReply.java | 2 +-
.../cassandra/streaming/StreamRequestMessage.java | 2 +-
.../apache/cassandra/thrift/CassandraServer.java | 6 +-
src/java/org/apache/cassandra/tools/NodeCmd.java | 2 +-
src/java/org/apache/cassandra/tools/NodeProbe.java | 2 +-
.../apache/cassandra/utils/BloomCalculations.java | 20 +++---
.../org/apache/cassandra/utils/GuidGenerator.java | 8 +-
.../org/apache/cassandra/utils/MurmurHash.java | 6 +-
40 files changed, 211 insertions(+), 210 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/cache/SerializingCache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/SerializingCache.java b/src/java/org/apache/cassandra/cache/SerializingCache.java
index b9506ac..5ccfd31 100644
--- a/src/java/org/apache/cassandra/cache/SerializingCache.java
+++ b/src/java/org/apache/cassandra/cache/SerializingCache.java
@@ -84,7 +84,7 @@ public class SerializingCache<K, V> implements ICache<K, V>
};
}
- private V deserialize(FreeableMemory mem)
+ private V deserialize(FreeableMemory mem)
{
try
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 02c97f6..99d7ac6 100644
--- a/src/java/org/apache/cassandra/cli/CliClient.java
+++ b/src/java/org/apache/cassandra/cli/CliClient.java
@@ -1824,7 +1824,7 @@ public class CliClient
*/
private boolean hasKeySpace()
{
- if (keySpace == null)
+ if (keySpace == null)
{
sessionState.out.println("Not authenticated to a working keyspace.");
return false;
@@ -1881,23 +1881,23 @@ public class CliClient
try
{
- AuthenticationRequest authRequest;
- Map<String, String> credentials = new HashMap<String, String>();
+ AuthenticationRequest authRequest;
+ Map<String, String> credentials = new HashMap<String, String>();
keySpaceName = CliCompiler.getKeySpace(keySpaceName, thriftClient.describe_keyspaces());
thriftClient.set_keyspace(keySpaceName);
- if (username != null && password != null)
- {
- /* remove quotes */
- password = password.replace("\'", "");
- credentials.put(IAuthenticator.USERNAME_KEY, username);
+ if (username != null && password != null)
+ {
+ /* remove quotes */
+ password = password.replace("\'", "");
+ credentials.put(IAuthenticator.USERNAME_KEY, username);
credentials.put(IAuthenticator.PASSWORD_KEY, password);
authRequest = new AuthenticationRequest(credentials);
thriftClient.login(authRequest);
- }
-
+ }
+
keySpace = keySpaceName;
this.username = username != null ? username : "default";
@@ -1907,7 +1907,7 @@ public class CliClient
catch (AuthenticationException e)
{
sessionState.err.println("Exception during authentication to the cassandra node: " +
- "verify keyspace exists, and you are using correct credentials.");
+ "verify keyspace exists, and you are using correct credentials.");
}
catch (AuthorizationException e)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 5d2e633..b25ca97 100644
--- a/src/java/org/apache/cassandra/cli/CliMain.java
+++ b/src/java/org/apache/cassandra/cli/CliMain.java
@@ -105,7 +105,7 @@ public class CliMain
{
thriftClient = null;
sessionState.err.println("Exception during authentication to the cassandra node, " +
- "Verify the keyspace exists, and that you are using the correct credentials.");
+ "Verify the keyspace exists, and that you are using the correct credentials.");
return;
}
catch (AuthorizationException e)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 c582728..e6b9026 100644
--- a/src/java/org/apache/cassandra/cli/CliOptions.java
+++ b/src/java/org/apache/cassandra/cli/CliOptions.java
@@ -120,7 +120,7 @@ public class CliOptions
// Look for authentication credentials (username and password)
if (cmd.hasOption(USERNAME_OPTION))
{
- css.username = cmd.getOptionValue(USERNAME_OPTION);
+ css.username = cmd.getOptionValue(USERNAME_OPTION);
}
else
{
@@ -129,7 +129,7 @@ public class CliOptions
if (cmd.hasOption(PASSWORD_OPTION))
{
- css.password = cmd.getOptionValue(PASSWORD_OPTION);
+ css.password = cmd.getOptionValue(PASSWORD_OPTION);
}
else
{
@@ -139,7 +139,7 @@ public class CliOptions
// Look for keyspace
if (cmd.hasOption(KEYSPACE_OPTION))
{
- css.keyspace = cmd.getOptionValue(KEYSPACE_OPTION);
+ css.keyspace = cmd.getOptionValue(KEYSPACE_OPTION);
}
if (cmd.hasOption(BATCH_OPTION))
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/concurrent/JMXConfigurableThreadPoolExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/JMXConfigurableThreadPoolExecutor.java b/src/java/org/apache/cassandra/concurrent/JMXConfigurableThreadPoolExecutor.java
index dbcd641..82075f3 100644
--- a/src/java/org/apache/cassandra/concurrent/JMXConfigurableThreadPoolExecutor.java
+++ b/src/java/org/apache/cassandra/concurrent/JMXConfigurableThreadPoolExecutor.java
@@ -25,8 +25,8 @@ public class JMXConfigurableThreadPoolExecutor extends JMXEnabledThreadPoolExecu
{
public JMXConfigurableThreadPoolExecutor(int corePoolSize,
- long keepAliveTime,
- TimeUnit unit,
+ long keepAliveTime,
+ TimeUnit unit,
BlockingQueue<Runnable> workQueue,
NamedThreadFactory threadFactory,
String jmxPath)
@@ -34,4 +34,4 @@ public class JMXConfigurableThreadPoolExecutor extends JMXEnabledThreadPoolExecu
super(corePoolSize, keepAliveTime, unit, workQueue, threadFactory, jmxPath);
}
-}
\ No newline at end of file
+}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 20a5466..2932c9e 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -635,7 +635,7 @@ public class DatabaseDescriptor
public static int getColumnIndexSize()
{
- return conf.column_index_size_in_kb * 1024;
+ return conf.column_index_size_in_kb * 1024;
}
public static String getInitialToken()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/db/ColumnIndexer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnIndexer.java b/src/java/org/apache/cassandra/db/ColumnIndexer.java
index 956ca35..420ca05 100644
--- a/src/java/org/apache/cassandra/db/ColumnIndexer.java
+++ b/src/java/org/apache/cassandra/db/ColumnIndexer.java
@@ -31,19 +31,18 @@ import org.apache.cassandra.io.util.DataOutputBuffer;
import org.apache.cassandra.io.util.IIterableColumns;
import org.apache.cassandra.utils.BloomFilter;
-
/**
* Help to create an index for a column family based on size of columns
*/
public class ColumnIndexer
{
- /**
- * Given a column family this, function creates an in-memory structure that represents the
- * column index for the column family, and subsequently writes it to disk.
+ /**
+ * Given a column family this, function creates an in-memory structure that represents the
+ * column index for the column family, and subsequently writes it to disk.
*
- * @param columns Column family to create index for
- * @param dos data output stream
- */
+ * @param columns Column family to create index for
+ * @param dos data output stream
+ */
public static void serialize(IIterableColumns columns, DataOutput dos)
{
try
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/db/DBConstants.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/DBConstants.java b/src/java/org/apache/cassandra/db/DBConstants.java
index 4709df7..047bea2 100644
--- a/src/java/org/apache/cassandra/db/DBConstants.java
+++ b/src/java/org/apache/cassandra/db/DBConstants.java
@@ -20,9 +20,9 @@ package org.apache.cassandra.db;
public class DBConstants
{
- public static final int boolSize = 1;
- public static final int intSize = 4;
- public static final int longSize = 8;
- public static final int shortSize = 2;
- public static final int tsSize = 8;
+ public static final int boolSize = 1;
+ public static final int intSize = 4;
+ public static final int longSize = 8;
+ public static final int shortSize = 2;
+ public static final int tsSize = 8;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/db/HintedHandOffManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/HintedHandOffManager.java b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
index 88c66ca..809cf3b 100644
--- a/src/java/org/apache/cassandra/db/HintedHandOffManager.java
+++ b/src/java/org/apache/cassandra/db/HintedHandOffManager.java
@@ -426,7 +426,7 @@ public class HintedHandOffManager implements HintedHandOffManagerMBean
deliverHintsToEndpoint(to);
}
};
- executor.execute(r);
+ executor.execute(r);
}
public void scheduleHintDelivery(String to) throws UnknownHostException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 242426d..ba2d4fc 100644
--- a/src/java/org/apache/cassandra/db/ReadResponse.java
+++ b/src/java/org/apache/cassandra/db/ReadResponse.java
@@ -44,44 +44,44 @@ private static IVersionedSerializer<ReadResponse> serializer;
{
return serializer;
}
-
- private final Row row;
- private final ByteBuffer digest;
- public ReadResponse(ByteBuffer digest)
+ private final Row row;
+ private final ByteBuffer digest;
+
+ public ReadResponse(ByteBuffer digest)
{
assert digest != null;
- this.digest= digest;
+ this.digest= digest;
this.row = null;
- }
+ }
- public ReadResponse(Row row)
+ public ReadResponse(Row row)
{
assert row != null;
- this.row = row;
+ this.row = row;
this.digest = null;
- }
+ }
- public Row row()
+ public Row row()
{
- return row;
+ return row;
}
-
- public ByteBuffer digest()
+
+ public ByteBuffer digest()
{
- return digest;
- }
+ return digest;
+ }
- public boolean isDigestQuery()
+ public boolean isDigestQuery()
{
- return digest != null;
+ return digest != null;
}
}
class ReadResponseSerializer implements IVersionedSerializer<ReadResponse>
{
- public void serialize(ReadResponse response, DataOutput dos, int version) throws IOException
- {
+ public void serialize(ReadResponse response, DataOutput dos, int version) throws IOException
+ {
dos.writeInt(response.isDigestQuery() ? response.digest().remaining() : 0);
ByteBuffer buffer = response.isDigestQuery() ? response.digest() : ByteBufferUtil.EMPTY_BYTE_BUFFER;
ByteBufferUtil.write(buffer, dos);
@@ -89,7 +89,7 @@ class ReadResponseSerializer implements IVersionedSerializer<ReadResponse>
if (!response.isDigestQuery())
Row.serializer().serialize(response.row(), dos, version);
}
-
+
public ReadResponse deserialize(DataInput dis, int version) throws IOException
{
byte[] digest = null;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 67d1d71..e455a94 100644
--- a/src/java/org/apache/cassandra/db/SuperColumn.java
+++ b/src/java/org/apache/cassandra/db/SuperColumn.java
@@ -119,16 +119,16 @@ public class SuperColumn extends AbstractColumnContainer implements IColumn
*/
public int serializedSize()
{
- /*
- * We need to keep the way we are calculating the column size in sync with the
- * way we are calculating the size for the column family serializer.
- */
- return DBConstants.shortSize + name.remaining() + DBConstants.intSize + DBConstants.longSize + DBConstants.intSize + size();
+ /*
+ * We need to keep the way we are calculating the column size in sync with the
+ * way we are calculating the size for the column family serializer.
+ */
+ return DBConstants.shortSize + name.remaining() + DBConstants.intSize + DBConstants.longSize + DBConstants.intSize + size();
}
public long timestamp()
{
- throw new UnsupportedOperationException("This operation is not supported for Super Columns.");
+ throw new UnsupportedOperationException("This operation is not supported for Super Columns.");
}
public long maxTimestamp()
@@ -167,7 +167,7 @@ public class SuperColumn extends AbstractColumnContainer implements IColumn
public ByteBuffer value()
{
- throw new UnsupportedOperationException("This operation is not supported for Super Columns.");
+ throw new UnsupportedOperationException("This operation is not supported for Super Columns.");
}
@Override
@@ -185,14 +185,14 @@ public class SuperColumn extends AbstractColumnContainer implements IColumn
{
for (IColumn subColumn : column.getSubColumns())
{
- addColumn(subColumn, allocator);
+ addColumn(subColumn, allocator);
}
delete(column);
}
public IColumn diff(IColumn columnNew)
{
- IColumn columnDiff = new SuperColumn(columnNew.name(), ((SuperColumn)columnNew).getComparator());
+ IColumn columnDiff = new SuperColumn(columnNew.name(), ((SuperColumn)columnNew).getComparator());
if (columnNew.getMarkedForDeleteAt() > getMarkedForDeleteAt())
{
((SuperColumn)columnDiff).delete(columnNew.getLocalDeletionTime(), columnNew.getMarkedForDeleteAt());
@@ -203,25 +203,25 @@ public class SuperColumn extends AbstractColumnContainer implements IColumn
// takes care of those for us.)
for (IColumn subColumn : columnNew.getSubColumns())
{
- IColumn columnInternal = columns.getColumn(subColumn.name());
- if(columnInternal == null )
- {
- columnDiff.addColumn(subColumn);
- }
- else
- {
- IColumn subColumnDiff = columnInternal.diff(subColumn);
- if(subColumnDiff != null)
- {
- columnDiff.addColumn(subColumnDiff);
- }
- }
+ IColumn columnInternal = columns.getColumn(subColumn.name());
+ if(columnInternal == null )
+ {
+ columnDiff.addColumn(subColumn);
+ }
+ else
+ {
+ IColumn subColumnDiff = columnInternal.diff(subColumn);
+ if(subColumnDiff != null)
+ {
+ columnDiff.addColumn(subColumnDiff);
+ }
+ }
}
if (!columnDiff.getSubColumns().isEmpty() || columnNew.isMarkedForDelete())
- return columnDiff;
+ return columnDiff;
else
- return null;
+ return null;
}
public void updateDigest(MessageDigest digest)
@@ -246,9 +246,9 @@ public class SuperColumn extends AbstractColumnContainer implements IColumn
public String getString(AbstractType<?> comparator)
{
- StringBuilder sb = new StringBuilder();
+ StringBuilder sb = new StringBuilder();
sb.append("SuperColumn(");
- sb.append(comparator.getString(name));
+ sb.append(comparator.getString(name));
if (isMarkedForDelete()) {
sb.append(" -delete at ").append(getMarkedForDeleteAt()).append("-");
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 507bac6..0d5c2c6 100644
--- a/src/java/org/apache/cassandra/db/TruncateResponse.java
+++ b/src/java/org/apache/cassandra/db/TruncateResponse.java
@@ -47,17 +47,18 @@ public class TruncateResponse
public static Message makeTruncateResponseMessage(Message original, TruncateResponse truncateResponseMessage)
throws IOException
{
- FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
+ FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
TruncateResponse.serializer().serialize(truncateResponseMessage, dos, original.getVersion());
return original.getReply(FBUtilities.getBroadcastAddress(), bos.toByteArray(), original.getVersion());
}
- public TruncateResponse(String keyspace, String columnFamily, boolean success) {
- this.keyspace = keyspace;
- this.columnFamily = columnFamily;
- this.success = success;
- }
+ public TruncateResponse(String keyspace, String columnFamily, boolean success)
+ {
+ this.keyspace = keyspace;
+ this.columnFamily = columnFamily;
+ this.success = success;
+ }
public static class TruncateResponseSerializer implements IVersionedSerializer<TruncateResponse>
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 7b63770..1acc8c2 100644
--- a/src/java/org/apache/cassandra/db/WriteResponse.java
+++ b/src/java/org/apache/cassandra/db/WriteResponse.java
@@ -49,30 +49,31 @@ public class WriteResponse
return original.getReply(FBUtilities.getBroadcastAddress(), bytes, original.getVersion());
}
- private final String table;
- private final ByteBuffer key;
- private final boolean status;
+ private final String table;
+ private final ByteBuffer key;
+ private final boolean status;
- public WriteResponse(String table, ByteBuffer key, boolean bVal) {
- this.table = table;
- this.key = key;
- this.status = bVal;
- }
+ public WriteResponse(String table, ByteBuffer key, boolean bVal)
+ {
+ this.table = table;
+ this.key = key;
+ this.status = bVal;
+ }
- public String table()
- {
- return table;
- }
+ public String table()
+ {
+ return table;
+ }
- public ByteBuffer key()
- {
- return key;
- }
+ public ByteBuffer key()
+ {
+ return key;
+ }
- public boolean isSuccess()
- {
- return status;
- }
+ public boolean isSuccess()
+ {
+ return status;
+ }
public static class WriteResponseSerializer implements IVersionedSerializer<WriteResponse>
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/dht/IPartitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/IPartitioner.java b/src/java/org/apache/cassandra/dht/IPartitioner.java
index aaa75fa..c0c6ad4 100644
--- a/src/java/org/apache/cassandra/dht/IPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/IPartitioner.java
@@ -51,10 +51,10 @@ public interface IPartitioner<T extends Token>
*/
public Token midpoint(Token left, Token right);
- /**
- * @return The minimum possible Token in the range that is being partitioned.
- */
- public T getMinimumToken();
+ /**
+ * @return The minimum possible Token in the range that is being partitioned.
+ */
+ public T getMinimumToken();
/**
* @return a Token that can be used to route a given key
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/dht/RandomPartitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/RandomPartitioner.java b/src/java/org/apache/cassandra/dht/RandomPartitioner.java
index c4c9091..ff17186 100644
--- a/src/java/org/apache/cassandra/dht/RandomPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/RandomPartitioner.java
@@ -86,7 +86,7 @@ public class RandomPartitioner extends AbstractPartitioner<BigIntegerToken>
return new BigIntegerToken(midpair.left);
}
- public BigIntegerToken getMinimumToken()
+ public BigIntegerToken getMinimumToken()
{
return MINIMUM;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 08184a1..9ff5c3b 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -498,7 +498,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
public int getCurrentGenerationNumber(InetAddress endpoint)
{
- return endpointStateMap.get(endpoint).getHeartBeatState().getGeneration();
+ return endpointStateMap.get(endpoint).getHeartBeatState().getGeneration();
}
Message makeGossipDigestSynMessage(List<GossipDigest> gDigests, int version) throws IOException
@@ -512,7 +512,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
Message makeGossipDigestAckMessage(GossipDigestAckMessage gDigestAckMessage, int version) throws IOException
{
- FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
+ FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
GossipDigestAckMessage.serializer().serialize(gDigestAckMessage, dos, version);
return new Message(FBUtilities.getBroadcastAddress(), StorageService.Verb.GOSSIP_DIGEST_ACK, bos.toByteArray(), version);
@@ -520,7 +520,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
Message makeGossipDigestAck2Message(GossipDigestAck2Message gDigestAck2Message, int version) throws IOException
{
- FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
+ FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
GossipDigestAck2Message.serializer().serialize(gDigestAck2Message, dos, version);
return new Message(FBUtilities.getBroadcastAddress(), StorageService.Verb.GOSSIP_DIGEST_ACK2, bos.toByteArray(), version);
@@ -890,33 +890,33 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
*/
if ( localEpStatePtr != null )
{
- int localGeneration = localEpStatePtr.getHeartBeatState().getGeneration();
- int remoteGeneration = remoteState.getHeartBeatState().getGeneration();
+ int localGeneration = localEpStatePtr.getHeartBeatState().getGeneration();
+ int remoteGeneration = remoteState.getHeartBeatState().getGeneration();
if (logger.isTraceEnabled())
logger.trace(ep + "local generation " + localGeneration + ", remote generation " + remoteGeneration);
- if (remoteGeneration > localGeneration)
- {
+ if (remoteGeneration > localGeneration)
+ {
if (logger.isTraceEnabled())
logger.trace("Updating heartbeat state generation to " + remoteGeneration + " from " + localGeneration + " for " + ep);
// major state change will handle the update by inserting the remote state directly
handleMajorStateChange(ep, remoteState);
- }
- else if ( remoteGeneration == localGeneration ) // generation has not changed, apply new states
- {
- /* find maximum state */
- int localMaxVersion = getMaxEndpointStateVersion(localEpStatePtr);
- int remoteMaxVersion = getMaxEndpointStateVersion(remoteState);
- if ( remoteMaxVersion > localMaxVersion )
- {
+ }
+ else if ( remoteGeneration == localGeneration ) // generation has not changed, apply new states
+ {
+ /* find maximum state */
+ int localMaxVersion = getMaxEndpointStateVersion(localEpStatePtr);
+ int remoteMaxVersion = getMaxEndpointStateVersion(remoteState);
+ if ( remoteMaxVersion > localMaxVersion )
+ {
// apply states, but do not notify since there is no major change
- applyNewStates(ep, localEpStatePtr, remoteState);
- }
+ applyNewStates(ep, localEpStatePtr, remoteState);
+ }
else if (logger.isTraceEnabled())
logger.trace("Ignoring remote version " + remoteMaxVersion + " <= " + localMaxVersion + " for " + ep);
if (!localEpStatePtr.isAlive() && !isDeadState(localEpStatePtr)) // unless of course, it was dead
markAlive(ep, localEpStatePtr);
- }
+ }
else
{
if (logger.isTraceEnabled())
@@ -927,7 +927,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
{
// this is a new node, report it to the FD in case it is the first time we are seeing it AND it's not alive
FailureDetector.instance.report(ep);
- handleMajorStateChange(ep, remoteState);
+ handleMajorStateChange(ep, remoteState);
}
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 e29304b..6efa39d 100644
--- a/src/java/org/apache/cassandra/gms/PureRandom.java
+++ b/src/java/org/apache/cassandra/gms/PureRandom.java
@@ -40,8 +40,8 @@ class PureRandom extends Random
public int nextInt(int ub)
{
- if (ub <= 0)
- throw new IllegalArgumentException("ub must be positive");
+ if (ub <= 0)
+ throw new IllegalArgumentException("ub must be positive");
if (lastUb != ub)
{
@@ -50,7 +50,7 @@ class PureRandom extends Random
}
else if(bs.cardinality() == ub)
{
- bs.clear();
+ bs.clear();
}
int value = super.nextInt(ub);
@@ -64,8 +64,8 @@ class PureRandom extends Random
public static void main(String[] args) throws Throwable
{
- Random pr = new PureRandom();
- int ubs[] = new int[] { 2, 3, 1, 10, 5, 0};
+ Random pr = new PureRandom();
+ int ubs[] = new int[]{ 2, 3, 1, 10, 5, 0 };
for (int ub : ubs)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 d4eca8e..e6a6727 100644
--- a/src/java/org/apache/cassandra/gms/VersionedValue.java
+++ b/src/java/org/apache/cassandra/gms/VersionedValue.java
@@ -141,8 +141,8 @@ public class VersionedValue implements Comparable<VersionedValue>
public VersionedValue removedNonlocal(Token token, long expireTime)
{
- return new VersionedValue(VersionedValue.REMOVED_TOKEN + VersionedValue.DELIMITER
- + partitioner.getTokenFactory().toString(token) + VersionedValue.DELIMITER + expireTime);
+ return new VersionedValue(VersionedValue.REMOVED_TOKEN + VersionedValue.DELIMITER
+ + partitioner.getTokenFactory().toString(token) + VersionedValue.DELIMITER + expireTime);
}
public VersionedValue removalCoordinator(Token token)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 71ea2f4..2e69f99 100644
--- a/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
+++ b/src/java/org/apache/cassandra/hadoop/BulkRecordWriter.java
@@ -163,12 +163,12 @@ implements org.apache.hadoop.mapred.RecordWriter<ByteBuffer,List<Mutation>>
if (colType == ColType.COUNTER)
writer.addCounterColumn(mut.getColumn_or_supercolumn().counter_column.name, mut.getColumn_or_supercolumn().counter_column.value);
else
- {
+ {
if(mut.getColumn_or_supercolumn().column.ttl == 0)
- writer.addColumn(mut.getColumn_or_supercolumn().column.name, mut.getColumn_or_supercolumn().column.value, mut.getColumn_or_supercolumn().column.timestamp);
+ writer.addColumn(mut.getColumn_or_supercolumn().column.name, mut.getColumn_or_supercolumn().column.value, mut.getColumn_or_supercolumn().column.timestamp);
else
writer.addExpiringColumn(mut.getColumn_or_supercolumn().column.name, mut.getColumn_or_supercolumn().column.value, mut.getColumn_or_supercolumn().column.timestamp, mut.getColumn_or_supercolumn().column.ttl, System.currentTimeMillis() + ((long)(mut.getColumn_or_supercolumn().column.ttl) * 1000));
- }
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java b/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java
index 5bef55b..3b6f75d 100644
--- a/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java
+++ b/src/java/org/apache/cassandra/hadoop/ColumnFamilyInputFormat.java
@@ -216,9 +216,9 @@ public class ColumnFamilyInputFormat extends InputFormat<ByteBuffer, SortedMap<B
for (String endpoint: range.rpc_endpoints)
{
String endpoint_address = endpoint;
- if (endpoint_address == null || endpoint_address.equals("0.0.0.0"))
- endpoint_address = range.endpoints.get(endpointIndex);
- endpoints[endpointIndex++] = InetAddress.getByName(endpoint_address).getHostName();
+ if (endpoint_address == null || endpoint_address.equals("0.0.0.0"))
+ endpoint_address = range.endpoints.get(endpointIndex);
+ endpoints[endpointIndex++] = InetAddress.getByName(endpoint_address).getHostName();
}
for (int i = 1; i < tokens.size(); i++)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
index c9ab70e..c8f5863 100644
--- a/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/ConfigHelper.java
@@ -294,22 +294,22 @@ public class ConfigHelper
public static String getInputKeyspaceUserName(Configuration conf)
{
- return conf.get(INPUT_KEYSPACE_USERNAME_CONFIG);
+ return conf.get(INPUT_KEYSPACE_USERNAME_CONFIG);
}
public static String getInputKeyspacePassword(Configuration conf)
{
- return conf.get(INPUT_KEYSPACE_PASSWD_CONFIG);
+ return conf.get(INPUT_KEYSPACE_PASSWD_CONFIG);
}
public static String getOutputKeyspaceUserName(Configuration conf)
{
- return conf.get(OUTPUT_KEYSPACE_USERNAME_CONFIG);
+ return conf.get(OUTPUT_KEYSPACE_USERNAME_CONFIG);
}
public static String getOutputKeyspacePassword(Configuration conf)
{
- return conf.get(OUTPUT_KEYSPACE_PASSWD_CONFIG);
+ return conf.get(OUTPUT_KEYSPACE_PASSWD_CONFIG);
}
public static String getInputColumnFamily(Configuration conf)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/sstable/IndexHelper.java b/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
index 4ad5d32..314365b 100644
--- a/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
+++ b/src/java/org/apache/cassandra/io/sstable/IndexHelper.java
@@ -89,9 +89,9 @@ public class IndexHelper
* @return ArrayList<IndexInfo> - list of de-serialized indexes
* @throws IOException if an I/O error occurs.
*/
- public static ArrayList<IndexInfo> deserializeIndex(FileDataInput in) throws IOException
- {
- int columnIndexSize = in.readInt();
+ public static ArrayList<IndexInfo> deserializeIndex(FileDataInput in) throws IOException
+ {
+ int columnIndexSize = in.readInt();
if (columnIndexSize == 0)
return null;
ArrayList<IndexInfo> indexList = new ArrayList<IndexInfo>();
@@ -103,7 +103,7 @@ public class IndexHelper
assert in.bytesPastMark(mark) == columnIndexSize;
return indexList;
- }
+ }
public static Filter defreezeBloomFilter(FileDataInput file, boolean usesOldBloomFilter) throws IOException
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 c2d0cf4..ef79575 100644
--- a/src/java/org/apache/cassandra/io/util/FileUtils.java
+++ b/src/java/org/apache/cassandra/io/util/FileUtils.java
@@ -158,8 +158,8 @@ public class FileUtils
bVal = delete(file);
if (bVal)
{
- if (logger.isDebugEnabled())
- logger.debug("Deleted file {}", file);
+ if (logger.isDebugEnabled())
+ logger.debug("Deleted file {}", file);
files.remove(i);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/net/IAsyncCallback.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/IAsyncCallback.java b/src/java/org/apache/cassandra/net/IAsyncCallback.java
index 68ab48c..39e6cb3 100644
--- a/src/java/org/apache/cassandra/net/IAsyncCallback.java
+++ b/src/java/org/apache/cassandra/net/IAsyncCallback.java
@@ -26,8 +26,8 @@ package org.apache.cassandra.net;
*/
public interface IAsyncCallback extends IMessageCallback
{
- /**
- * @param msg response received.
- */
- public void response(Message msg);
+ /**
+ * @param msg response received.
+ */
+ public void response(Message msg);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/net/Message.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/net/Message.java b/src/java/org/apache/cassandra/net/Message.java
index 3d06d96..b3d4370 100644
--- a/src/java/org/apache/cassandra/net/Message.java
+++ b/src/java/org/apache/cassandra/net/Message.java
@@ -104,11 +104,11 @@ public class Message
StringBuilder sbuf = new StringBuilder("");
String separator = System.getProperty("line.separator");
sbuf.append("FROM:" + getFrom())
- .append(separator)
- .append("TYPE:" + getMessageType())
- .append(separator)
- .append("VERB:" + getVerb())
- .append(separator);
+ .append(separator)
+ .append("TYPE:" + getMessageType())
+ .append(separator)
+ .append("VERB:" + getVerb())
+ .append(separator);
return sbuf.toString();
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 7fce8e6..52e8dd0 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -324,8 +324,8 @@ public final class MessagingService implements MessagingServiceMBean
*/
public void registerVerbHandlers(StorageService.Verb verb, IVerbHandler verbHandler)
{
- assert !verbHandlers.containsKey(verb);
- verbHandlers.put(verb, verbHandler);
+ assert !verbHandlers.containsKey(verb);
+ verbHandlers.put(verb, verbHandler);
}
/**
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 20c0e8b..b19f561 100644
--- a/src/java/org/apache/cassandra/service/AntiEntropyService.java
+++ b/src/java/org/apache/cassandra/service/AntiEntropyService.java
@@ -405,7 +405,7 @@ public class AntiEntropyService
{
try
{
- FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
+ FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
SERIALIZER.serialize(request, dos, version);
return new Message(FBUtilities.getBroadcastAddress(), StorageService.Verb.TREE_REQUEST, bos.toByteArray(), version);
@@ -477,7 +477,7 @@ public class AntiEntropyService
{
try
{
- FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
+ FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
SERIALIZER.serialize(validator, dos, Gossiper.instance.getVersion(validator.request.endpoint));
return new Message(local,
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/service/DatacenterReadCallback.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/DatacenterReadCallback.java b/src/java/org/apache/cassandra/service/DatacenterReadCallback.java
index 00540ca..45b3c85 100644
--- a/src/java/org/apache/cassandra/service/DatacenterReadCallback.java
+++ b/src/java/org/apache/cassandra/service/DatacenterReadCallback.java
@@ -81,10 +81,10 @@ public class DatacenterReadCallback<T> extends ReadCallback<T>
@Override
public int determineBlockFor(ConsistencyLevel consistency_level, String table)
- {
+ {
NetworkTopologyStrategy stategy = (NetworkTopologyStrategy) Table.open(table).getReplicationStrategy();
- return (stategy.getReplicationFactor(localdc) / 2) + 1;
- }
+ return (stategy.getReplicationFactor(localdc) / 2) + 1;
+ }
@Override
public void assureSufficientLiveNodes() throws UnavailableException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 50453a0..af9ca8f 100644
--- a/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/DatacenterSyncWriteResponseHandler.java
@@ -53,7 +53,7 @@ public class DatacenterSyncWriteResponseHandler extends AbstractWriteResponseHan
localdc = snitch.getDatacenter(FBUtilities.getBroadcastAddress());
}
- private final NetworkTopologyStrategy strategy;
+ private final NetworkTopologyStrategy strategy;
private HashMap<String, AtomicInteger> responses = new HashMap<String, AtomicInteger>();
protected DatacenterSyncWriteResponseHandler(Collection<InetAddress> writeEndpoints, ConsistencyLevel consistencyLevel, String table)
@@ -113,7 +113,7 @@ public class DatacenterSyncWriteResponseHandler extends AbstractWriteResponseHan
// Throw exception if any of the DC doesn't have livenodes to accept write.
for (String dc: strategy.getDatacenters())
{
- if (dcEndpoints.get(dc).get() < responses.get(dc).get())
+ if (dcEndpoints.get(dc).get() < responses.get(dc).get())
throw new UnavailableException();
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/service/IResponseResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/IResponseResolver.java b/src/java/org/apache/cassandra/service/IResponseResolver.java
index 69d8bb9..76f74e7 100644
--- a/src/java/org/apache/cassandra/service/IResponseResolver.java
+++ b/src/java/org/apache/cassandra/service/IResponseResolver.java
@@ -24,17 +24,17 @@ import org.apache.cassandra.net.Message;
public interface IResponseResolver<T> {
- /**
- * This Method resolves the responses that are passed in . for example : if
- * its write response then all we get is true or false return values which
- * implies if the writes were successful but for reads its more complicated
- * you need to look at the responses and then based on differences schedule
- * repairs . Hence you need to derive a response resolver based on your
- * needs from this interface.
- */
- public T resolve() throws DigestMismatchException, IOException;
-
- public boolean isDataPresent();
+ /**
+ * This Method resolves the responses that are passed in . for example : if
+ * its write response then all we get is true or false return values which
+ * implies if the writes were successful but for reads its more complicated
+ * you need to look at the responses and then based on differences schedule
+ * repairs . Hence you need to derive a response resolver based on your
+ * needs from this interface.
+ */
+ public T resolve() throws DigestMismatchException, IOException;
+
+ public boolean isDataPresent();
/**
* returns the data response without comparing with any digests
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/service/RowDigestResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/RowDigestResolver.java b/src/java/org/apache/cassandra/service/RowDigestResolver.java
index 0e890ca..0f872a9 100644
--- a/src/java/org/apache/cassandra/service/RowDigestResolver.java
+++ b/src/java/org/apache/cassandra/service/RowDigestResolver.java
@@ -92,7 +92,7 @@ public class RowDigestResolver extends AbstractRowResolver
}
}
- // Compare digest (only one, since we threw earlier if there were different replies)
+ // Compare digest (only one, since we threw earlier if there were different replies)
// with the data response. If there is a mismatch then throw an exception so that read repair can happen.
//
// It's important to note that we do not consider the possibility of multiple data responses --
@@ -108,11 +108,11 @@ public class RowDigestResolver extends AbstractRowResolver
if (logger.isDebugEnabled())
logger.debug("resolve: " + (System.currentTimeMillis() - startTime) + " ms.");
- return new Row(key, data);
- }
+ return new Row(key, data);
+ }
public boolean isDataPresent()
- {
+ {
for (ReadResponse result : replies.values())
{
if (!result.isDigestQuery())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/service/RowRepairResolver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/RowRepairResolver.java b/src/java/org/apache/cassandra/service/RowRepairResolver.java
index 2d8078b..7cd3179 100644
--- a/src/java/org/apache/cassandra/service/RowRepairResolver.java
+++ b/src/java/org/apache/cassandra/service/RowRepairResolver.java
@@ -178,7 +178,7 @@ public class RowRepairResolver extends AbstractRowResolver
}
public boolean isDataPresent()
- {
+ {
throw new UnsupportedOperationException();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/streaming/StreamReply.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/StreamReply.java b/src/java/org/apache/cassandra/streaming/StreamReply.java
index 6ba79b3..a4aa286 100644
--- a/src/java/org/apache/cassandra/streaming/StreamReply.java
+++ b/src/java/org/apache/cassandra/streaming/StreamReply.java
@@ -54,7 +54,7 @@ class StreamReply implements MessageProducer
public Message getMessage(Integer version) throws IOException
{
- FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
+ FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream( bos );
serializer.serialize(this, dos, version);
return new Message(FBUtilities.getBroadcastAddress(), StorageService.Verb.STREAM_REPLY, bos.toByteArray(), version);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 7da544f..e39277d 100644
--- a/src/java/org/apache/cassandra/streaming/StreamRequestMessage.java
+++ b/src/java/org/apache/cassandra/streaming/StreamRequestMessage.java
@@ -97,7 +97,7 @@ class StreamRequestMessage implements MessageProducer
public Message getMessage(Integer version)
{
- FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
+ FastByteArrayOutputStream bos = new FastByteArrayOutputStream();
DataOutputStream dos = new DataOutputStream(bos);
try
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 adb053c..c0b9a55 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -126,7 +126,7 @@ public class CassandraServer implements Cassandra.Iface
catch (TimeoutException e)
{
logger.debug("... timed out");
- throw new TimedOutException();
+ throw new TimedOutException();
}
catch (IOException e)
{
@@ -708,7 +708,7 @@ public class CassandraServer implements Cassandra.Iface
catch (TimeoutException e)
{
logger.debug("... timed out");
- throw new TimedOutException();
+ throw new TimedOutException();
}
catch (IOException e)
{
@@ -764,7 +764,7 @@ public class CassandraServer implements Cassandra.Iface
catch (TimeoutException e)
{
logger.debug("... timed out");
- throw new TimedOutException();
+ throw new TimedOutException();
}
catch (IOException e)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 35a1db5..dde25ba 100644
--- a/src/java/org/apache/cassandra/tools/NodeCmd.java
+++ b/src/java/org/apache/cassandra/tools/NodeCmd.java
@@ -534,7 +534,7 @@ public class NodeCmd
outs.println("\t\tSSTable count: " + cfstore.getLiveSSTableCount());
outs.println("\t\tSpace used (live): " + cfstore.getLiveDiskSpaceUsed());
outs.println("\t\tSpace used (total): " + cfstore.getTotalDiskSpaceUsed());
- outs.println("\t\tNumber of Keys (estimate): " + cfstore.estimateKeys());
+ outs.println("\t\tNumber of Keys (estimate): " + cfstore.estimateKeys());
outs.println("\t\tMemtable Columns Count: " + cfstore.getMemtableColumnsCount());
outs.println("\t\tMemtable Data Size: " + cfstore.getMemtableDataSize());
outs.println("\t\tMemtable Switch Count: " + cfstore.getMemtableSwitchCount());
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 8d915c7..3c3891c 100644
--- a/src/java/org/apache/cassandra/tools/NodeProbe.java
+++ b/src/java/org/apache/cassandra/tools/NodeProbe.java
@@ -224,7 +224,7 @@ public class NodeProbe
public void drain() throws IOException, InterruptedException, ExecutionException
{
- ssProxy.drain();
+ ssProxy.drain();
}
public Map<String, String> getTokenToEndpointMap()
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/utils/BloomCalculations.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/BloomCalculations.java b/src/java/org/apache/cassandra/utils/BloomCalculations.java
index c9f5387..74e9498 100644
--- a/src/java/org/apache/cassandra/utils/BloomCalculations.java
+++ b/src/java/org/apache/cassandra/utils/BloomCalculations.java
@@ -58,18 +58,18 @@ class BloomCalculations {
{1.0, 0.074, 0.0203, 0.00875, 0.00492, 0.00332, 0.00255, 0.00217, 0.00199, 0.00194},
{1.0, 0.0689, 0.0177, 0.00718, 0.00381, 0.00244, 0.00179, 0.00146, 0.00129, 0.00121, 0.0012},
{1.0, 0.0645, 0.0156, 0.00596, 0.003, 0.00183, 0.00128, 0.001, 0.000852, 0.000775, 0.000744}, // 15
- {1.0, 0.0606, 0.0138, 0.005, 0.00239, 0.00139, 0.000935, 0.000702, 0.000574, 0.000505, 0.00047, 0.000459},
- {1.0, 0.0571, 0.0123, 0.00423, 0.00193, 0.00107, 0.000692, 0.000499, 0.000394, 0.000335, 0.000302, 0.000287, 0.000284},
- {1.0, 0.054, 0.0111, 0.00362, 0.00158, 0.000839, 0.000519, 0.00036, 0.000275, 0.000226, 0.000198, 0.000183, 0.000176},
- {1.0, 0.0513, 0.00998, 0.00312, 0.0013, 0.000663, 0.000394, 0.000264, 0.000194, 0.000155, 0.000132, 0.000118, 0.000111, 0.000109},
- {1.0, 0.0488, 0.00906, 0.0027, 0.00108, 0.00053, 0.000303, 0.000196, 0.00014, 0.000108, 8.89e-05, 7.77e-05, 7.12e-05, 6.79e-05, 6.71e-05} // 20
+ {1.0, 0.0606, 0.0138, 0.005, 0.00239, 0.00139, 0.000935, 0.000702, 0.000574, 0.000505, 0.00047, 0.000459},
+ {1.0, 0.0571, 0.0123, 0.00423, 0.00193, 0.00107, 0.000692, 0.000499, 0.000394, 0.000335, 0.000302, 0.000287, 0.000284},
+ {1.0, 0.054, 0.0111, 0.00362, 0.00158, 0.000839, 0.000519, 0.00036, 0.000275, 0.000226, 0.000198, 0.000183, 0.000176},
+ {1.0, 0.0513, 0.00998, 0.00312, 0.0013, 0.000663, 0.000394, 0.000264, 0.000194, 0.000155, 0.000132, 0.000118, 0.000111, 0.000109},
+ {1.0, 0.0488, 0.00906, 0.0027, 0.00108, 0.00053, 0.000303, 0.000196, 0.00014, 0.000108, 8.89e-05, 7.77e-05, 7.12e-05, 6.79e-05, 6.71e-05} // 20
}; // the first column is a dummy column representing K=0.
- /**
- * The optimal number of hashes for a given number of bits per element.
- * These values are automatically calculated from the data above.
- */
- private static final int[] optKPerBuckets = new int[probs.length];
+ /**
+ * The optimal number of hashes for a given number of bits per element.
+ * These values are automatically calculated from the data above.
+ */
+ private static final int[] optKPerBuckets = new int[probs.length];
static
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/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 81cb620..c567903 100644
--- a/src/java/org/apache/cassandra/utils/GuidGenerator.java
+++ b/src/java/org/apache/cassandra/utils/GuidGenerator.java
@@ -77,10 +77,10 @@ public class GuidGenerator {
long rand = 0;
rand = myRand.nextLong();
sbValueBeforeMD5.append(s_id)
- .append(":")
- .append(Long.toString(time))
- .append(":")
- .append(Long.toString(rand));
+ .append(":")
+ .append(Long.toString(time))
+ .append(":")
+ .append(Long.toString(rand));
String valueBeforeMD5 = sbValueBeforeMD5.toString();
return ByteBuffer.wrap(FBUtilities.threadLocalMD5Digest().digest(valueBeforeMD5.getBytes()));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/686139af/src/java/org/apache/cassandra/utils/MurmurHash.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/MurmurHash.java b/src/java/org/apache/cassandra/utils/MurmurHash.java
index 432cefc..b0d9eb6 100644
--- a/src/java/org/apache/cassandra/utils/MurmurHash.java
+++ b/src/java/org/apache/cassandra/utils/MurmurHash.java
@@ -100,9 +100,9 @@ public class MurmurHash
int i_8 = i << 3;
long k64 = ((long) key.get(offset+i_8+0) & 0xff) + (((long) key.get(offset+i_8+1) & 0xff)<<8) +
- (((long) key.get(offset+i_8+2) & 0xff)<<16) + (((long) key.get(offset+i_8+3) & 0xff)<<24) +
- (((long) key.get(offset+i_8+4) & 0xff)<<32) + (((long) key.get(offset+i_8+5) & 0xff)<<40) +
- (((long) key.get(offset+i_8+6) & 0xff)<<48) + (((long) key.get(offset+i_8+7) & 0xff)<<56);
+ (((long) key.get(offset+i_8+2) & 0xff)<<16) + (((long) key.get(offset+i_8+3) & 0xff)<<24) +
+ (((long) key.get(offset+i_8+4) & 0xff)<<32) + (((long) key.get(offset+i_8+5) & 0xff)<<40) +
+ (((long) key.get(offset+i_8+6) & 0xff)<<48) + (((long) key.get(offset+i_8+7) & 0xff)<<56);
k64 *= m64;
k64 ^= k64 >>> r64;