You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by db...@apache.org on 2016/08/30 04:47:39 UTC
[2/4] cassandra git commit: simple formatting fixes (braces)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java b/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
index 0eecef3..cee23c9 100644
--- a/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
+++ b/src/java/org/apache/cassandra/io/util/DataIntegrityMetadata.java
@@ -122,7 +122,8 @@ public class DataIntegrityMetadata
while( checkedInputStream.read(chunk) > 0 ) { }
long calculatedDigestValue = checkedInputStream.getChecksum().getValue();
- if (storedDigestValue != calculatedDigestValue) {
+ if (storedDigestValue != calculatedDigestValue)
+ {
throw new IOException("Corrupted SSTable : " + descriptor.filenameFor(Component.DATA));
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/io/util/FastByteArrayInputStream.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/FastByteArrayInputStream.java b/src/java/org/apache/cassandra/io/util/FastByteArrayInputStream.java
index 0e729b9..f61546c 100644
--- a/src/java/org/apache/cassandra/io/util/FastByteArrayInputStream.java
+++ b/src/java/org/apache/cassandra/io/util/FastByteArrayInputStream.java
@@ -36,7 +36,8 @@ import java.io.InputStream;
*
* @see ByteArrayInputStream
*/
-public class FastByteArrayInputStream extends InputStream {
+public class FastByteArrayInputStream extends InputStream
+{
/**
* The {@code byte} array containing the bytes to stream over.
*/
@@ -66,7 +67,8 @@ public class FastByteArrayInputStream extends InputStream {
* @param buf
* the byte array to stream over.
*/
- public FastByteArrayInputStream(byte buf[]) {
+ public FastByteArrayInputStream(byte buf[])
+ {
this.mark = 0;
this.buf = buf;
this.count = buf.length;
@@ -84,7 +86,8 @@ public class FastByteArrayInputStream extends InputStream {
* @param length
* the number of bytes available for streaming.
*/
- public FastByteArrayInputStream(byte buf[], int offset, int length) {
+ public FastByteArrayInputStream(byte buf[], int offset, int length)
+ {
this.buf = buf;
pos = offset;
mark = offset;
@@ -99,7 +102,8 @@ public class FastByteArrayInputStream extends InputStream {
* @return the number of bytes available before blocking.
*/
@Override
- public int available() {
+ public int available()
+ {
return count - pos;
}
@@ -110,7 +114,8 @@ public class FastByteArrayInputStream extends InputStream {
* if an I/O error occurs while closing this stream.
*/
@Override
- public void close() throws IOException {
+ public void close() throws IOException
+ {
// Do nothing on close, this matches JDK behaviour.
}
@@ -125,7 +130,8 @@ public class FastByteArrayInputStream extends InputStream {
* @see #reset()
*/
@Override
- public void mark(int readlimit) {
+ public void mark(int readlimit)
+ {
mark = pos;
}
@@ -139,7 +145,8 @@ public class FastByteArrayInputStream extends InputStream {
* @see #reset()
*/
@Override
- public boolean markSupported() {
+ public boolean markSupported()
+ {
return true;
}
@@ -151,7 +158,8 @@ public class FastByteArrayInputStream extends InputStream {
* @return the byte read or -1 if the end of this stream has been reached.
*/
@Override
- public int read() {
+ public int read()
+ {
return pos < count ? buf[pos++] & 0xFF : -1;
}
@@ -177,20 +185,24 @@ public class FastByteArrayInputStream extends InputStream {
* if {@code b} is {@code null}.
*/
@Override
- public int read(byte b[], int offset, int length) {
+ public int read(byte b[], int offset, int length)
+ {
if (b == null) {
throw new NullPointerException();
}
// avoid int overflow
if (offset < 0 || offset > b.length || length < 0
- || length > b.length - offset) {
+ || length > b.length - offset)
+ {
throw new IndexOutOfBoundsException();
}
// Are there any bytes available?
- if (this.pos >= this.count) {
+ if (this.pos >= this.count)
+ {
return -1;
}
- if (length == 0) {
+ if (length == 0)
+ {
return 0;
}
@@ -208,7 +220,8 @@ public class FastByteArrayInputStream extends InputStream {
* @see #mark(int)
*/
@Override
- public void reset() {
+ public void reset()
+ {
pos = mark;
}
@@ -223,8 +236,10 @@ public class FastByteArrayInputStream extends InputStream {
* @return the number of bytes actually skipped.
*/
@Override
- public long skip(long n) {
- if (n <= 0) {
+ public long skip(long n)
+ {
+ if (n <= 0)
+ {
return 0;
}
int temp = pos;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/io/util/FileHandle.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/FileHandle.java b/src/java/org/apache/cassandra/io/util/FileHandle.java
index 62fe5e5..c2e4a6c 100644
--- a/src/java/org/apache/cassandra/io/util/FileHandle.java
+++ b/src/java/org/apache/cassandra/io/util/FileHandle.java
@@ -432,7 +432,8 @@ public class FileHandle extends SharedCloseableImpl
}
@Override
- public String toString() {
+ public String toString()
+ {
return getClass().getSimpleName() + "(path='" + path() + '\'' +
", length=" + rebuffererFactory.fileLength() +
')';
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/io/util/Memory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/Memory.java b/src/java/org/apache/cassandra/io/util/Memory.java
index bd87f5e..431f73d 100644
--- a/src/java/org/apache/cassandra/io/util/Memory.java
+++ b/src/java/org/apache/cassandra/io/util/Memory.java
@@ -252,15 +252,18 @@ public class Memory implements AutoCloseable
public long getLong(long offset)
{
checkBounds(offset, offset + 8);
- if (Architecture.IS_UNALIGNED) {
+ if (Architecture.IS_UNALIGNED)
+ {
return unsafe.getLong(peer + offset);
} else {
return getLongByByte(peer + offset);
}
}
- private long getLongByByte(long address) {
- if (bigEndian) {
+ private long getLongByByte(long address)
+ {
+ if (bigEndian)
+ {
return (((long) unsafe.getByte(address ) ) << 56) |
(((long) unsafe.getByte(address + 1) & 0xff) << 48) |
(((long) unsafe.getByte(address + 2) & 0xff) << 40) |
@@ -269,7 +272,9 @@ public class Memory implements AutoCloseable
(((long) unsafe.getByte(address + 5) & 0xff) << 16) |
(((long) unsafe.getByte(address + 6) & 0xff) << 8) |
(((long) unsafe.getByte(address + 7) & 0xff) );
- } else {
+ }
+ else
+ {
return (((long) unsafe.getByte(address + 7) ) << 56) |
(((long) unsafe.getByte(address + 6) & 0xff) << 48) |
(((long) unsafe.getByte(address + 5) & 0xff) << 40) |
@@ -284,24 +289,31 @@ public class Memory implements AutoCloseable
public int getInt(long offset)
{
checkBounds(offset, offset + 4);
- if (Architecture.IS_UNALIGNED) {
+ if (Architecture.IS_UNALIGNED)
+ {
return unsafe.getInt(peer + offset);
- } else {
+ }
+ else
+ {
return getIntByByte(peer + offset);
}
}
- private int getIntByByte(long address) {
- if (bigEndian) {
- return (((int) unsafe.getByte(address ) ) << 24) |
- (((int) unsafe.getByte(address + 1) & 0xff) << 16) |
- (((int) unsafe.getByte(address + 2) & 0xff) << 8 ) |
- (((int) unsafe.getByte(address + 3) & 0xff) );
- } else {
- return (((int) unsafe.getByte(address + 3) ) << 24) |
- (((int) unsafe.getByte(address + 2) & 0xff) << 16) |
- (((int) unsafe.getByte(address + 1) & 0xff) << 8) |
- (((int) unsafe.getByte(address ) & 0xff) );
+ private int getIntByByte(long address)
+ {
+ if (bigEndian)
+ {
+ return ((unsafe.getByte(address ) ) << 24) |
+ ((unsafe.getByte(address + 1) & 0xff) << 16) |
+ ((unsafe.getByte(address + 2) & 0xff) << 8 ) |
+ ((unsafe.getByte(address + 3) & 0xff) );
+ }
+ else
+ {
+ return ((unsafe.getByte(address + 3) ) << 24) |
+ ((unsafe.getByte(address + 2) & 0xff) << 16) |
+ ((unsafe.getByte(address + 1) & 0xff) << 8) |
+ ((unsafe.getByte(address ) & 0xff) );
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/io/util/RebufferingInputStream.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/RebufferingInputStream.java b/src/java/org/apache/cassandra/io/util/RebufferingInputStream.java
index 6745526..094115a 100644
--- a/src/java/org/apache/cassandra/io/util/RebufferingInputStream.java
+++ b/src/java/org/apache/cassandra/io/util/RebufferingInputStream.java
@@ -69,8 +69,8 @@ public abstract class RebufferingInputStream extends InputStream implements Data
}
@Override
- public int read(byte[] b, int off, int len) throws IOException {
-
+ public int read(byte[] b, int off, int len) throws IOException
+ {
// avoid int overflow
if (off < 0 || off > b.length || len < 0 || len > b.length - off)
throw new IndexOutOfBoundsException();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/io/util/RewindableDataInputStreamPlus.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/io/util/RewindableDataInputStreamPlus.java b/src/java/org/apache/cassandra/io/util/RewindableDataInputStreamPlus.java
index ad2e8bd..a1842bc 100644
--- a/src/java/org/apache/cassandra/io/util/RewindableDataInputStreamPlus.java
+++ b/src/java/org/apache/cassandra/io/util/RewindableDataInputStreamPlus.java
@@ -389,7 +389,7 @@ public class RewindableDataInputStreamPlus extends FilterInputStream implements
{
int newSize = Math.min(2 * (pos + writeSize), maxMemBufferSize);
byte newBuffer[] = new byte[newSize];
- System.arraycopy(memBuffer, 0, newBuffer, 0, (int)pos);
+ System.arraycopy(memBuffer, 0, newBuffer, 0, pos);
memBuffer = newBuffer;
}
@@ -438,7 +438,8 @@ public class RewindableDataInputStreamPlus extends FilterInputStream implements
return skipped;
}
- private <T> T getIfNotClosed(T in) throws IOException {
+ private <T> T getIfNotClosed(T in) throws IOException
+ {
if (closed.get())
throw new IOException("Stream closed");
return in;
@@ -476,7 +477,8 @@ public class RewindableDataInputStreamPlus extends FilterInputStream implements
{
fail = merge(fail, e);
}
- try {
+ try
+ {
if (spillFile.exists())
{
spillFile.delete();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/locator/CloudstackSnitch.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/CloudstackSnitch.java b/src/java/org/apache/cassandra/locator/CloudstackSnitch.java
index 88c62e9..ec2e87e 100644
--- a/src/java/org/apache/cassandra/locator/CloudstackSnitch.java
+++ b/src/java/org/apache/cassandra/locator/CloudstackSnitch.java
@@ -60,7 +60,7 @@ public class CloudstackSnitch extends AbstractNetworkTopologySnitch
private static final String DEFAULT_DC = "UNKNOWN-DC";
private static final String DEFAULT_RACK = "UNKNOWN-RACK";
- private static final String[] LEASE_FILES =
+ private static final String[] LEASE_FILES =
{
"file:///var/lib/dhcp/dhclient.eth0.leases",
"file:///var/lib/dhclient/dhclient.eth0.leases"
@@ -75,7 +75,7 @@ public class CloudstackSnitch extends AbstractNetworkTopologySnitch
String zone = csQueryMetadata(endpoint + ZONE_NAME_QUERY_URI);
String zone_parts[] = zone.split("-");
- if (zone_parts.length != 3)
+ if (zone_parts.length != 3)
{
throw new ConfigurationException("CloudstackSnitch cannot handle invalid zone format: " + zone);
}
@@ -88,7 +88,7 @@ public class CloudstackSnitch extends AbstractNetworkTopologySnitch
if (endpoint.equals(FBUtilities.getBroadcastAddress()))
return csZoneRack;
EndpointState state = Gossiper.instance.getEndpointStateForEndpoint(endpoint);
- if (state == null || state.getApplicationState(ApplicationState.RACK) == null)
+ if (state == null || state.getApplicationState(ApplicationState.RACK) == null)
{
if (savedEndpoints == null)
savedEndpoints = SystemKeyspace.loadDcRackInfo();
@@ -104,7 +104,7 @@ public class CloudstackSnitch extends AbstractNetworkTopologySnitch
if (endpoint.equals(FBUtilities.getBroadcastAddress()))
return csZoneDc;
EndpointState state = Gossiper.instance.getEndpointStateForEndpoint(endpoint);
- if (state == null || state.getApplicationState(ApplicationState.DC) == null)
+ if (state == null || state.getApplicationState(ApplicationState.DC) == null)
{
if (savedEndpoints == null)
savedEndpoints = SystemKeyspace.loadDcRackInfo();
@@ -120,18 +120,18 @@ public class CloudstackSnitch extends AbstractNetworkTopologySnitch
HttpURLConnection conn = null;
DataInputStream is = null;
- try
+ try
{
conn = (HttpURLConnection) new URL(url).openConnection();
- }
- catch (Exception e)
+ }
+ catch (Exception e)
{
throw new ConfigurationException("CloudstackSnitch cannot query wrong metadata URL: " + url);
}
- try
+ try
{
conn.setRequestMethod("GET");
- if (conn.getResponseCode() != 200)
+ if (conn.getResponseCode() != 200)
{
throw new ConfigurationException("CloudstackSnitch was unable to query metadata.");
}
@@ -141,8 +141,8 @@ public class CloudstackSnitch extends AbstractNetworkTopologySnitch
is = new DataInputStream(new BufferedInputStream(conn.getInputStream()));
is.readFully(b);
return new String(b, StandardCharsets.UTF_8);
- }
- finally
+ }
+ finally
{
FileUtils.close(is);
conn.disconnect();
@@ -151,17 +151,17 @@ public class CloudstackSnitch extends AbstractNetworkTopologySnitch
String csMetadataEndpoint() throws ConfigurationException
{
- for (String lease_uri: LEASE_FILES)
+ for (String lease_uri: LEASE_FILES)
{
- try
+ try
{
File lease_file = new File(new URI(lease_uri));
- if (lease_file.exists())
+ if (lease_file.exists())
{
return csEndpointFromLease(lease_file);
}
- }
- catch (Exception e)
+ }
+ catch (Exception e)
{
JVMStabilityInspector.inspectThrowable(e);
continue;
@@ -180,24 +180,24 @@ public class CloudstackSnitch extends AbstractNetworkTopologySnitch
try (BufferedReader reader = new BufferedReader(new FileReader(lease)))
{
-
- while ((line = reader.readLine()) != null)
+
+ while ((line = reader.readLine()) != null)
{
Matcher matcher = identifierPattern.matcher(line);
- if (matcher.find())
+ if (matcher.find())
{
endpoint = matcher.group(1);
break;
}
}
}
- catch (Exception e)
+ catch (Exception e)
{
throw new ConfigurationException("CloudstackSnitch cannot access lease file.");
}
- if (endpoint == null)
+ if (endpoint == null)
{
throw new ConfigurationException("No metadata server could be found in lease file.");
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/locator/DynamicEndpointSnitchMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitchMBean.java b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitchMBean.java
index 552a16d..bfafa75 100644
--- a/src/java/org/apache/cassandra/locator/DynamicEndpointSnitchMBean.java
+++ b/src/java/org/apache/cassandra/locator/DynamicEndpointSnitchMBean.java
@@ -22,7 +22,8 @@ import java.net.UnknownHostException;
import java.util.Map;
import java.util.List;
-public interface DynamicEndpointSnitchMBean {
+public interface DynamicEndpointSnitchMBean
+{
public Map<InetAddress, Double> getScores();
public int getUpdateInterval();
public int getResetInterval();
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/locator/SnitchProperties.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/locator/SnitchProperties.java b/src/java/org/apache/cassandra/locator/SnitchProperties.java
index 8fdda7a..158feef 100644
--- a/src/java/org/apache/cassandra/locator/SnitchProperties.java
+++ b/src/java/org/apache/cassandra/locator/SnitchProperties.java
@@ -42,9 +42,9 @@ public class SnitchProperties
URL url;
if (configURL == null)
url = SnitchProperties.class.getClassLoader().getResource(RACKDC_PROPERTY_FILENAME);
- else
+ else
url = new URL(configURL);
-
+
stream = url.openStream(); // catch block handles potential NPE
properties.load(stream);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/metrics/CASClientRequestMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/CASClientRequestMetrics.java b/src/java/org/apache/cassandra/metrics/CASClientRequestMetrics.java
index 4e64cff..f3f1f64 100644
--- a/src/java/org/apache/cassandra/metrics/CASClientRequestMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/CASClientRequestMetrics.java
@@ -32,7 +32,8 @@ public class CASClientRequestMetrics extends ClientRequestMetrics
public final Counter unfinishedCommit;
- public CASClientRequestMetrics(String scope) {
+ public CASClientRequestMetrics(String scope)
+ {
super(scope);
contention = Metrics.histogram(factory.createMetricName("ContentionHistogram"), false);
conditionNotMet = Metrics.counter(factory.createMetricName("ConditionNotMet"));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/metrics/CompactionMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/CompactionMetrics.java b/src/java/org/apache/cassandra/metrics/CompactionMetrics.java
index 2cddfff..9aef0f8 100644
--- a/src/java/org/apache/cassandra/metrics/CompactionMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/CompactionMetrics.java
@@ -77,7 +77,8 @@ public class CompactionMetrics implements CompactionManager.CompactionExecutorSt
new Gauge<Map<String, Map<String, Integer>>>()
{
@Override
- public Map<String, Map<String, Integer>> getValue() {
+ public Map<String, Map<String, Integer>> getValue()
+ {
Map<String, Map<String, Integer>> resultMap = new HashMap<>();
// estimation of compactions need to be done
for (String keyspaceName : Schema.instance.getKeyspaces())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java b/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
index 14a4366..38dc5a4 100644
--- a/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
+++ b/src/java/org/apache/cassandra/metrics/DecayingEstimatedHistogramReservoir.java
@@ -24,7 +24,6 @@ import java.io.PrintWriter;
import java.nio.charset.Charset;
import java.util.Arrays;
import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicLong;
import java.util.concurrent.atomic.AtomicLongArray;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -518,19 +517,23 @@ public class DecayingEstimatedHistogramReservoir implements Reservoir
final long count = count();
- if(count <= 1) {
+ if(count <= 1)
+ {
return 0.0D;
- } else {
+ }
+ else
+ {
double mean = this.getMean();
double sum = 0.0D;
- for(int i = 0; i < lastBucket; ++i) {
+ for(int i = 0; i < lastBucket; ++i)
+ {
long value = bucketOffsets[i];
- double diff = (double)value - mean;
+ double diff = value - mean;
sum += diff * diff * decayingBuckets[i];
}
- return Math.sqrt(sum / (double)(count - 1));
+ return Math.sqrt(sum / (count - 1));
}
}
@@ -540,7 +543,8 @@ public class DecayingEstimatedHistogramReservoir implements Reservoir
{
int length = decayingBuckets.length;
- for(int i = 0; i < length; ++i) {
+ for(int i = 0; i < length; ++i)
+ {
out.printf("%d%n", decayingBuckets[i]);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
index ef62034..2e1c384 100644
--- a/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/KeyspaceMetrics.java
@@ -94,10 +94,10 @@ public class KeyspaceMetrics
public final MetricNameFactory factory;
private Keyspace keyspace;
-
+
/** set containing names of all the metrics stored here, for releasing later */
private Set<String> allMetrics = Sets.newHashSet();
-
+
/**
* Creates metrics for given {@link ColumnFamilyStore}.
*
@@ -120,7 +120,7 @@ public class KeyspaceMetrics
{
return metric.memtableLiveDataSize.getValue();
}
- });
+ });
memtableOnHeapDataSize = createKeyspaceGauge("MemtableOnHeapDataSize", new MetricValue()
{
public Long getValue(TableMetrics metric)
@@ -243,7 +243,7 @@ public class KeyspaceMetrics
*/
public void release()
{
- for(String name : allMetrics)
+ for(String name : allMetrics)
{
Metrics.remove(factory.createMetricName(name));
}
@@ -252,7 +252,7 @@ public class KeyspaceMetrics
writeLatency.release();
rangeLatency.release();
}
-
+
/**
* Represents a column family metric value.
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/metrics/RestorableMeter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/RestorableMeter.java b/src/java/org/apache/cassandra/metrics/RestorableMeter.java
index 9e2ed92..ea3fdde 100644
--- a/src/java/org/apache/cassandra/metrics/RestorableMeter.java
+++ b/src/java/org/apache/cassandra/metrics/RestorableMeter.java
@@ -49,7 +49,8 @@ public class RestorableMeter
/**
* Creates a new, uninitialized RestorableMeter.
*/
- public RestorableMeter() {
+ public RestorableMeter()
+ {
this.m15Rate = new RestorableEWMA(TimeUnit.MINUTES.toSeconds(15));
this.m120Rate = new RestorableEWMA(TimeUnit.MINUTES.toSeconds(120));
this.startTime = this.clock.getTick();
@@ -61,7 +62,8 @@ public class RestorableMeter
* @param lastM15Rate the last-seen 15m rate, in terms of events per second
* @param lastM120Rate the last seen 2h rate, in terms of events per second
*/
- public RestorableMeter(double lastM15Rate, double lastM120Rate) {
+ public RestorableMeter(double lastM15Rate, double lastM120Rate)
+ {
this.m15Rate = new RestorableEWMA(lastM15Rate, TimeUnit.MINUTES.toSeconds(15));
this.m120Rate = new RestorableEWMA(lastM120Rate, TimeUnit.MINUTES.toSeconds(120));
this.startTime = this.clock.getTick();
@@ -71,15 +73,19 @@ public class RestorableMeter
/**
* Updates the moving averages as needed.
*/
- private void tickIfNecessary() {
+ private void tickIfNecessary()
+ {
final long oldTick = lastTick.get();
final long newTick = clock.getTick();
final long age = newTick - oldTick;
- if (age > TICK_INTERVAL) {
+ if (age > TICK_INTERVAL)
+ {
final long newIntervalStartTick = newTick - age % TICK_INTERVAL;
- if (lastTick.compareAndSet(oldTick, newIntervalStartTick)) {
+ if (lastTick.compareAndSet(oldTick, newIntervalStartTick))
+ {
final long requiredTicks = age / TICK_INTERVAL;
- for (long i = 0; i < requiredTicks; i++) {
+ for (long i = 0; i < requiredTicks; i++)
+ {
m15Rate.tick();
m120Rate.tick();
}
@@ -90,7 +96,8 @@ public class RestorableMeter
/**
* Mark the occurrence of an event.
*/
- public void mark() {
+ public void mark()
+ {
mark(1);
}
@@ -99,7 +106,8 @@ public class RestorableMeter
*
* @param n the number of events
*/
- public void mark(long n) {
+ public void mark(long n)
+ {
tickIfNecessary();
count.addAndGet(n);
m15Rate.update(n);
@@ -109,7 +117,8 @@ public class RestorableMeter
/**
* Returns the 15-minute rate in terms of events per second. This carries the previous rate when restored.
*/
- public double fifteenMinuteRate() {
+ public double fifteenMinuteRate()
+ {
tickIfNecessary();
return m15Rate.rate();
}
@@ -117,7 +126,8 @@ public class RestorableMeter
/**
* Returns the two-hour rate in terms of events per second. This carries the previous rate when restored.
*/
- public double twoHourRate() {
+ public double twoHourRate()
+ {
tickIfNecessary();
return m120Rate.rate();
}
@@ -126,7 +136,8 @@ public class RestorableMeter
* The total number of events that have occurred since this object was created. Note that the previous count
* is *not* carried over when a RestorableMeter is restored.
*/
- public long count() {
+ public long count()
+ {
return count.get();
}
@@ -135,8 +146,10 @@ public class RestorableMeter
* does *not* carry over when a RestorableMeter is restored, so the mean rate is only a measure since
* this object was created.
*/
- public double meanRate() {
- if (count() == 0) {
+ public double meanRate()
+ {
+ if (count() == 0)
+ {
return 0.0;
} else {
final long elapsed = (clock.getTick() - startTime);
@@ -144,7 +157,8 @@ public class RestorableMeter
}
}
- static class RestorableEWMA {
+ static class RestorableEWMA
+ {
private volatile boolean initialized = false;
private volatile double rate = 0.0; // average rate in terms of events per nanosecond
@@ -156,7 +170,8 @@ public class RestorableMeter
*
* @param windowInSeconds the window of time this EWMA should average over, expressed as a number of seconds
*/
- public RestorableEWMA(long windowInSeconds) {
+ public RestorableEWMA(long windowInSeconds)
+ {
this.alpha = 1 - exp((-TICK_INTERVAL / NANOS_PER_SECOND) / windowInSeconds);
this.interval = TICK_INTERVAL;
}
@@ -166,7 +181,8 @@ public class RestorableMeter
*
* @param intervalInSeconds the window of time this EWMA should average over, expressed as a number of seconds
*/
- public RestorableEWMA(double lastRate, long intervalInSeconds) {
+ public RestorableEWMA(double lastRate, long intervalInSeconds)
+ {
this(intervalInSeconds);
this.rate = lastRate / NANOS_PER_SECOND;
this.initialized = true;
@@ -175,19 +191,24 @@ public class RestorableMeter
/**
* Update the moving average with a new value.
*/
- public void update(long n) {
+ public void update(long n)
+ {
uncounted.addAndGet(n);
}
/**
* Mark the passage of time and decay the current rate accordingly.
*/
- public void tick() {
+ public void tick()
+ {
final long count = uncounted.getAndSet(0);
final double instantRate = count / interval;
- if (initialized) {
+ if (initialized)
+ {
rate += (alpha * (instantRate - rate));
- } else {
+ }
+ else
+ {
rate = instantRate;
initialized = true;
}
@@ -196,7 +217,8 @@ public class RestorableMeter
/**
* Returns the rate in terms of events per second.
*/
- public double rate() {
+ public double rate()
+ {
return rate * NANOS_PER_SECOND;
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/metrics/ViewWriteMetrics.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/metrics/ViewWriteMetrics.java b/src/java/org/apache/cassandra/metrics/ViewWriteMetrics.java
index df98865..98363d4 100644
--- a/src/java/org/apache/cassandra/metrics/ViewWriteMetrics.java
+++ b/src/java/org/apache/cassandra/metrics/ViewWriteMetrics.java
@@ -31,7 +31,8 @@ public class ViewWriteMetrics extends ClientRequestMetrics
// time between when mutation is applied to local memtable to when CL.ONE is achieved on MV
public final Timer viewWriteLatency;
- public ViewWriteMetrics(String scope) {
+ public ViewWriteMetrics(String scope)
+ {
super(scope);
viewReplicasAttempted = Metrics.counter(factory.createMetricName("ViewReplicasAttempted"));
viewReplicasSuccess = Metrics.counter(factory.createMetricName("ViewReplicasSuccess"));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/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 fea5a8f..7cbe315 100644
--- a/src/java/org/apache/cassandra/net/MessagingService.java
+++ b/src/java/org/apache/cassandra/net/MessagingService.java
@@ -509,9 +509,11 @@ public final class MessagingService implements MessagingServiceMBean
getConnectionPool(expiredCallbackInfo.target).incrementTimeout();
if (expiredCallbackInfo.isFailureCallback())
{
- StageManager.getStage(Stage.INTERNAL_RESPONSE).submit(new Runnable() {
+ StageManager.getStage(Stage.INTERNAL_RESPONSE).submit(new Runnable()
+ {
@Override
- public void run() {
+ public void run()
+ {
((IAsyncCallbackWithFailure)expiredCallbackInfo.callback).onFailure(expiredCallbackInfo.target, RequestFailureReason.UNKNOWN);
}
});
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java b/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java
index 43fc586..b8aaceb 100644
--- a/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java
+++ b/src/java/org/apache/cassandra/repair/SystemDistributedKeyspace.java
@@ -269,7 +269,9 @@ public final class SystemDistributedKeyspace
ConsistencyLevel.ONE,
keyspace,
view);
- } catch (Exception e) {
+ }
+ catch (Exception e)
+ {
return Collections.emptyMap();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/schema/CompressionParams.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/CompressionParams.java b/src/java/org/apache/cassandra/schema/CompressionParams.java
index bd10f75..01428d0 100644
--- a/src/java/org/apache/cassandra/schema/CompressionParams.java
+++ b/src/java/org/apache/cassandra/schema/CompressionParams.java
@@ -265,7 +265,8 @@ public final class CompressionParams
}
}
- public static ICompressor createCompressor(ParameterizedClass compression) throws ConfigurationException {
+ public static ICompressor createCompressor(ParameterizedClass compression) throws ConfigurationException
+ {
return createCompressor(parseCompressorClass(compression.class_name), copyOptions(compression.parameters));
}
@@ -282,7 +283,7 @@ public final class CompressionParams
/**
* Parse the chunk length (in KB) and returns it as bytes.
- *
+ *
* @param chLengthKB the length of the chunk to parse
* @return the chunk length in bytes
* @throws ConfigurationException if the chunk size is too large
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
index 9502860..19844a3 100644
--- a/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
+++ b/src/java/org/apache/cassandra/schema/LegacySchemaMigrator.java
@@ -754,7 +754,7 @@ public final class LegacySchemaMigrator
if (row.has("index_options"))
indexOptions = fromJsonMap(row.getString("index_options"));
- if (row.has("index_name"))
+ if (row.has("index_name"))
{
String indexName = row.getString("index_name");
@@ -767,10 +767,10 @@ public final class LegacySchemaMigrator
isCQLTable,
isStaticCompactTable,
needsUpgrade);
-
+
indexes.add(IndexMetadata.fromLegacyMetadata(cfm, column, indexName, kind, indexOptions));
- }
- else
+ }
+ else
{
logger.error("Failed to find index name for legacy migration of index on {}.{}", keyspace, table);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/serializers/TimestampSerializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/serializers/TimestampSerializer.java b/src/java/org/apache/cassandra/serializers/TimestampSerializer.java
index 9bd9a8d..a4a6f80 100644
--- a/src/java/org/apache/cassandra/serializers/TimestampSerializer.java
+++ b/src/java/org/apache/cassandra/serializers/TimestampSerializer.java
@@ -33,7 +33,8 @@ public class TimestampSerializer implements TypeSerializer<Date>
//NOTE: This list is used below and if you change the order
// you need to update the default format and json formats in the code below.
- private static final String[] dateStringPatterns = new String[] {
+ private static final String[] dateStringPatterns = new String[]
+ {
"yyyy-MM-dd HH:mm",
"yyyy-MM-dd HH:mm:ss",
"yyyy-MM-dd HH:mm z",
@@ -107,7 +108,7 @@ public class TimestampSerializer implements TypeSerializer<Date>
return sdf;
}
};
-
+
private static final String TO_JSON_FORMAT = dateStringPatterns[19];
private static final ThreadLocal<SimpleDateFormat> FORMATTER_TO_JSON = new ThreadLocal<SimpleDateFormat>()
{
@@ -120,7 +121,7 @@ public class TimestampSerializer implements TypeSerializer<Date>
};
-
+
public static final TimestampSerializer instance = new TimestampSerializer();
public Date deserialize(ByteBuffer bytes)
@@ -161,8 +162,8 @@ public class TimestampSerializer implements TypeSerializer<Date>
throw new MarshalException(String.format("Unable to coerce '%s' to a formatted date (long)", source), e1);
}
}
-
- public static SimpleDateFormat getJsonDateFormatter()
+
+ public static SimpleDateFormat getJsonDateFormatter()
{
return FORMATTER_TO_JSON.get();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/serializers/UTF8Serializer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/serializers/UTF8Serializer.java b/src/java/org/apache/cassandra/serializers/UTF8Serializer.java
index e7a5854..5913464 100644
--- a/src/java/org/apache/cassandra/serializers/UTF8Serializer.java
+++ b/src/java/org/apache/cassandra/serializers/UTF8Serializer.java
@@ -37,7 +37,8 @@ public class UTF8Serializer extends AbstractTextSerializer
static class UTF8Validator
{
- enum State {
+ enum State
+ {
START,
TWO,
TWO_80,
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
index c82d58b..7cc854a 100644
--- a/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
+++ b/src/java/org/apache/cassandra/service/AbstractWriteResponseHandler.java
@@ -112,8 +112,8 @@ public abstract class AbstractWriteResponseHandler<T> implements IAsyncCallbackW
}
}
- /**
- * @return the minimum number of endpoints that must reply.
+ /**
+ * @return the minimum number of endpoints that must reply.
*/
protected int totalBlockFor()
{
@@ -122,8 +122,8 @@ public abstract class AbstractWriteResponseHandler<T> implements IAsyncCallbackW
return consistencyLevel.blockFor(keyspace) + pendingEndpoints.size();
}
- /**
- * @return the total number of endpoints the request has been sent to.
+ /**
+ * @return the total number of endpoints the request has been sent to.
*/
protected int totalEndpoints()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/service/CassandraDaemon.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/CassandraDaemon.java b/src/java/org/apache/cassandra/service/CassandraDaemon.java
index 4cbac41..890d0ce 100644
--- a/src/java/org/apache/cassandra/service/CassandraDaemon.java
+++ b/src/java/org/apache/cassandra/service/CassandraDaemon.java
@@ -82,7 +82,8 @@ public class CassandraDaemon
public static final String MBEAN_NAME = "org.apache.cassandra.db:type=NativeAccess";
private static final Logger logger;
- static {
+ static
+ {
// Need to register metrics before instrumented appender is created(first access to LoggerFactory).
SharedMetricRegistries.getOrCreate("logback-metrics").addListener(new MetricRegistryListener.Base()
{
@@ -160,11 +161,13 @@ public class CassandraDaemon
protected final StartupChecks startupChecks;
private boolean setupCompleted;
- public CassandraDaemon() {
+ public CassandraDaemon()
+ {
this(false);
}
- public CassandraDaemon(boolean runManaged) {
+ public CassandraDaemon(boolean runManaged)
+ {
this.runManaged = runManaged;
this.startupChecks = new StartupChecks().withDefaultTests();
this.setupCompleted = false;
@@ -366,9 +369,12 @@ public class CassandraDaemon
CassandraMetricsRegistry.Metrics.register("jvm.fd.usage", new FileDescriptorRatioGauge());
// initialize metrics-reporter-config from yaml file
URL resource = CassandraDaemon.class.getClassLoader().getResource(metricsReporterConfigFile);
- if (resource == null) {
+ if (resource == null)
+ {
logger.warn("Failed to load metrics-reporter-config, file does not exist: {}", metricsReporterConfigFile);
- } else {
+ }
+ else
+ {
String reportFileLocation = resource.getFile();
ReporterConfig.loadFromFile(reportFileLocation).enableAll(CassandraMetricsRegistry.Metrics);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/service/ClientWarn.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/ClientWarn.java b/src/java/org/apache/cassandra/service/ClientWarn.java
index 878b5e9..5a6a878 100644
--- a/src/java/org/apache/cassandra/service/ClientWarn.java
+++ b/src/java/org/apache/cassandra/service/ClientWarn.java
@@ -34,11 +34,13 @@ public class ClientWarn implements ExecutorLocal<ClientWarn.State>
{
}
- public State get() {
+ public State get()
+ {
return warnLocal.get();
}
- public void set(State value) {
+ public void set(State value)
+ {
warnLocal.set(value);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/service/EchoVerbHandler.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/EchoVerbHandler.java b/src/java/org/apache/cassandra/service/EchoVerbHandler.java
index 3d3f69e..d0c435e 100644
--- a/src/java/org/apache/cassandra/service/EchoVerbHandler.java
+++ b/src/java/org/apache/cassandra/service/EchoVerbHandler.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.service;
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@ package org.apache.cassandra.service;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/service/StorageProxy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageProxy.java b/src/java/org/apache/cassandra/service/StorageProxy.java
index f180bdf..ca8a9c6 100644
--- a/src/java/org/apache/cassandra/service/StorageProxy.java
+++ b/src/java/org/apache/cassandra/service/StorageProxy.java
@@ -2152,7 +2152,7 @@ public class StorageProxy implements StorageProxyMBean
float rowsPerRange = (float)liveReturned / (float)rangesQueried;
concurrencyFactor = Math.max(1, Math.min(totalRangeCount - rangesQueried, Math.round(remainingRows / rowsPerRange)));
logger.trace("Didn't get enough response rows; actual rows per range: {}; remaining rows: {}, new concurrent requests: {}",
- rowsPerRange, (int) remainingRows, concurrencyFactor);
+ rowsPerRange, remainingRows, concurrencyFactor);
}
/**
@@ -2757,15 +2757,18 @@ public class StorageProxy implements StorageProxyMBean
public void reloadTriggerClasses() { TriggerExecutor.instance.reloadClasses(); }
- public long getReadRepairAttempted() {
+ public long getReadRepairAttempted()
+ {
return ReadRepairMetrics.attempted.getCount();
}
- public long getReadRepairRepairedBlocking() {
+ public long getReadRepairRepairedBlocking()
+ {
return ReadRepairMetrics.repairedBlocking.getCount();
}
- public long getReadRepairRepairedBackground() {
+ public long getReadRepairRepairedBackground()
+ {
return ReadRepairMetrics.repairedBackground.getCount();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/service/StorageService.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageService.java b/src/java/org/apache/cassandra/service/StorageService.java
index db4b835..50b7511 100644
--- a/src/java/org/apache/cassandra/service/StorageService.java
+++ b/src/java/org/apache/cassandra/service/StorageService.java
@@ -106,7 +106,7 @@ import static org.apache.cassandra.index.SecondaryIndexManager.isIndexColumnFami
public class StorageService extends NotificationBroadcasterSupport implements IEndpointStateChangeSubscriber, StorageServiceMBean
{
private static final Logger logger = LoggerFactory.getLogger(StorageService.class);
-
+
public static final int RING_DELAY = getRingDelay(); // delay after which we assume ring has stablized
private final JMXProgressSupport progressSupport = new JMXProgressSupport(this);
@@ -3425,7 +3425,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return new FutureTask<>(task, null);
}
- public void forceTerminateAllRepairSessions() {
+ public void forceTerminateAllRepairSessions()
+ {
ActiveRepairService.instance.terminateSessions();
}
@@ -3631,7 +3632,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
* @return the runtime logging levels for all the configured loggers
*/
@Override
- public Map<String,String>getLoggingLevels() {
+ public Map<String,String>getLoggingLevels()
+ {
Map<String, String> logLevelMaps = Maps.newLinkedHashMap();
LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
for (ch.qos.logback.classic.Logger logger : lc.getLoggerList())
@@ -3642,7 +3644,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
return logLevelMaps;
}
- private boolean hasAppenders(ch.qos.logback.classic.Logger logger) {
+ private boolean hasAppenders(ch.qos.logback.classic.Logger logger)
+ {
Iterator<Appender<ILoggingEvent>> it = logger.iteratorForAppenders();
return it.hasNext();
}
@@ -4090,7 +4093,8 @@ public class StorageService extends NotificationBroadcasterSupport implements IE
*/
public String getRemovalStatus()
{
- if (removingNode == null) {
+ if (removingNode == null)
+ {
return "No token removals in process.";
}
return String.format("Removing token (%s). Waiting for replication confirmation from [%s].",
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/service/StorageServiceMBean.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/service/StorageServiceMBean.java b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
index d6f6bd6..527417c 100644
--- a/src/java/org/apache/cassandra/service/StorageServiceMBean.java
+++ b/src/java/org/apache/cassandra/service/StorageServiceMBean.java
@@ -213,7 +213,7 @@ public interface StorageServiceMBean extends NotificationEmitter
/**
* Takes the snapshot of a multiple column family from different keyspaces. A snapshot name must be specified.
- *
+ *
* @param tag
* the tag given to the snapshot; may not be null or empty
* @param options
@@ -408,11 +408,11 @@ public interface StorageServiceMBean extends NotificationEmitter
* If level cannot be parsed, then the level will be defaulted to DEBUG<br>
* <br>
* The logback configuration should have {@code < jmxConfigurator />} set
- *
+ *
* @param classQualifier The logger's classQualifer
* @param level The log level
- * @throws Exception
- *
+ * @throws Exception
+ *
* @see ch.qos.logback.classic.Level#toLevel(String)
*/
public void setLoggingLevel(String classQualifier, String level) throws Exception;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java b/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java
index a54498d..b9e6951 100644
--- a/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java
+++ b/src/java/org/apache/cassandra/streaming/management/ProgressInfoCompositeData.java
@@ -53,7 +53,8 @@ public class ProgressInfoCompositeData
SimpleType.LONG};
public static final CompositeType COMPOSITE_TYPE;
- static {
+ static
+ {
try
{
COMPOSITE_TYPE = new CompositeType(ProgressInfo.class.getName(),
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/streaming/management/SessionCompleteEventCompositeData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/management/SessionCompleteEventCompositeData.java b/src/java/org/apache/cassandra/streaming/management/SessionCompleteEventCompositeData.java
index 3351e6e..516582a 100644
--- a/src/java/org/apache/cassandra/streaming/management/SessionCompleteEventCompositeData.java
+++ b/src/java/org/apache/cassandra/streaming/management/SessionCompleteEventCompositeData.java
@@ -38,7 +38,8 @@ public class SessionCompleteEventCompositeData
SimpleType.BOOLEAN};
public static final CompositeType COMPOSITE_TYPE;
- static {
+ static
+ {
try
{
COMPOSITE_TYPE = new CompositeType(StreamEvent.SessionCompleteEvent.class.getName(),
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java b/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java
index 63e4ab7..a6762a8 100644
--- a/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java
+++ b/src/java/org/apache/cassandra/streaming/management/SessionInfoCompositeData.java
@@ -55,7 +55,8 @@ public class SessionInfoCompositeData
private static final OpenType<?>[] ITEM_TYPES;
public static final CompositeType COMPOSITE_TYPE;
- static {
+ static
+ {
try
{
ITEM_TYPES = new OpenType[]{SimpleType.STRING,
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/streaming/management/StreamEventJMXNotifier.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/management/StreamEventJMXNotifier.java b/src/java/org/apache/cassandra/streaming/management/StreamEventJMXNotifier.java
index 01ca9a1..3e12c2a 100644
--- a/src/java/org/apache/cassandra/streaming/management/StreamEventJMXNotifier.java
+++ b/src/java/org/apache/cassandra/streaming/management/StreamEventJMXNotifier.java
@@ -37,7 +37,8 @@ public class StreamEventJMXNotifier extends NotificationBroadcasterSupport imple
public void handleStreamEvent(StreamEvent event)
{
Notification notif = null;
- switch (event.eventType) {
+ switch (event.eventType)
+ {
case STREAM_PREPARED:
notif = new Notification(StreamEvent.SessionPreparedEvent.class.getCanonicalName(),
StreamManagerMBean.OBJECT_NAME,
@@ -60,7 +61,9 @@ public class StreamEventJMXNotifier extends NotificationBroadcasterSupport imple
seq.getAndIncrement());
notif.setUserData(ProgressInfoCompositeData.toCompositeData(event.planId, progress));
progressLastSent = System.currentTimeMillis();
- } else {
+ }
+ else
+ {
return;
}
break;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java b/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java
index 3752d39..e25ab1a 100644
--- a/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java
+++ b/src/java/org/apache/cassandra/streaming/management/StreamStateCompositeData.java
@@ -48,7 +48,8 @@ public class StreamStateCompositeData
private static final OpenType<?>[] ITEM_TYPES;
public static final CompositeType COMPOSITE_TYPE;
- static {
+ static
+ {
try
{
ITEM_TYPES = new OpenType[]{SimpleType.STRING,
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/streaming/management/StreamSummaryCompositeData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/streaming/management/StreamSummaryCompositeData.java b/src/java/org/apache/cassandra/streaming/management/StreamSummaryCompositeData.java
index e93069c..9ef23ab 100644
--- a/src/java/org/apache/cassandra/streaming/management/StreamSummaryCompositeData.java
+++ b/src/java/org/apache/cassandra/streaming/management/StreamSummaryCompositeData.java
@@ -41,7 +41,8 @@ public class StreamSummaryCompositeData
SimpleType.LONG};
public static final CompositeType COMPOSITE_TYPE;
- static {
+ static
+ {
try
{
COMPOSITE_TYPE = new CompositeType(StreamSummary.class.getName(),
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/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 910f334..351d463 100644
--- a/src/java/org/apache/cassandra/thrift/CassandraServer.java
+++ b/src/java/org/apache/cassandra/thrift/CassandraServer.java
@@ -2442,7 +2442,7 @@ public class CassandraServer implements Cassandra.Iface
{
logger.trace("get_multi_slice");
}
- try
+ try
{
ClientState cState = state();
String keyspace = cState.getKeyspace();
@@ -2488,8 +2488,8 @@ public class CassandraServer implements Cassandra.Iface
catch (RequestValidationException e)
{
throw ThriftConversion.toThrift(e);
- }
- finally
+ }
+ finally
{
Tracing.instance.stopSession();
}
@@ -2499,7 +2499,8 @@ public class CassandraServer implements Cassandra.Iface
* Set the to start-of end-of value of "" for start and finish.
* @param columnSlice
*/
- private static void fixOptionalSliceParameters(org.apache.cassandra.thrift.ColumnSlice columnSlice) {
+ private static void fixOptionalSliceParameters(org.apache.cassandra.thrift.ColumnSlice columnSlice)
+ {
if (!columnSlice.isSetStart())
columnSlice.setStart(new byte[0]);
if (!columnSlice.isSetFinish())
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/thrift/CustomTNonBlockingServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CustomTNonBlockingServer.java b/src/java/org/apache/cassandra/thrift/CustomTNonBlockingServer.java
index de8df57..8221a83 100644
--- a/src/java/org/apache/cassandra/thrift/CustomTNonBlockingServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTNonBlockingServer.java
@@ -80,11 +80,13 @@ public class CustomTNonBlockingServer extends TNonblockingServer
{
public CustomFrameBuffer(final TNonblockingTransport trans,
final SelectionKey selectionKey,
- final AbstractSelectThread selectThread) {
+ final AbstractSelectThread selectThread)
+ {
super(trans, selectionKey, selectThread);
}
- public TNonblockingTransport getTransport() {
+ public TNonblockingTransport getTransport()
+ {
return this.trans_;
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
index 46da9d5..d1cdaed 100644
--- a/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
+++ b/src/java/org/apache/cassandra/thrift/CustomTThreadPoolServer.java
@@ -78,7 +78,8 @@ public class CustomTThreadPoolServer extends TServer
private final AtomicInteger activeClients = new AtomicInteger(0);
- public CustomTThreadPoolServer(TThreadPoolServer.Args args, ExecutorService executorService) {
+ public CustomTThreadPoolServer(TThreadPoolServer.Args args, ExecutorService executorService)
+ {
super(args);
this.executorService = executorService;
this.args = args;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/thrift/TCustomSocket.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/thrift/TCustomSocket.java b/src/java/org/apache/cassandra/thrift/TCustomSocket.java
index 1a5d538..08a9770 100644
--- a/src/java/org/apache/cassandra/thrift/TCustomSocket.java
+++ b/src/java/org/apache/cassandra/thrift/TCustomSocket.java
@@ -36,7 +36,8 @@ import org.slf4j.LoggerFactory;
* Adds socket buffering
*
*/
-public class TCustomSocket extends TIOStreamTransport {
+public class TCustomSocket extends TIOStreamTransport
+{
private static final Logger LOGGER = LoggerFactory.getLogger(TCustomSocket.class.getName());
@@ -66,20 +67,28 @@ public class TCustomSocket extends TIOStreamTransport {
* @param socket Already created socket object
* @throws TTransportException if there is an error setting up the streams
*/
- public TCustomSocket(Socket socket) throws TTransportException {
+ public TCustomSocket(Socket socket) throws TTransportException
+ {
this.socket = socket;
- try {
+ try
+ {
socket.setSoLinger(false, 0);
socket.setTcpNoDelay(true);
- } catch (SocketException sx) {
+ }
+ catch (SocketException sx)
+ {
LOGGER.warn("Could not configure socket.", sx);
}
- if (isOpen()) {
- try {
+ if (isOpen())
+ {
+ try
+ {
inputStream_ = new BufferedInputStream(socket.getInputStream(), 1024);
outputStream_ = new BufferedOutputStream(socket.getOutputStream(), 1024);
- } catch (IOException iox) {
+ }
+ catch (IOException iox)
+ {
close();
throw new TTransportException(TTransportException.NOT_OPEN, iox);
}
@@ -93,7 +102,8 @@ public class TCustomSocket extends TIOStreamTransport {
* @param host Remote host
* @param port Remote port
*/
- public TCustomSocket(String host, int port) {
+ public TCustomSocket(String host, int port)
+ {
this(host, port, 0);
}
@@ -105,7 +115,8 @@ public class TCustomSocket extends TIOStreamTransport {
* @param port Remote port
* @param timeout Socket timeout
*/
- public TCustomSocket(String host, int port, int timeout) {
+ public TCustomSocket(String host, int port, int timeout)
+ {
this.host = host;
this.port = port;
this.timeout = timeout;
@@ -115,13 +126,17 @@ public class TCustomSocket extends TIOStreamTransport {
/**
* Initializes the socket object
*/
- private void initSocket() {
+ private void initSocket()
+ {
socket = new Socket();
- try {
+ try
+ {
socket.setSoLinger(false, 0);
socket.setTcpNoDelay(true);
socket.setSoTimeout(timeout);
- } catch (SocketException sx) {
+ }
+ catch (SocketException sx)
+ {
LOGGER.error("Could not configure socket.", sx);
}
}
@@ -131,11 +146,15 @@ public class TCustomSocket extends TIOStreamTransport {
*
* @param timeout Milliseconds timeout
*/
- public void setTimeout(int timeout) {
+ public void setTimeout(int timeout)
+ {
this.timeout = timeout;
- try {
+ try
+ {
socket.setSoTimeout(timeout);
- } catch (SocketException sx) {
+ }
+ catch (SocketException sx)
+ {
LOGGER.warn("Could not set socket timeout.", sx);
}
}
@@ -143,8 +162,10 @@ public class TCustomSocket extends TIOStreamTransport {
/**
* Returns a reference to the underlying socket.
*/
- public Socket getSocket() {
- if (socket == null) {
+ public Socket getSocket()
+ {
+ if (socket == null)
+ {
initSocket();
}
return socket;
@@ -153,8 +174,10 @@ public class TCustomSocket extends TIOStreamTransport {
/**
* Checks whether the socket is connected.
*/
- public boolean isOpen() {
- if (socket == null) {
+ public boolean isOpen()
+ {
+ if (socket == null)
+ {
return false;
}
return socket.isConnected();
@@ -163,27 +186,35 @@ public class TCustomSocket extends TIOStreamTransport {
/**
* Connects the socket, creating a new socket object if necessary.
*/
- public void open() throws TTransportException {
- if (isOpen()) {
+ public void open() throws TTransportException
+ {
+ if (isOpen())
+ {
throw new TTransportException(TTransportException.ALREADY_OPEN, "Socket already connected.");
}
- if (host.length() == 0) {
+ if (host.length() == 0)
+ {
throw new TTransportException(TTransportException.NOT_OPEN, "Cannot open null host.");
}
- if (port <= 0) {
+ if (port <= 0)
+ {
throw new TTransportException(TTransportException.NOT_OPEN, "Cannot open without port.");
}
- if (socket == null) {
+ if (socket == null)
+ {
initSocket();
}
- try {
+ try
+ {
socket.connect(new InetSocketAddress(host, port), timeout);
inputStream_ = new BufferedInputStream(socket.getInputStream(), 1024);
outputStream_ = new BufferedOutputStream(socket.getOutputStream(), 1024);
- } catch (IOException iox) {
+ }
+ catch (IOException iox)
+ {
close();
throw new TTransportException(TTransportException.NOT_OPEN, iox);
}
@@ -192,15 +223,20 @@ public class TCustomSocket extends TIOStreamTransport {
/**
* Closes the socket.
*/
- public void close() {
+ public void close()
+ {
// Close the underlying streams
super.close();
// Close the socket
- if (socket != null) {
- try {
+ if (socket != null)
+ {
+ try
+ {
socket.close();
- } catch (IOException iox) {
+ }
+ catch (IOException iox)
+ {
LOGGER.warn("Could not close socket.", iox);
}
socket = null;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/tools/AbstractJmxClient.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tools/AbstractJmxClient.java b/src/java/org/apache/cassandra/tools/AbstractJmxClient.java
index 8241a5b..9251091 100644
--- a/src/java/org/apache/cassandra/tools/AbstractJmxClient.java
+++ b/src/java/org/apache/cassandra/tools/AbstractJmxClient.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.tools;
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@ package org.apache.cassandra.tools;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -110,7 +110,7 @@ public abstract class AbstractJmxClient implements Closeable
CommandLineParser parser = new PosixParser();
return parser.parse(options, args);
}
-
+
public static void addCmdOption(String shortOpt, String longOpt, boolean hasArg, String description)
{
options.addOption(shortOpt, longOpt, hasArg, description);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/tracing/Tracing.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tracing/Tracing.java b/src/java/org/apache/cassandra/tracing/Tracing.java
index c6fe46b..33e1967 100644
--- a/src/java/org/apache/cassandra/tracing/Tracing.java
+++ b/src/java/org/apache/cassandra/tracing/Tracing.java
@@ -91,7 +91,8 @@ public abstract class Tracing implements ExecutorLocal<TraceState>
public static final Tracing instance;
- static {
+ static
+ {
Tracing tracing = null;
String customTracingClass = System.getProperty("cassandra.custom_tracing_class");
if (null != customTracingClass)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/tracing/TracingImpl.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/tracing/TracingImpl.java b/src/java/org/apache/cassandra/tracing/TracingImpl.java
index 4f69584..d774abb 100644
--- a/src/java/org/apache/cassandra/tracing/TracingImpl.java
+++ b/src/java/org/apache/cassandra/tracing/TracingImpl.java
@@ -35,7 +35,8 @@ import org.apache.cassandra.utils.WrappedRunnable;
*/
class TracingImpl extends Tracing
{
- public void stopSessionImpl() {
+ public void stopSessionImpl()
+ {
final TraceStateImpl state = getStateImpl();
if (state == null)
return;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/transport/CBUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/CBUtil.java b/src/java/org/apache/cassandra/transport/CBUtil.java
index 25409ae..91b9cc7 100644
--- a/src/java/org/apache/cassandra/transport/CBUtil.java
+++ b/src/java/org/apache/cassandra/transport/CBUtil.java
@@ -83,14 +83,17 @@ public abstract class CBUtil
theDecoder.reset();
CharBuffer dst = TL_CHAR_BUFFER.get();
int capacity = (int) ((double) src.remaining() * theDecoder.maxCharsPerByte());
- if (dst == null) {
+ if (dst == null)
+ {
capacity = Math.max(capacity, 4096);
dst = CharBuffer.allocate(capacity);
TL_CHAR_BUFFER.set(dst);
}
- else {
+ else
+ {
dst.clear();
- if (dst.capacity() < capacity){
+ if (dst.capacity() < capacity)
+ {
dst = CharBuffer.allocate(capacity);
TL_CHAR_BUFFER.set(dst);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/transport/Client.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Client.java b/src/java/org/apache/cassandra/transport/Client.java
index 84f3a43..f6216e1 100644
--- a/src/java/org/apache/cassandra/transport/Client.java
+++ b/src/java/org/apache/cassandra/transport/Client.java
@@ -69,7 +69,8 @@ public class Client extends SimpleClient
System.out.print(">> ");
System.out.flush();
String line = in.readLine();
- if (line == null) {
+ if (line == null)
+ {
break;
}
Message.Request req = parseLine(line.trim());
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/transport/Event.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Event.java b/src/java/org/apache/cassandra/transport/Event.java
index 618d722..1b72cbe 100644
--- a/src/java/org/apache/cassandra/transport/Event.java
+++ b/src/java/org/apache/cassandra/transport/Event.java
@@ -27,7 +27,8 @@ import io.netty.buffer.ByteBuf;
public abstract class Event
{
- public enum Type {
+ public enum Type
+ {
TOPOLOGY_CHANGE(Server.VERSION_3),
STATUS_CHANGE(Server.VERSION_3),
SCHEMA_CHANGE(Server.VERSION_3),
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/transport/Message.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Message.java b/src/java/org/apache/cassandra/transport/Message.java
index 2463306..6f3b0f8 100644
--- a/src/java/org/apache/cassandra/transport/Message.java
+++ b/src/java/org/apache/cassandra/transport/Message.java
@@ -561,8 +561,10 @@ public abstract class Message
// On protocol exception, close the channel as soon as the message have been sent
if (cause instanceof ProtocolException)
{
- future.addListener(new ChannelFutureListener() {
- public void operationComplete(ChannelFuture future) {
+ future.addListener(new ChannelFutureListener()
+ {
+ public void operationComplete(ChannelFuture future)
+ {
ctx.close();
}
});
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/transport/Server.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/transport/Server.java b/src/java/org/apache/cassandra/transport/Server.java
index 3defb4f..267d532 100644
--- a/src/java/org/apache/cassandra/transport/Server.java
+++ b/src/java/org/apache/cassandra/transport/Server.java
@@ -123,7 +123,7 @@ public class Server implements CassandraDaemon.Server
public synchronized void start()
{
- if(isRunning())
+ if(isRunning())
return;
// Configure the server.
@@ -174,12 +174,12 @@ public class Server implements CassandraDaemon.Server
{
return connectionTracker.getConnectedClients();
}
-
+
private void close()
{
// Close opened connections
connectionTracker.closeAll();
-
+
logger.info("Stop listening for CQL clients");
}
@@ -281,7 +281,7 @@ public class Server implements CassandraDaemon.Server
public int getConnectedClients()
{
/*
- - When server is running: allChannels contains all clients' connections (channels)
+ - When server is running: allChannels contains all clients' connections (channels)
plus one additional channel used for the server's own bootstrap.
- When server is stopped: the size is 0
*/
@@ -356,7 +356,8 @@ public class Server implements CassandraDaemon.Server
}
}
- protected final SslHandler createSslHandler() {
+ protected final SslHandler createSslHandler()
+ {
SSLEngine sslEngine = sslContext.createSSLEngine();
sslEngine.setUseClientMode(false);
String[] suites = SSLFactory.filterCipherSuites(sslEngine.getSupportedCipherSuites(), encryptionOptions.cipher_suites);
@@ -467,7 +468,8 @@ public class Server implements CassandraDaemon.Server
private static final InetAddress bindAll;
- static {
+ static
+ {
try
{
bindAll = InetAddress.getByAddress(new byte[4]);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/triggers/CustomClassLoader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/triggers/CustomClassLoader.java b/src/java/org/apache/cassandra/triggers/CustomClassLoader.java
index 965da4b..32a987f 100644
--- a/src/java/org/apache/cassandra/triggers/CustomClassLoader.java
+++ b/src/java/org/apache/cassandra/triggers/CustomClassLoader.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.triggers;
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@ package org.apache.cassandra.triggers;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
@@ -67,8 +67,10 @@ public class CustomClassLoader extends URLClassLoader
{
if (dir == null || !dir.exists())
return;
- FilenameFilter filter = new FilenameFilter() {
- public boolean accept(File dir, String name) {
+ FilenameFilter filter = new FilenameFilter()
+ {
+ public boolean accept(File dir, String name)
+ {
return name.endsWith(".jar");
}
};
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/triggers/ITrigger.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/triggers/ITrigger.java b/src/java/org/apache/cassandra/triggers/ITrigger.java
index d46c036..860d3e9 100644
--- a/src/java/org/apache/cassandra/triggers/ITrigger.java
+++ b/src/java/org/apache/cassandra/triggers/ITrigger.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.triggers;
/*
- *
+ *
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
@@ -8,16 +8,16 @@ package org.apache.cassandra.triggers;
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
- *
+ *
*/
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
index 8cfa3e2..703e69a 100644
--- a/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
+++ b/src/java/org/apache/cassandra/triggers/TriggerExecutor.java
@@ -6,9 +6,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
- *
+ *
* http://www.apache.org/licenses/LICENSE-2.0
- *
+ *
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/utils/Architecture.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/Architecture.java b/src/java/org/apache/cassandra/utils/Architecture.java
index 3173f8e..c18185a 100644
--- a/src/java/org/apache/cassandra/utils/Architecture.java
+++ b/src/java/org/apache/cassandra/utils/Architecture.java
@@ -35,9 +35,9 @@ public final class Architecture
"x86_64",
"s390x"
));
-
+
public static final boolean IS_UNALIGNED = UNALIGNED_ARCH.contains(System.getProperty("os.arch"));
-
+
private Architecture()
{
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/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 7ba5452..9bd203d 100644
--- a/src/java/org/apache/cassandra/utils/BloomCalculations.java
+++ b/src/java/org/apache/cassandra/utils/BloomCalculations.java
@@ -40,7 +40,8 @@ public class BloomCalculations
* Each cell (i,j) the false positive rate determined by using i buckets per
* element and j hash functions.
*/
- static final double[][] probs = new double[][]{
+ static final double[][] probs = new double[][]
+ {
{1.0}, // dummy row representing 0 buckets per element
{1.0, 1.0}, // dummy row representing 1 buckets per element
{1.0, 0.393, 0.400},
@@ -143,10 +144,12 @@ public class BloomCalculations
int maxK = probs[maxBucketsPerElement].length - 1;
// Handle the trivial cases
- if(maxFalsePosProb >= probs[minBuckets][minK]) {
+ if(maxFalsePosProb >= probs[minBuckets][minK])
+ {
return new BloomSpecification(2, optKPerBuckets[2]);
}
- if (maxFalsePosProb < probs[maxBucketsPerElement][maxK]) {
+ if (maxFalsePosProb < probs[maxBucketsPerElement][maxK])
+ {
throw new UnsupportedOperationException(String.format("Unable to satisfy %s with %s buckets per element",
maxFalsePosProb, maxBucketsPerElement));
}
@@ -154,13 +157,15 @@ public class BloomCalculations
// First find the minimal required number of buckets:
int bucketsPerElement = 2;
int K = optKPerBuckets[2];
- while(probs[bucketsPerElement][K] > maxFalsePosProb){
+ while(probs[bucketsPerElement][K] > maxFalsePosProb)
+ {
bucketsPerElement++;
K = optKPerBuckets[bucketsPerElement];
}
// Now that the number of buckets is sufficient, see if we can relax K
// without losing too much precision.
- while(probs[bucketsPerElement][K - 1] <= maxFalsePosProb){
+ while(probs[bucketsPerElement][K - 1] <= maxFalsePosProb)
+ {
K--;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java b/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
index cb4fc1d..fb1a9ec 100644
--- a/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
+++ b/src/java/org/apache/cassandra/utils/ByteBufferUtil.java
@@ -514,7 +514,8 @@ public class ByteBufferUtil
*/
public static String bytesToHex(ByteBuffer bytes)
{
- if (bytes.hasArray()) {
+ if (bytes.hasArray())
+ {
return Hex.bytesToHex(bytes.array(), bytes.arrayOffset() + bytes.position(), bytes.remaining());
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/CoalescingStrategies.java b/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
index 7dba97b..66f8912 100644
--- a/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
+++ b/src/java/org/apache/cassandra/utils/CoalescingStrategies.java
@@ -48,7 +48,8 @@ public class CoalescingStrategies
private static final String DEBUG_COALESCING_PATH_PROPERTY = Config.PROPERTY_PREFIX + "coalescing_debug_path";
private static final String DEBUG_COALESCING_PATH = System.getProperty(DEBUG_COALESCING_PATH_PROPERTY, "/tmp/coleascing_debug");
- static {
+ static
+ {
if (DEBUG_COALESCING)
{
File directory = new File(DEBUG_COALESCING_PATH);
@@ -76,7 +77,8 @@ public class CoalescingStrategies
}
};
- public static interface Coalescable {
+ public static interface Coalescable
+ {
long timestampNanos();
}
@@ -124,10 +126,13 @@ public class CoalescingStrategies
this.displayName = displayName;
if (DEBUG_COALESCING)
{
- new Thread(displayName + " debug thread") {
+ new Thread(displayName + " debug thread")
+ {
@Override
- public void run() {
- while (true) {
+ public void run()
+ {
+ while (true)
+ {
try
{
Thread.sleep(5000);
@@ -189,9 +194,12 @@ public class CoalescingStrategies
* If debugging is enabled log the timestamps of all the items in the provided collection
* to a file.
*/
- final protected <C extends Coalescable> void debugTimestamps(Collection<C> coalescables) {
- if (DEBUG_COALESCING) {
- for (C coalescable : coalescables) {
+ final protected <C extends Coalescable> void debugTimestamps(Collection<C> coalescables)
+ {
+ if (DEBUG_COALESCING)
+ {
+ for (C coalescable : coalescables)
+ {
debugTimestamp(coalescable.timestampNanos());
}
}
@@ -350,7 +358,8 @@ public class CoalescingStrategies
}
@Override
- public String toString() {
+ public String toString()
+ {
return "Time horizon moving average";
}
}
@@ -425,7 +434,8 @@ public class CoalescingStrategies
}
@Override
- public String toString() {
+ public String toString()
+ {
return "Moving average";
}
}
@@ -457,7 +467,8 @@ public class CoalescingStrategies
}
@Override
- public String toString() {
+ public String toString()
+ {
return "Fixed";
}
}
@@ -486,7 +497,8 @@ public class CoalescingStrategies
}
@Override
- public String toString() {
+ public String toString()
+ {
return "Disabled";
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
index 8109c98..0914a58 100644
--- a/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
+++ b/src/java/org/apache/cassandra/utils/EstimatedHistogram.java
@@ -372,7 +372,8 @@ public class EstimatedHistogram
long[] offsets = new long[size - 1];
long[] buckets = new long[size];
- for (int i = 0; i < size; i++) {
+ for (int i = 0; i < size; i++)
+ {
offsets[i == 0 ? 0 : i - 1] = in.readLong();
buckets[i] = in.readLong();
}