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:41 UTC
[4/4] cassandra git commit: simple formatting fixes (braces)
simple formatting fixes (braces)
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/68d25266
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/68d25266
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/68d25266
Branch: refs/heads/trunk
Commit: 68d252663537c9eb014501b342b52bbfa3848ba3
Parents: 9ccccf2
Author: Dave Brosius <db...@mebigfatguy.com>
Authored: Tue Aug 30 00:46:49 2016 -0400
Committer: Dave Brosius <db...@mebigfatguy.com>
Committed: Tue Aug 30 00:47:19 2016 -0400
----------------------------------------------------------------------
.../apache/cassandra/cache/AutoSavingCache.java | 3 +-
.../org/apache/cassandra/cache/ChunkCache.java | 4 +-
.../cassandra/cache/IMeasurableMemory.java | 8 +-
.../concurrent/SharedExecutorPool.java | 8 +-
.../org/apache/cassandra/config/CFMetaData.java | 4 +-
.../cassandra/config/DatabaseDescriptor.java | 8 +-
.../org/apache/cassandra/config/Schema.java | 3 +-
.../apache/cassandra/config/ViewDefinition.java | 4 +-
.../apache/cassandra/cql3/QueryProcessor.java | 3 +-
.../ClusteringColumnRestrictions.java | 3 +-
.../cassandra/cql3/restrictions/TermSlice.java | 6 +-
.../cassandra/cql3/selection/Selectable.java | 2 +-
.../cassandra/cql3/selection/Selection.java | 4 +-
.../cassandra/cql3/selection/Selector.java | 4 +-
.../cql3/statements/CreateViewStatement.java | 3 +-
.../org/apache/cassandra/db/ColumnIndex.java | 3 +-
.../org/apache/cassandra/db/Directories.java | 5 +-
src/java/org/apache/cassandra/db/Memtable.java | 3 +-
.../org/apache/cassandra/db/RowIndexEntry.java | 3 +-
.../columniterator/AbstractSSTableIterator.java | 8 +-
.../columniterator/SSTableReversedIterator.java | 2 +-
.../AbstractCommitLogSegmentManager.java | 7 +-
.../db/commitlog/CommitLogArchiver.java | 11 +-
.../db/commitlog/CommitLogDescriptor.java | 9 +-
.../db/commitlog/CommitLogReplayer.java | 4 +-
.../db/commitlog/CommitLogSegment.java | 3 +-
.../cassandra/db/commitlog/IntervalSet.java | 6 +-
.../db/commitlog/MemoryMappedSegment.java | 3 +-
.../db/commitlog/SimpleCachedBufferPool.java | 6 +-
.../CompactionHistoryTabularData.java | 3 +-
.../db/compaction/CompactionManager.java | 3 +-
.../DateTieredCompactionStrategy.java | 3 +-
.../compaction/LeveledCompactionStrategy.java | 14 +-
.../db/compaction/SSTableSplitter.java | 4 +-
.../db/marshal/DynamicCompositeType.java | 3 +-
.../cassandra/dht/ByteOrderedPartitioner.java | 3 +-
.../apache/cassandra/dht/RandomPartitioner.java | 15 +-
.../org/apache/cassandra/gms/EchoMessage.java | 12 +-
src/java/org/apache/cassandra/gms/Gossiper.java | 7 +-
.../apache/cassandra/hadoop/HadoopCompat.java | 117 ++++--
.../cassandra/hadoop/ReporterWrapper.java | 30 +-
.../cassandra/hadoop/cql3/CqlConfigHelper.java | 6 +-
.../cassandra/hadoop/cql3/CqlRecordReader.java | 3 +-
.../sasi/analyzer/StandardTokenizerOptions.java | 3 +-
.../sasi/analyzer/filter/StemmerFactory.java | 3 +-
.../sasi/disk/AbstractTokenTreeBuilder.java | 6 +-
.../sasi/utils/trie/AbstractPatriciaTrie.java | 359 ++++++++---------
.../index/sasi/utils/trie/AbstractTrie.java | 69 ++--
.../cassandra/index/sasi/utils/trie/Cursor.java | 32 +-
.../index/sasi/utils/trie/KeyAnalyzer.java | 18 +-
.../index/sasi/utils/trie/PatriciaTrie.java | 396 +++++++++----------
.../cassandra/index/sasi/utils/trie/Trie.java | 94 ++---
.../cassandra/index/sasi/utils/trie/Tries.java | 16 +-
.../cassandra/io/sstable/CQLSSTableWriter.java | 3 +-
.../io/sstable/format/SSTableReader.java | 3 +-
.../io/util/DataIntegrityMetadata.java | 3 +-
.../io/util/FastByteArrayInputStream.java | 45 ++-
.../apache/cassandra/io/util/FileHandle.java | 3 +-
.../org/apache/cassandra/io/util/Memory.java | 46 ++-
.../io/util/RebufferingInputStream.java | 4 +-
.../io/util/RewindableDataInputStreamPlus.java | 8 +-
.../cassandra/locator/CloudstackSnitch.java | 42 +-
.../locator/DynamicEndpointSnitchMBean.java | 3 +-
.../cassandra/locator/SnitchProperties.java | 4 +-
.../metrics/CASClientRequestMetrics.java | 3 +-
.../cassandra/metrics/CompactionMetrics.java | 3 +-
.../DecayingEstimatedHistogramReservoir.java | 18 +-
.../cassandra/metrics/KeyspaceMetrics.java | 10 +-
.../cassandra/metrics/RestorableMeter.java | 64 ++-
.../cassandra/metrics/ViewWriteMetrics.java | 3 +-
.../apache/cassandra/net/MessagingService.java | 6 +-
.../repair/SystemDistributedKeyspace.java | 4 +-
.../cassandra/schema/CompressionParams.java | 5 +-
.../cassandra/schema/LegacySchemaMigrator.java | 8 +-
.../serializers/TimestampSerializer.java | 11 +-
.../cassandra/serializers/UTF8Serializer.java | 3 +-
.../service/AbstractWriteResponseHandler.java | 8 +-
.../cassandra/service/CassandraDaemon.java | 16 +-
.../apache/cassandra/service/ClientWarn.java | 6 +-
.../cassandra/service/EchoVerbHandler.java | 8 +-
.../apache/cassandra/service/StorageProxy.java | 11 +-
.../cassandra/service/StorageService.java | 14 +-
.../cassandra/service/StorageServiceMBean.java | 8 +-
.../management/ProgressInfoCompositeData.java | 3 +-
.../SessionCompleteEventCompositeData.java | 3 +-
.../management/SessionInfoCompositeData.java | 3 +-
.../management/StreamEventJMXNotifier.java | 7 +-
.../management/StreamStateCompositeData.java | 3 +-
.../management/StreamSummaryCompositeData.java | 3 +-
.../cassandra/thrift/CassandraServer.java | 9 +-
.../thrift/CustomTNonBlockingServer.java | 6 +-
.../thrift/CustomTThreadPoolServer.java | 3 +-
.../apache/cassandra/thrift/TCustomSocket.java | 96 +++--
.../cassandra/tools/AbstractJmxClient.java | 10 +-
.../org/apache/cassandra/tracing/Tracing.java | 3 +-
.../apache/cassandra/tracing/TracingImpl.java | 3 +-
.../org/apache/cassandra/transport/CBUtil.java | 9 +-
.../org/apache/cassandra/transport/Client.java | 3 +-
.../org/apache/cassandra/transport/Event.java | 3 +-
.../org/apache/cassandra/transport/Message.java | 6 +-
.../org/apache/cassandra/transport/Server.java | 14 +-
.../cassandra/triggers/CustomClassLoader.java | 14 +-
.../org/apache/cassandra/triggers/ITrigger.java | 8 +-
.../cassandra/triggers/TriggerExecutor.java | 4 +-
.../apache/cassandra/utils/Architecture.java | 4 +-
.../cassandra/utils/BloomCalculations.java | 15 +-
.../apache/cassandra/utils/ByteBufferUtil.java | 3 +-
.../cassandra/utils/CoalescingStrategies.java | 36 +-
.../cassandra/utils/EstimatedHistogram.java | 3 +-
.../org/apache/cassandra/utils/FBUtilities.java | 14 +-
.../cassandra/utils/FastByteOperations.java | 3 +-
.../apache/cassandra/utils/GuidGenerator.java | 24 +-
src/java/org/apache/cassandra/utils/Hex.java | 3 +-
.../apache/cassandra/utils/IntegerInterval.java | 4 +-
.../apache/cassandra/utils/JMXServerUtils.java | 3 +-
.../cassandra/utils/JVMStabilityInspector.java | 3 +-
.../org/apache/cassandra/utils/MerkleTrees.java | 34 +-
.../apache/cassandra/utils/NoSpamLogger.java | 6 +-
.../org/apache/cassandra/utils/ObjectSizes.java | 8 +-
.../org/apache/cassandra/utils/UUIDGen.java | 3 +-
.../cassandra/utils/btree/BTreeRemoval.java | 9 +-
.../apache/cassandra/utils/concurrent/Ref.java | 3 +-
.../cassandra/utils/memory/BufferPool.java | 3 +-
.../org/apache/cassandra/utils/obs/BitUtil.java | 112 ++++--
.../apache/cassandra/utils/obs/OpenBitSet.java | 112 ++++--
.../apache/cassandra/utils/vint/VIntCoding.java | 27 +-
126 files changed, 1375 insertions(+), 1002 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/cache/AutoSavingCache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/AutoSavingCache.java b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
index d7b30fe..4d934f5 100644
--- a/src/java/org/apache/cassandra/cache/AutoSavingCache.java
+++ b/src/java/org/apache/cassandra/cache/AutoSavingCache.java
@@ -164,7 +164,8 @@ public class AutoSavingCache<K extends CacheKey, V> extends InstrumentingCache<K
return loadSaved();
}
});
- cacheLoad.addListener(new Runnable() {
+ cacheLoad.addListener(new Runnable()
+ {
@Override
public void run()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/cache/ChunkCache.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/ChunkCache.java b/src/java/org/apache/cassandra/cache/ChunkCache.java
index d91d9fd..15cf2ce 100644
--- a/src/java/org/apache/cassandra/cache/ChunkCache.java
+++ b/src/java/org/apache/cassandra/cache/ChunkCache.java
@@ -36,7 +36,7 @@ import org.apache.cassandra.io.util.*;
import org.apache.cassandra.metrics.CacheMissMetrics;
import org.apache.cassandra.utils.memory.BufferPool;
-public class ChunkCache
+public class ChunkCache
implements CacheLoader<ChunkCache.Key, ChunkCache.Buffer>, RemovalListener<ChunkCache.Key, ChunkCache.Buffer>, CacheSize
{
public static final int RESERVED_POOL_SPACE_IN_MB = 32;
@@ -106,7 +106,7 @@ public class ChunkCache
{
refCount = references.get();
if (refCount == 0)
- // Buffer was released before we managed to reference it.
+ // Buffer was released before we managed to reference it.
return null;
} while (!references.compareAndSet(refCount, refCount + 1));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/cache/IMeasurableMemory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cache/IMeasurableMemory.java b/src/java/org/apache/cassandra/cache/IMeasurableMemory.java
index 149bff6..df79d36 100644
--- a/src/java/org/apache/cassandra/cache/IMeasurableMemory.java
+++ b/src/java/org/apache/cassandra/cache/IMeasurableMemory.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.cache;
/*
- *
+ *
* 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.cache;
* 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/concurrent/SharedExecutorPool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/concurrent/SharedExecutorPool.java b/src/java/org/apache/cassandra/concurrent/SharedExecutorPool.java
index dfd7011..3b0600f 100644
--- a/src/java/org/apache/cassandra/concurrent/SharedExecutorPool.java
+++ b/src/java/org/apache/cassandra/concurrent/SharedExecutorPool.java
@@ -34,7 +34,7 @@ import static org.apache.cassandra.concurrent.SEPWorker.Work;
* To keep producers from incurring unnecessary delays, once an executor is "spun up" (i.e. is processing tasks at a steady
* rate), adding tasks to the executor often involves only placing the task on the work queue and updating the
* task permits (which imposes our max queue length constraints). Only when it cannot be guaranteed the task will be serviced
- * promptly, and the maximum concurrency has not been reached, does the producer have to schedule a thread itself to perform
+ * promptly, and the maximum concurrency has not been reached, does the producer have to schedule a thread itself to perform
* the work ('promptly' in this context means we already have a worker spinning for work, as described next).
*
* Otherwise the worker threads schedule themselves: when they are assigned a task, they will attempt to spawn
@@ -44,11 +44,11 @@ import static org.apache.cassandra.concurrent.SEPWorker.Work;
* random interval (based upon the number of threads in this mode, so that the total amount of non-sleeping time remains
* approximately fixed regardless of the number of spinning threads), and upon waking will again try to assign itself to
* an executor with outstanding tasks to perform. As a result of always scheduling a partner before committing to performing
- * any work, with a steady state of task arrival we should generally have either one spinning worker ready to promptly respond
+ * any work, with a steady state of task arrival we should generally have either one spinning worker ready to promptly respond
* to incoming work, or all possible workers actively committed to tasks.
- *
+ *
* In order to prevent this executor pool acting like a noisy neighbour to other processes on the system, workers also deschedule
- * themselves when it is detected that there are too many for the current rate of operation arrival. This is decided as a function
+ * themselves when it is detected that there are too many for the current rate of operation arrival. This is decided as a function
* of the total time spent spinning by all workers in an interval; as more workers spin, workers are descheduled more rapidly.
*/
public class SharedExecutorPool
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/config/CFMetaData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/CFMetaData.java b/src/java/org/apache/cassandra/config/CFMetaData.java
index 90d8b58..53959c0 100644
--- a/src/java/org/apache/cassandra/config/CFMetaData.java
+++ b/src/java/org/apache/cassandra/config/CFMetaData.java
@@ -33,7 +33,6 @@ import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Maps;
-import com.google.common.collect.Iterators;
import com.google.common.collect.Sets;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.builder.HashCodeBuilder;
@@ -856,7 +855,8 @@ public final class CFMetaData
return columnMetadata.get(name);
}
- public static boolean isNameValid(String name) {
+ public static boolean isNameValid(String name)
+ {
return name != null && !name.isEmpty()
&& name.length() <= SchemaConstants.NAME_LENGTH && PATTERN_WORD_CHARS.matcher(name).matches();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/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 8e45731..4568649 100644
--- a/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
+++ b/src/java/org/apache/cassandra/config/DatabaseDescriptor.java
@@ -1738,7 +1738,8 @@ public class DatabaseDescriptor
conf.native_transport_max_concurrent_connections = nativeTransportMaxConcurrentConnections;
}
- public static Long getNativeTransportMaxConcurrentConnectionsPerIp() {
+ public static Long getNativeTransportMaxConcurrentConnectionsPerIp()
+ {
return conf.native_transport_max_concurrent_connections_per_ip;
}
@@ -1826,7 +1827,8 @@ public class DatabaseDescriptor
return conf.snapshot_before_compaction;
}
- public static boolean isAutoSnapshot() {
+ public static boolean isAutoSnapshot()
+ {
return conf.auto_snapshot;
}
@@ -2288,7 +2290,7 @@ public class DatabaseDescriptor
{
return encryptionContext;
}
-
+
public static long getGCWarnThreshold()
{
return conf.gc_warn_threshold_in_ms;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/config/Schema.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/Schema.java b/src/java/org/apache/cassandra/config/Schema.java
index d01d862..c6fc2a8 100644
--- a/src/java/org/apache/cassandra/config/Schema.java
+++ b/src/java/org/apache/cassandra/config/Schema.java
@@ -141,7 +141,8 @@ public class Schema
* @param ksNameAndCFName
* @return The named CFS or null if the keyspace, base table, or index don't exist
*/
- public ColumnFamilyStore getColumnFamilyStoreIncludingIndexes(Pair<String, String> ksNameAndCFName) {
+ public ColumnFamilyStore getColumnFamilyStoreIncludingIndexes(Pair<String, String> ksNameAndCFName)
+ {
String ksName = ksNameAndCFName.left;
String cfName = ksNameAndCFName.right;
Pair<String, String> baseTable;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/config/ViewDefinition.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/config/ViewDefinition.java b/src/java/org/apache/cassandra/config/ViewDefinition.java
index 33cc175..77cbcc9 100644
--- a/src/java/org/apache/cassandra/config/ViewDefinition.java
+++ b/src/java/org/apache/cassandra/config/ViewDefinition.java
@@ -130,8 +130,8 @@ public class ViewDefinition
/**
* Replace the column 'from' with 'to' in this materialized view definition's partition,
* clustering, or included columns.
- * @param from the existing column
- * @param to the new column
+ * @param from the existing column
+ * @param to the new column
*/
public void renameColumn(ColumnIdentifier from, ColumnIdentifier to)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/cql3/QueryProcessor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/QueryProcessor.java b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
index 4baa38c..c91105e 100644
--- a/src/java/org/apache/cassandra/cql3/QueryProcessor.java
+++ b/src/java/org/apache/cassandra/cql3/QueryProcessor.java
@@ -622,7 +622,8 @@ public class QueryProcessor implements QueryHandler
while (iterator.hasNext())
{
Map.Entry<MD5Digest, ParsedStatement.Prepared> entry = iterator.next();
- if (shouldInvalidate(ksName, cfName, entry.getValue().statement)) {
+ if (shouldInvalidate(ksName, cfName, entry.getValue().statement))
+ {
SystemKeyspace.removePreparedStatement(entry.getKey());
iterator.remove();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictions.java b/src/java/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictions.java
index 8e2d744..ed0d325 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictions.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/ClusteringColumnRestrictions.java
@@ -218,7 +218,8 @@ final class ClusteringColumnRestrictions extends RestrictionSetWrapper
}
}
- private boolean handleInFilter(SingleRestriction restriction, int index) {
+ private boolean handleInFilter(SingleRestriction restriction, int index)
+ {
return restriction.isContains() || restriction.isLIKE() || index != restriction.getFirstColumn().position();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/cql3/restrictions/TermSlice.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/restrictions/TermSlice.java b/src/java/org/apache/cassandra/cql3/restrictions/TermSlice.java
index ac66b96..d6543b8 100644
--- a/src/java/org/apache/cassandra/cql3/restrictions/TermSlice.java
+++ b/src/java/org/apache/cassandra/cql3/restrictions/TermSlice.java
@@ -62,7 +62,7 @@ final class TermSlice
*/
public static TermSlice newInstance(Bound bound, boolean include, Term term)
{
- return bound.isStart() ? new TermSlice(term, include, null, false)
+ return bound.isStart() ? new TermSlice(term, include, null, false)
: new TermSlice(null, false, term, include);
}
@@ -112,14 +112,14 @@ final class TermSlice
{
assert !otherSlice.hasBound(Bound.START);
- return new TermSlice(bound(Bound.START),
+ return new TermSlice(bound(Bound.START),
isInclusive(Bound.START),
otherSlice.bound(Bound.END),
otherSlice.isInclusive(Bound.END));
}
assert !otherSlice.hasBound(Bound.END);
- return new TermSlice(otherSlice.bound(Bound.START),
+ return new TermSlice(otherSlice.bound(Bound.START),
otherSlice.isInclusive(Bound.START),
bound(Bound.END),
isInclusive(Bound.END));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/cql3/selection/Selectable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/selection/Selectable.java b/src/java/org/apache/cassandra/cql3/selection/Selectable.java
index fa78042..80e2ae8 100644
--- a/src/java/org/apache/cassandra/cql3/selection/Selectable.java
+++ b/src/java/org/apache/cassandra/cql3/selection/Selectable.java
@@ -150,7 +150,7 @@ public interface Selectable extends AssignmentTestable
{
return rawTerm.getExactTypeIfKnown(keyspace);
}
-
+
@Override
public String toString()
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/cql3/selection/Selection.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/selection/Selection.java b/src/java/org/apache/cassandra/cql3/selection/Selection.java
index 2081f8a..f43cb94 100644
--- a/src/java/org/apache/cassandra/cql3/selection/Selection.java
+++ b/src/java/org/apache/cassandra/cql3/selection/Selection.java
@@ -77,7 +77,7 @@ public abstract class Selection
public boolean isWildcard()
{
return false;
- }
+ }
/**
* Checks if this selection contains static columns.
@@ -249,7 +249,7 @@ public abstract class Selection
public ResultSetBuilder resultSetBuilder(QueryOptions options, boolean isJson, AggregationSpecification aggregationSpec)
{
- return aggregationSpec == null ? new ResultSetBuilder(options, isJson)
+ return aggregationSpec == null ? new ResultSetBuilder(options, isJson)
: new ResultSetBuilder(options, isJson, aggregationSpec.newGroupMaker());
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/cql3/selection/Selector.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/selection/Selector.java b/src/java/org/apache/cassandra/cql3/selection/Selector.java
index c85dcd1..b38dcbd 100644
--- a/src/java/org/apache/cassandra/cql3/selection/Selector.java
+++ b/src/java/org/apache/cassandra/cql3/selection/Selector.java
@@ -30,9 +30,9 @@ import org.apache.cassandra.db.marshal.AbstractType;
import org.apache.cassandra.exceptions.InvalidRequestException;
/**
- * A <code>Selector</code> is used to convert the data returned by the storage engine into the data requested by the
+ * A <code>Selector</code> is used to convert the data returned by the storage engine into the data requested by the
* user. They correspond to the <selector> elements from the select clause.
- * <p>Since the introduction of aggregation, <code>Selector</code>s cannot be called anymore by multiple threads
+ * <p>Since the introduction of aggregation, <code>Selector</code>s cannot be called anymore by multiple threads
* as they have an internal state.</p>
*/
public abstract class Selector
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java b/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java
index e25045e..5f2ba71 100644
--- a/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java
+++ b/src/java/org/apache/cassandra/cql3/statements/CreateViewStatement.java
@@ -86,7 +86,8 @@ public class CreateViewStatement extends SchemaAlteringStatement
// We do validation in announceMigration to reduce doubling up of work
}
- private interface AddColumn {
+ private interface AddColumn
+ {
void add(ColumnIdentifier identifier, AbstractType<?> type);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/ColumnIndex.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/ColumnIndex.java b/src/java/org/apache/cassandra/db/ColumnIndex.java
index 9cea084..1116cc2 100644
--- a/src/java/org/apache/cassandra/db/ColumnIndex.java
+++ b/src/java/org/apache/cassandra/db/ColumnIndex.java
@@ -221,7 +221,8 @@ public class ColumnIndex
private DataOutputBuffer useBuffer()
{
- if (reusableBuffer != null) {
+ if (reusableBuffer != null)
+ {
buffer = reusableBuffer;
buffer.clear();
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/Directories.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Directories.java b/src/java/org/apache/cassandra/db/Directories.java
index 434eb4e..e0e1c08 100644
--- a/src/java/org/apache/cassandra/db/Directories.java
+++ b/src/java/org/apache/cassandra/db/Directories.java
@@ -146,7 +146,8 @@ public class Directories
{
boolean privilege = false;
- switch (action) {
+ switch (action)
+ {
case X:
privilege = file.canExecute();
break;
@@ -1028,7 +1029,7 @@ public class Directories
for (int i = 0; i < locations.length; ++i)
dataDirectories[i] = new DataDirectory(new File(locations[i]));
}
-
+
private class SSTableSizeSummer extends DirectorySizeCalculator
{
private final HashSet<File> toSkip;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/Memtable.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/Memtable.java b/src/java/org/apache/cassandra/db/Memtable.java
index f8b258c..6bf7db4 100644
--- a/src/java/org/apache/cassandra/db/Memtable.java
+++ b/src/java/org/apache/cassandra/db/Memtable.java
@@ -115,7 +115,8 @@ public class Memtable implements Comparable<Memtable>
public static final class LastCommitLogPosition extends CommitLogPosition
{
- public LastCommitLogPosition(CommitLogPosition copy) {
+ public LastCommitLogPosition(CommitLogPosition copy)
+ {
super(copy.segmentId, copy.position);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/RowIndexEntry.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/RowIndexEntry.java b/src/java/org/apache/cassandra/db/RowIndexEntry.java
index d030329..317b2bd 100644
--- a/src/java/org/apache/cassandra/db/RowIndexEntry.java
+++ b/src/java/org/apache/cassandra/db/RowIndexEntry.java
@@ -140,7 +140,8 @@ public class RowIndexEntry<T> implements IMeasurableMemory
static final Histogram indexEntrySizeHistogram;
static final Histogram indexInfoCountHistogram;
static final Histogram indexInfoGetsHistogram;
- static {
+ static
+ {
MetricNameFactory factory = new DefaultNameFactory("Index", "RowIndexEntry");
indexEntrySizeHistogram = Metrics.histogram(factory.createMetricName("IndexedEntrySize"), false);
indexInfoCountHistogram = Metrics.histogram(factory.createMetricName("IndexInfoCount"), false);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java b/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java
index cd210e9..f7e614a 100644
--- a/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java
+++ b/src/java/org/apache/cassandra/db/columniterator/AbstractSSTableIterator.java
@@ -375,7 +375,7 @@ public abstract class AbstractSSTableIterator implements UnfilteredRowIterator
return toReturn;
}
- public boolean hasNext()
+ public boolean hasNext()
{
try
{
@@ -619,8 +619,10 @@ public abstract class AbstractSSTableIterator implements UnfilteredRowIterator
return (index < 0 ? -index - (reversed ? 2 : 1) : index);
}
- private int binarySearch(IndexInfo key, Comparator<IndexInfo> c, int low, int high) throws IOException {
- while (low <= high) {
+ private int binarySearch(IndexInfo key, Comparator<IndexInfo> c, int low, int high) throws IOException
+ {
+ while (low <= high)
+ {
int mid = (low + high) >>> 1;
IndexInfo midVal = index(mid);
int cmp = c.compare(midVal, key);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java b/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
index 6ae3743..c74b5db 100644
--- a/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
+++ b/src/java/org/apache/cassandra/db/columniterator/SSTableReversedIterator.java
@@ -287,7 +287,7 @@ public class SSTableReversedIterator extends AbstractSSTableIterator
if (previousBlockIdx < 0 || previousBlockIdx < lastBlockIdx)
return false;
- // The slice start can be in
+ // The slice start can be in
indexState.setToBlock(previousBlockIdx);
readCurrentBlock(false);
setIterator(slice);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
index 04234b1..00ddf44 100644
--- a/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
+++ b/src/java/org/apache/cassandra/db/commitlog/AbstractCommitLogSegmentManager.java
@@ -33,7 +33,6 @@ import net.nicoulaj.compilecommand.annotations.DontInline;
import org.apache.cassandra.config.DatabaseDescriptor;
import org.apache.cassandra.config.Schema;
import org.apache.cassandra.db.*;
-import org.apache.cassandra.io.util.FileUtils;
import org.apache.cassandra.utils.*;
import org.apache.cassandra.utils.concurrent.WaitQueue;
@@ -215,7 +214,8 @@ public abstract class AbstractCommitLogSegmentManager
@DontInline
void advanceAllocatingFrom(CommitLogSegment old)
{
- while (true) {
+ while (true)
+ {
synchronized (this)
{
// do this in a critical section so we can maintain the order of segment construction when moving to allocatingFrom/activeSegments
@@ -464,7 +464,8 @@ public abstract class AbstractCommitLogSegmentManager
private void discardAvailableSegment()
{
CommitLogSegment next = null;
- synchronized (this) {
+ synchronized (this)
+ {
next = availableSegment;
availableSegment = null;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
index 1abdd79..a30ca0e 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogArchiver.java
@@ -1,5 +1,5 @@
/*
- *
+ *
* 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
@@ -7,16 +7,16 @@
* 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.
- *
+ *
*/
package org.apache.cassandra.db.commitlog;
@@ -242,7 +242,8 @@ public class CommitLogArchiver
if (descriptor.version > CommitLogDescriptor.current_version)
throw new IllegalStateException("Unsupported commit log version: " + descriptor.version);
- if (descriptor.compression != null) {
+ if (descriptor.compression != null)
+ {
try
{
CompressionParams.createCompressor(descriptor.compression);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java
index 60c5a39..088d44a 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogDescriptor.java
@@ -104,7 +104,8 @@ public class CommitLogDescriptor
out.putLong(descriptor.id);
updateChecksumInt(crc, (int) (descriptor.id & 0xFFFFFFFFL));
updateChecksumInt(crc, (int) (descriptor.id >>> 32));
- if (descriptor.version >= VERSION_22) {
+ if (descriptor.version >= VERSION_22)
+ {
String parametersString = constructParametersString(descriptor.compression, descriptor.encryptionContext, additionalHeaders);
byte[] parametersBytes = parametersString.getBytes(StandardCharsets.UTF_8);
if (parametersBytes.length != (((short) parametersBytes.length) & 0xFFFF))
@@ -114,7 +115,8 @@ public class CommitLogDescriptor
updateChecksumInt(crc, parametersBytes.length);
out.put(parametersBytes);
crc.update(parametersBytes, 0, parametersBytes.length);
- } else
+ }
+ else
assert descriptor.compression == null;
out.putInt((int) crc.getValue());
}
@@ -160,7 +162,8 @@ public class CommitLogDescriptor
updateChecksumInt(checkcrc, (int) (id & 0xFFFFFFFFL));
updateChecksumInt(checkcrc, (int) (id >>> 32));
int parametersLength = 0;
- if (version >= VERSION_22) {
+ if (version >= VERSION_22)
+ {
parametersLength = input.readShort() & 0xFFFF;
updateChecksumInt(checkcrc, parametersLength);
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
index 32ea0e9..091ef15 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogReplayer.java
@@ -270,9 +270,9 @@ public class CommitLogReplayer implements CommitLogReadHandler
public static CommitLogPosition firstNotCovered(Collection<IntervalSet<CommitLogPosition>> ranges)
{
return ranges.stream()
- .map(intervals -> Iterables.getFirst(intervals.ends(), CommitLogPosition.NONE))
+ .map(intervals -> Iterables.getFirst(intervals.ends(), CommitLogPosition.NONE))
.min(Ordering.natural())
- .get(); // iteration is per known-CF, there must be at least one.
+ .get(); // iteration is per known-CF, there must be at least one.
}
abstract static class ReplayFilter
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
index 357b162..d917884 100644
--- a/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/CommitLogSegment.java
@@ -54,7 +54,8 @@ public abstract class CommitLogSegment
private final static long idBase;
private CDCState cdcState = CDCState.PERMITTED;
- public enum CDCState {
+ public enum CDCState
+ {
PERMITTED,
FORBIDDEN,
CONTAINS
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/commitlog/IntervalSet.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/IntervalSet.java b/src/java/org/apache/cassandra/db/commitlog/IntervalSet.java
index 8d3ec82..371c646 100644
--- a/src/java/org/apache/cassandra/db/commitlog/IntervalSet.java
+++ b/src/java/org/apache/cassandra/db/commitlog/IntervalSet.java
@@ -40,7 +40,7 @@ public class IntervalSet<T extends Comparable<T>>
@SuppressWarnings("unchecked")
public static <T extends Comparable<T>> IntervalSet<T> empty()
{
- return (IntervalSet<T>) EMPTY;
+ return EMPTY;
}
public boolean contains(T position)
@@ -105,7 +105,7 @@ public class IntervalSet<T extends Comparable<T>>
pointSerializer.serialize(en.getValue(), out);
}
}
-
+
public IntervalSet<T> deserialize(DataInputPlus in) throws IOException
{
int count = in.readInt();
@@ -114,7 +114,7 @@ public class IntervalSet<T extends Comparable<T>>
ranges.put(pointSerializer.deserialize(in), pointSerializer.deserialize(in));
return new IntervalSet<T>(ImmutableSortedMap.copyOfSorted(ranges));
}
-
+
public long serializedSize(IntervalSet<T> intervals)
{
long size = TypeSizes.sizeof(intervals.ranges.size());
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java b/src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java
index 94e45e0..cfeae25 100644
--- a/src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java
+++ b/src/java/org/apache/cassandra/db/commitlog/MemoryMappedSegment.java
@@ -91,7 +91,8 @@ public class MemoryMappedSegment extends CommitLogSegment
// we don't chain the crcs here to ensure this method is idempotent if it fails
writeSyncMarker(buffer, startMarker, startMarker, nextMarker);
- try {
+ try
+ {
SyncUtil.force((MappedByteBuffer) buffer);
}
catch (Exception e) // MappedByteBuffer.force() does not declare IOException but can actually throw it
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/commitlog/SimpleCachedBufferPool.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/commitlog/SimpleCachedBufferPool.java b/src/java/org/apache/cassandra/db/commitlog/SimpleCachedBufferPool.java
index bdec3fc..bfc0e32 100644
--- a/src/java/org/apache/cassandra/db/commitlog/SimpleCachedBufferPool.java
+++ b/src/java/org/apache/cassandra/db/commitlog/SimpleCachedBufferPool.java
@@ -80,7 +80,8 @@ public class SimpleCachedBufferPool
public ByteBuffer getThreadLocalReusableBuffer(int size)
{
ByteBuffer result = reusableBufferHolder.get();
- if (result.capacity() < size || BufferType.typeOf(result) != preferredReusableBufferType) {
+ if (result.capacity() < size || BufferType.typeOf(result) != preferredReusableBufferType)
+ {
FileUtils.clean(result);
result = preferredReusableBufferType.allocate(size);
reusableBufferHolder.set(result);
@@ -88,7 +89,8 @@ public class SimpleCachedBufferPool
return result;
}
- public void setPreferredReusableBufferType(BufferType type) {
+ public void setPreferredReusableBufferType(BufferType type)
+ {
preferredReusableBufferType = type;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java b/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java
index be64d44..485f1a0 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionHistoryTabularData.java
@@ -46,7 +46,8 @@ public class CompactionHistoryTabularData
private static final TabularType TABULAR_TYPE;
- static {
+ static
+ {
try
{
ITEM_TYPES = new OpenType[]{ SimpleType.STRING, SimpleType.STRING, SimpleType.STRING, SimpleType.LONG,
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
index f3a5711..39e6efc 100644
--- a/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
+++ b/src/java/org/apache/cassandra/db/compaction/CompactionManager.java
@@ -570,7 +570,8 @@ public class CompactionManager implements CompactionManagerMBean
final Refs<SSTableReader> sstables,
final long repairedAt)
{
- Runnable runnable = new WrappedRunnable() {
+ Runnable runnable = new WrappedRunnable()
+ {
@Override
@SuppressWarnings("resource")
public void runMayThrow() throws Exception
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
index 5442a2d..729ddc0 100644
--- a/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/DateTieredCompactionStrategy.java
@@ -462,7 +462,8 @@ public class DateTieredCompactionStrategy extends AbstractCompactionStrategy
return uncheckedOptions;
}
- public CompactionLogger.Strategy strategyLogger() {
+ public CompactionLogger.Strategy strategyLogger()
+ {
return new CompactionLogger.Strategy()
{
public JsonNode sstable(SSTableReader sstable)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
index 88f9b37..eca87c9 100644
--- a/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
+++ b/src/java/org/apache/cassandra/db/compaction/LeveledCompactionStrategy.java
@@ -56,16 +56,16 @@ public class LeveledCompactionStrategy extends AbstractCompactionStrategy
int configuredMaxSSTableSize = 160;
SizeTieredCompactionStrategyOptions localOptions = new SizeTieredCompactionStrategyOptions(options);
if (options != null)
- {
- if (options.containsKey(SSTABLE_SIZE_OPTION))
- {
- configuredMaxSSTableSize = Integer.parseInt(options.get(SSTABLE_SIZE_OPTION));
- if (!Boolean.getBoolean("cassandra.tolerate_sstable_size"))
- {
+ {
+ if (options.containsKey(SSTABLE_SIZE_OPTION))
+ {
+ configuredMaxSSTableSize = Integer.parseInt(options.get(SSTABLE_SIZE_OPTION));
+ if (!Boolean.getBoolean("cassandra.tolerate_sstable_size"))
+ {
if (configuredMaxSSTableSize >= 1000)
logger.warn("Max sstable size of {}MB is configured for {}.{}; having a unit of compaction this large is probably a bad idea",
configuredMaxSSTableSize, cfs.name, cfs.getColumnFamilyName());
- if (configuredMaxSSTableSize < 50)
+ if (configuredMaxSSTableSize < 50)
logger.warn("Max sstable size of {}MB is configured for {}.{}. Testing done for CASSANDRA-5727 indicates that performance improves up to 160MB",
configuredMaxSSTableSize, cfs.name, cfs.getColumnFamilyName());
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/compaction/SSTableSplitter.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/compaction/SSTableSplitter.java b/src/java/org/apache/cassandra/db/compaction/SSTableSplitter.java
index bd2eda2..626899d 100644
--- a/src/java/org/apache/cassandra/db/compaction/SSTableSplitter.java
+++ b/src/java/org/apache/cassandra/db/compaction/SSTableSplitter.java
@@ -25,8 +25,8 @@ import org.apache.cassandra.db.compaction.writers.MaxSSTableSizeWriter;
import org.apache.cassandra.io.sstable.format.SSTableReader;
import org.apache.cassandra.db.lifecycle.LifecycleTransaction;
-public class SSTableSplitter {
-
+public class SSTableSplitter
+{
private final SplittingCompactionTask task;
private CompactionInfo.Holder info;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java b/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
index 657f126..52a1626 100644
--- a/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
+++ b/src/java/org/apache/cassandra/db/marshal/DynamicCompositeType.java
@@ -123,7 +123,8 @@ public class DynamicCompositeType extends AbstractCompositeType
* If both types are ReversedType(Type), we need to compare on the wrapped type (which may differ between the two types) to avoid
* incompatible comparisons being made.
*/
- if ((comp1 instanceof ReversedType) && (comp2 instanceof ReversedType)) {
+ if ((comp1 instanceof ReversedType) && (comp2 instanceof ReversedType))
+ {
comp1 = ((ReversedType<?>) comp1).baseType;
comp2 = ((ReversedType<?>) comp2).baseType;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java b/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java
index af8983d..d334604 100644
--- a/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/ByteOrderedPartitioner.java
@@ -214,7 +214,8 @@ public class ByteOrderedPartitioner implements IPartitioner
return new BytesToken(buffer);
}
- private final Token.TokenFactory tokenFactory = new Token.TokenFactory() {
+ private final Token.TokenFactory tokenFactory = new Token.TokenFactory()
+ {
public ByteBuffer toByteArray(Token token)
{
BytesToken bytesToken = (BytesToken) token;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/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 c2ec413..c063be3 100644
--- a/src/java/org/apache/cassandra/dht/RandomPartitioner.java
+++ b/src/java/org/apache/cassandra/dht/RandomPartitioner.java
@@ -99,7 +99,8 @@ public class RandomPartitioner implements IPartitioner
return new BigIntegerToken(token);
}
- private final Token.TokenFactory tokenFactory = new Token.TokenFactory() {
+ private final Token.TokenFactory tokenFactory = new Token.TokenFactory()
+ {
public ByteBuffer toByteArray(Token token)
{
BigIntegerToken bigIntegerToken = (BigIntegerToken) token;
@@ -160,7 +161,8 @@ public class RandomPartitioner implements IPartitioner
// convenience method for testing
@VisibleForTesting
- public BigIntegerToken(String token) {
+ public BigIntegerToken(String token)
+ {
this(new BigInteger(token));
}
@@ -192,17 +194,20 @@ public class RandomPartitioner implements IPartitioner
// 0-case
if (!i.hasNext()) { throw new RuntimeException("No nodes present in the cluster. Has this node finished starting up?"); }
// 1-case
- if (sortedTokens.size() == 1) {
+ if (sortedTokens.size() == 1)
+ {
ownerships.put(i.next(), new Float(1.0));
}
// n-case
- else {
+ else
+ {
// NOTE: All divisions must take place in BigDecimals, and all modulo operators must take place in BigIntegers.
final BigInteger ri = MAXIMUM; // (used for addition later)
final BigDecimal r = new BigDecimal(ri); // The entire range, 2**127
Token start = i.next(); BigInteger ti = ((BigIntegerToken)start).token; // The first token and its value
Token t; BigInteger tim1 = ti; // The last token and its value (after loop)
- while (i.hasNext()) {
+ while (i.hasNext())
+ {
t = i.next(); ti = ((BigIntegerToken)t).token; // The next token and its value
float x = new BigDecimal(ti.subtract(tim1).add(ri).mod(ri)).divide(r).floatValue(); // %age = ((T(i) - T(i-1) + R) % R) / R
ownerships.put(t, x); // save (T(i) -> %age)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/gms/EchoMessage.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/gms/EchoMessage.java b/src/java/org/apache/cassandra/gms/EchoMessage.java
index 339750d..2fee889 100644
--- a/src/java/org/apache/cassandra/gms/EchoMessage.java
+++ b/src/java/org/apache/cassandra/gms/EchoMessage.java
@@ -1,6 +1,6 @@
package org.apache.cassandra.gms;
/*
- *
+ *
* 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.gms;
* 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.
- *
+ *
*/
@@ -30,13 +30,13 @@ import org.apache.cassandra.io.util.DataOutputPlus;
public final class EchoMessage
{
public static final EchoMessage instance = new EchoMessage();
-
+
public static final IVersionedSerializer<EchoMessage> serializer = new EchoMessageSerializer();
private EchoMessage()
{
}
-
+
public static class EchoMessageSerializer implements IVersionedSerializer<EchoMessage>
{
public void serialize(EchoMessage t, DataOutputPlus out, int version) throws IOException
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/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 c5d243f..13cc8ab 100644
--- a/src/java/org/apache/cassandra/gms/Gossiper.java
+++ b/src/java/org/apache/cassandra/gms/Gossiper.java
@@ -73,7 +73,8 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
static final List<String> DEAD_STATES = Arrays.asList(VersionedValue.REMOVING_TOKEN, VersionedValue.REMOVED_TOKEN,
VersionedValue.STATUS_LEFT, VersionedValue.HIBERNATE);
static ArrayList<String> SILENT_SHUTDOWN_STATES = new ArrayList<>();
- static {
+ static
+ {
SILENT_SHUTDOWN_STATES.addAll(DEAD_STATES);
SILENT_SHUTDOWN_STATES.add(VersionedValue.STATUS_BOOTSTRAPPING);
}
@@ -635,7 +636,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
private boolean sendGossip(MessageOut<GossipDigestSyn> message, Set<InetAddress> epSet)
{
List<InetAddress> liveEndpoints = ImmutableList.copyOf(epSet);
-
+
int size = liveEndpoints.size();
if (size < 1)
return false;
@@ -1199,7 +1200,7 @@ public class Gossiper implements IFailureDetectionEventListener, GossiperMBean
for (Entry<ApplicationState, VersionedValue> remoteEntry : remoteStates)
doOnChangeNotifications(addr, remoteEntry.getKey(), remoteEntry.getValue());
}
-
+
// notify that a local application state is going to change (doesn't get triggered for remote changes)
private void doBeforeChangeNotifications(InetAddress addr, EndpointState epState, ApplicationState apState, VersionedValue newValue)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/hadoop/HadoopCompat.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/HadoopCompat.java b/src/java/org/apache/cassandra/hadoop/HadoopCompat.java
index bcfb952..479f948 100644
--- a/src/java/org/apache/cassandra/hadoop/HadoopCompat.java
+++ b/src/java/org/apache/cassandra/hadoop/HadoopCompat.java
@@ -45,7 +45,8 @@ import org.apache.hadoop.mapreduce.TaskInputOutputContext;
* Utility methods to allow applications to deal with inconsistencies between
* MapReduce Context Objects API between Hadoop 1.x and 2.x.
*/
-public class HadoopCompat {
+public class HadoopCompat
+{
private static final boolean useV21;
@@ -64,12 +65,15 @@ public class HadoopCompat {
private static final Method GET_TASK_ATTEMPT_ID;
private static final Method PROGRESS_METHOD;
- static {
+ static
+ {
boolean v21 = true;
final String PACKAGE = "org.apache.hadoop.mapreduce";
- try {
+ try
+ {
Class.forName(PACKAGE + ".task.JobContextImpl");
- } catch (ClassNotFoundException cnfe) {
+ } catch (ClassNotFoundException cnfe)
+ {
v21 = false;
}
useV21 = v21;
@@ -78,8 +82,10 @@ public class HadoopCompat {
Class<?> taskIOContextCls;
Class<?> mapContextCls;
Class<?> genericCounterCls;
- try {
- if (v21) {
+ try
+ {
+ if (v21)
+ {
jobContextCls =
Class.forName(PACKAGE+".task.JobContextImpl");
taskContextCls =
@@ -88,7 +94,9 @@ public class HadoopCompat {
Class.forName(PACKAGE+".task.TaskInputOutputContextImpl");
mapContextCls = Class.forName(PACKAGE + ".task.MapContextImpl");
genericCounterCls = Class.forName(PACKAGE+".counters.GenericCounter");
- } else {
+ }
+ else
+ {
jobContextCls =
Class.forName(PACKAGE+".JobContext");
taskContextCls =
@@ -100,10 +108,12 @@ public class HadoopCompat {
Class.forName("org.apache.hadoop.mapred.Counters$Counter");
}
- } catch (ClassNotFoundException e) {
+ } catch (ClassNotFoundException e)
+ {
throw new IllegalArgumentException("Can't find class", e);
}
- try {
+ try
+ {
JOB_CONTEXT_CONSTRUCTOR =
jobContextCls.getConstructor(Configuration.class, JobID.class);
JOB_CONTEXT_CONSTRUCTOR.setAccessible(true);
@@ -117,7 +127,8 @@ public class HadoopCompat {
Long.TYPE);
GENERIC_COUNTER_CONSTRUCTOR.setAccessible(true);
- if (useV21) {
+ if (useV21)
+ {
MAP_CONTEXT_CONSTRUCTOR =
mapContextCls.getDeclaredConstructor(Configuration.class,
TaskAttemptID.class,
@@ -127,15 +138,20 @@ public class HadoopCompat {
StatusReporter.class,
InputSplit.class);
Method get_counter;
- try {
+ try
+ {
get_counter = Class.forName(PACKAGE + ".TaskAttemptContext").getMethod("getCounter", String.class,
String.class);
- } catch (Exception e) {
+ }
+ catch (Exception e)
+ {
get_counter = Class.forName(PACKAGE + ".TaskInputOutputContext").getMethod("getCounter",
String.class, String.class);
}
GET_COUNTER_METHOD = get_counter;
- } else {
+ }
+ else
+ {
MAP_CONTEXT_CONSTRUCTOR =
mapContextCls.getConstructor(Configuration.class,
TaskAttemptID.class,
@@ -163,13 +179,21 @@ public class HadoopCompat {
PROGRESS_METHOD = Class.forName(PACKAGE+".TaskAttemptContext")
.getMethod("progress");
- } catch (SecurityException e) {
+ }
+ catch (SecurityException e)
+ {
throw new IllegalArgumentException("Can't run constructor ", e);
- } catch (NoSuchMethodException e) {
+ }
+ catch (NoSuchMethodException e)
+ {
throw new IllegalArgumentException("Can't find constructor ", e);
- } catch (NoSuchFieldException e) {
+ }
+ catch (NoSuchFieldException e)
+ {
throw new IllegalArgumentException("Can't find field ", e);
- } catch (ClassNotFoundException e) {
+ }
+ catch (ClassNotFoundException e)
+ {
throw new IllegalArgumentException("Can't find class", e);
}
}
@@ -177,18 +201,27 @@ public class HadoopCompat {
/**
* True if runtime Hadoop version is 2.x, false otherwise.
*/
- public static boolean isVersion2x() {
+ public static boolean isVersion2x()
+ {
return useV21;
}
- private static Object newInstance(Constructor<?> constructor, Object...args) {
- try {
+ private static Object newInstance(Constructor<?> constructor, Object...args)
+ {
+ try
+ {
return constructor.newInstance(args);
- } catch (InstantiationException e) {
+ }
+ catch (InstantiationException e)
+ {
throw new IllegalArgumentException("Can't instantiate " + constructor, e);
- } catch (IllegalAccessException e) {
+ }
+ catch (IllegalAccessException e)
+ {
throw new IllegalArgumentException("Can't instantiate " + constructor, e);
- } catch (InvocationTargetException e) {
+ }
+ catch (InvocationTargetException e)
+ {
throw new IllegalArgumentException("Can't instantiate " + constructor, e);
}
}
@@ -230,11 +263,15 @@ public class HadoopCompat {
* @return with Hadoop 2 : <code>new GenericCounter(args)</code>,<br>
* with Hadoop 1 : <code>new Counter(args)</code>
*/
- public static Counter newGenericCounter(String name, String displayName, long value) {
- try {
+ public static Counter newGenericCounter(String name, String displayName, long value)
+ {
+ try
+ {
return (Counter)
GENERIC_COUNTER_CONSTRUCTOR.newInstance(name, displayName, value);
- } catch (InstantiationException | IllegalAccessException | InvocationTargetException e) {
+ }
+ catch (InstantiationException | IllegalAccessException | InvocationTargetException e)
+ {
throw new IllegalArgumentException("Can't instantiate Counter", e);
}
}
@@ -242,10 +279,14 @@ public class HadoopCompat {
/**
* Invokes a method and rethrows any exception as runtime excetpions.
*/
- private static Object invoke(Method method, Object obj, Object... args) {
- try {
+ private static Object invoke(Method method, Object obj, Object... args)
+ {
+ try
+ {
return method.invoke(obj, args);
- } catch (IllegalAccessException | InvocationTargetException e) {
+ }
+ catch (IllegalAccessException | InvocationTargetException e)
+ {
throw new IllegalArgumentException("Can't invoke method " + method.getName(), e);
}
}
@@ -254,7 +295,8 @@ public class HadoopCompat {
* Invoke getConfiguration() on JobContext. Works with both
* Hadoop 1 and 2.
*/
- public static Configuration getConfiguration(JobContext context) {
+ public static Configuration getConfiguration(JobContext context)
+ {
return (Configuration) invoke(GET_CONFIGURATION_METHOD, context);
}
@@ -262,7 +304,8 @@ public class HadoopCompat {
* Invoke setStatus() on TaskAttemptContext. Works with both
* Hadoop 1 and 2.
*/
- public static void setStatus(TaskAttemptContext context, String status) {
+ public static void setStatus(TaskAttemptContext context, String status)
+ {
invoke(SET_STATUS_METHOD, context, status);
}
@@ -270,7 +313,8 @@ public class HadoopCompat {
* returns TaskAttemptContext.getTaskAttemptID(). Works with both
* Hadoop 1 and 2.
*/
- public static TaskAttemptID getTaskAttemptID(TaskAttemptContext taskContext) {
+ public static TaskAttemptID getTaskAttemptID(TaskAttemptContext taskContext)
+ {
return (TaskAttemptID) invoke(GET_TASK_ATTEMPT_ID, taskContext);
}
@@ -279,7 +323,8 @@ public class HadoopCompat {
* Hadoop 1 and 2.
*/
public static Counter getCounter(TaskInputOutputContext context,
- String groupName, String counterName) {
+ String groupName, String counterName)
+ {
return (Counter) invoke(GET_COUNTER_METHOD, context, groupName, counterName);
}
@@ -287,14 +332,16 @@ public class HadoopCompat {
* Invoke TaskAttemptContext.progress(). Works with both
* Hadoop 1 and 2.
*/
- public static void progress(TaskAttemptContext context) {
+ public static void progress(TaskAttemptContext context)
+ {
invoke(PROGRESS_METHOD, context);
}
/**
* Increment the counter. Works with both Hadoop 1 and 2
*/
- public static void incrementCounter(Counter counter, long increment) {
+ public static void incrementCounter(Counter counter, long increment)
+ {
// incrementing a count might be called often. Might be affected by
// cost of invoke(). might be good candidate to handle in a shim.
// (TODO Raghu) figure out how achieve such a build with maven
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java b/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
index 00023d8..d2cc769 100644
--- a/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
+++ b/src/java/org/apache/cassandra/hadoop/ReporterWrapper.java
@@ -26,50 +26,60 @@ import org.apache.hadoop.mapreduce.StatusReporter;
/**
* A reporter that works with both mapred and mapreduce APIs.
*/
-public class ReporterWrapper extends StatusReporter implements Reporter {
+public class ReporterWrapper extends StatusReporter implements Reporter
+{
private Reporter wrappedReporter;
- public ReporterWrapper(Reporter reporter) {
+ public ReporterWrapper(Reporter reporter)
+ {
wrappedReporter = reporter;
}
@Override
- public Counters.Counter getCounter(Enum<?> anEnum) {
+ public Counters.Counter getCounter(Enum<?> anEnum)
+ {
return wrappedReporter.getCounter(anEnum);
}
@Override
- public Counters.Counter getCounter(String s, String s1) {
+ public Counters.Counter getCounter(String s, String s1)
+ {
return wrappedReporter.getCounter(s, s1);
}
@Override
- public void incrCounter(Enum<?> anEnum, long l) {
+ public void incrCounter(Enum<?> anEnum, long l)
+ {
wrappedReporter.incrCounter(anEnum, l);
}
@Override
- public void incrCounter(String s, String s1, long l) {
+ public void incrCounter(String s, String s1, long l)
+ {
wrappedReporter.incrCounter(s, s1, l);
}
@Override
- public InputSplit getInputSplit() throws UnsupportedOperationException {
+ public InputSplit getInputSplit() throws UnsupportedOperationException
+ {
return wrappedReporter.getInputSplit();
}
@Override
- public void progress() {
+ public void progress()
+ {
wrappedReporter.progress();
}
// @Override
- public float getProgress() {
+ public float getProgress()
+ {
throw new UnsupportedOperationException();
}
@Override
- public void setStatus(String s) {
+ public void setStatus(String s)
+ {
wrappedReporter.setStatus(s);
}
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
index f76f7d9..4c71273 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlConfigHelper.java
@@ -283,7 +283,8 @@ public class CqlConfigHelper
return conf.get(OUTPUT_CQL);
}
- private static Optional<Integer> getProtocolVersion(Configuration conf) {
+ private static Optional<Integer> getProtocolVersion(Configuration conf)
+ {
return getIntSetting(INPUT_NATIVE_PROTOCOL_VERSION, conf);
}
@@ -330,7 +331,8 @@ public class CqlConfigHelper
if (sslOptions.isPresent())
builder.withSSL(sslOptions.get());
- if (protocolVersion.isPresent()) {
+ if (protocolVersion.isPresent())
+ {
builder.withProtocolVersion(ProtocolVersion.fromInt(protocolVersion.get()));
}
builder.withLoadBalancingPolicy(loadBalancingPolicy)
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
index 8b04df3..d9aad19 100644
--- a/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
+++ b/src/java/org/apache/cassandra/hadoop/cql3/CqlRecordReader.java
@@ -248,7 +248,8 @@ public class CqlRecordReader extends RecordReader<Long, Row>
* Return native version protocol of the cluster connection
* @return serialization protocol version.
*/
- public int getNativeProtocolVersion() {
+ public int getNativeProtocolVersion()
+ {
return nativeProtocolVersion;
}
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerOptions.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerOptions.java b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerOptions.java
index 2a5e4ef..da44f0a 100644
--- a/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerOptions.java
+++ b/src/java/org/apache/cassandra/index/sasi/analyzer/StandardTokenizerOptions.java
@@ -124,7 +124,8 @@ public class StandardTokenizerOptions
this.maxTokenLength = maxTokenLength;
}
- public static class OptionsBuilder {
+ public static class OptionsBuilder
+ {
private boolean stemTerms;
private boolean ignoreStopTerms;
private Locale locale;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StemmerFactory.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StemmerFactory.java b/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StemmerFactory.java
index 04da55c..ae232db 100644
--- a/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StemmerFactory.java
+++ b/src/java/org/apache/cassandra/index/sasi/analyzer/filter/StemmerFactory.java
@@ -48,7 +48,8 @@ public class StemmerFactory
{
return aClass.getConstructor();
}
- catch (Exception e) {
+ catch (Exception e)
+ {
logger.error("Failed to get stemmer constructor", e);
}
return null;
http://git-wip-us.apache.org/repos/asf/cassandra/blob/68d25266/src/java/org/apache/cassandra/index/sasi/disk/AbstractTokenTreeBuilder.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/index/sasi/disk/AbstractTokenTreeBuilder.java b/src/java/org/apache/cassandra/index/sasi/disk/AbstractTokenTreeBuilder.java
index 9a1f7f1..18994de 100644
--- a/src/java/org/apache/cassandra/index/sasi/disk/AbstractTokenTreeBuilder.java
+++ b/src/java/org/apache/cassandra/index/sasi/disk/AbstractTokenTreeBuilder.java
@@ -312,7 +312,8 @@ public abstract class AbstractTokenTreeBuilder implements TokenTreeBuilder
overflowCollisions = new LongArrayList();
LeafEntry entry = new OverflowCollisionLeafEntry(tok, (short) overflowCollisions.size(), (short) offsetCount);
- for (LongCursor o : offsets) {
+ for (LongCursor o : offsets)
+ {
if (overflowCollisions.size() == OVERFLOW_TRAILER_CAPACITY)
throw new AssertionError("cannot have more than " + OVERFLOW_TRAILER_CAPACITY + " overflow collisions per leaf");
else
@@ -516,7 +517,8 @@ public abstract class AbstractTokenTreeBuilder implements TokenTreeBuilder
sibling.add(token, leftChild, rightChild);
}
- else {
+ else
+ {
if (leftChild != null)
children.add(pos, leftChild);