Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/7aa4dc52 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/7aa4dc52 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/7aa4dc52 Branch: refs/heads/cassandra-3.3 Commit: 7aa4dc5250ede812da73cffa0f715b83d340e2b3 Parents: 5e5ea772 e2050c9 Author: T Jake Luciani <j...@apache.org> Authored: Fri Jan 15 09:46:36 2016 -0500 Committer: T Jake Luciani <j...@apache.org> Committed: Fri Jan 15 09:46:36 2016 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/service/StorageService.java | 103 ++++++++++++------- 2 files changed, 69 insertions(+), 35 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7aa4dc52/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/7aa4dc52/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index a501425,34419e9..b3ea8cc --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -37,8 -51,6 +52,7 @@@ import java.util.concurrent.TimeUnit import java.util.concurrent.TimeoutException; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicInteger; - +import javax.annotation.Nullable; import javax.management.JMX; import javax.management.MBeanServer; import javax.management.NotificationBroadcasterSupport; @@@ -46,19 -58,56 +60,58 @@@ import javax.management.ObjectName import javax.management.openmbean.TabularData; import javax.management.openmbean.TabularDataSupport; + import com.google.common.annotations.VisibleForTesting; + import com.google.common.base.Predicate; + import com.google.common.collect.ArrayListMultimap; + import com.google.common.collect.Collections2; + import com.google.common.collect.HashMultimap; + import com.google.common.collect.ImmutableSet; + import com.google.common.collect.Iterables; + import com.google.common.collect.Lists; + import com.google.common.collect.Maps; + import com.google.common.collect.Multimap; + import com.google.common.collect.Sets; + import com.google.common.util.concurrent.FutureCallback; + import com.google.common.util.concurrent.Futures; + import com.google.common.util.concurrent.ListenableFuture; + import com.google.common.util.concurrent.Uninterruptibles; + import org.apache.commons.lang3.StringUtils; + import org.slf4j.Logger; + import org.slf4j.LoggerFactory; + + import ch.qos.logback.classic.LoggerContext; + import ch.qos.logback.classic.jmx.JMXConfiguratorMBean; + import ch.qos.logback.classic.spi.ILoggingEvent; + import ch.qos.logback.core.Appender; import org.apache.cassandra.auth.AuthKeyspace; import org.apache.cassandra.auth.AuthMigrationListener; ++import org.apache.cassandra.batchlog.BatchRemoveVerbHandler; ++import org.apache.cassandra.batchlog.BatchStoreVerbHandler; ++import org.apache.cassandra.batchlog.BatchlogManager; import org.apache.cassandra.concurrent.ScheduledExecutors; import org.apache.cassandra.concurrent.Stage; import org.apache.cassandra.concurrent.StageManager; - import org.apache.cassandra.config.*; - import org.apache.cassandra.db.*; - import org.apache.cassandra.batchlog.BatchStoreVerbHandler; - import org.apache.cassandra.batchlog.BatchRemoveVerbHandler; - import org.apache.cassandra.batchlog.BatchlogManager; + import org.apache.cassandra.config.CFMetaData; + import org.apache.cassandra.config.DatabaseDescriptor; -import org.apache.cassandra.config.KSMetaData; + import org.apache.cassandra.config.Schema; -import org.apache.cassandra.db.BatchlogManager; + import org.apache.cassandra.db.ColumnFamilyStore; + import org.apache.cassandra.db.CounterMutationVerbHandler; + import org.apache.cassandra.db.DecoratedKey; + import org.apache.cassandra.db.DefinitionsUpdateVerbHandler; -import org.apache.cassandra.db.HintedHandOffManager; + import org.apache.cassandra.db.Keyspace; + import org.apache.cassandra.db.MigrationRequestVerbHandler; + import org.apache.cassandra.db.MutationVerbHandler; ++import org.apache.cassandra.db.RangeSliceVerbHandler; ++import org.apache.cassandra.db.ReadCommandVerbHandler; + import org.apache.cassandra.db.ReadRepairVerbHandler; -import org.apache.cassandra.db.ReadVerbHandler; + import org.apache.cassandra.db.SchemaCheckVerbHandler; + import org.apache.cassandra.db.SizeEstimatesRecorder; + import org.apache.cassandra.db.SnapshotDetailsTabularData; + import org.apache.cassandra.db.SystemKeyspace; + import org.apache.cassandra.db.TruncateVerbHandler; import org.apache.cassandra.db.commitlog.CommitLog; import org.apache.cassandra.db.compaction.CompactionManager; +import org.apache.cassandra.db.lifecycle.LifecycleTransaction; import org.apache.cassandra.dht.BootStrapper; import org.apache.cassandra.dht.IPartitioner; import org.apache.cassandra.dht.Range; @@@ -126,37 -172,6 +179,11 @@@ import org.apache.cassandra.utils.progr import org.apache.cassandra.utils.progress.ProgressEventType; import org.apache.cassandra.utils.progress.jmx.JMXProgressSupport; - import org.apache.commons.lang3.StringUtils; - - import org.slf4j.Logger; - import org.slf4j.LoggerFactory; - import ch.qos.logback.classic.LoggerContext; - import ch.qos.logback.classic.jmx.JMXConfiguratorMBean; - import ch.qos.logback.classic.spi.ILoggingEvent; - import ch.qos.logback.core.Appender; - - import com.google.common.annotations.VisibleForTesting; - import com.google.common.base.Predicate; - import com.google.common.collect.ArrayListMultimap; - import com.google.common.collect.Collections2; - import com.google.common.collect.HashMultimap; - import com.google.common.collect.ImmutableSet; - import com.google.common.collect.Iterables; - import com.google.common.collect.Lists; - import com.google.common.collect.Maps; - import com.google.common.collect.Multimap; - import com.google.common.collect.Sets; - import com.google.common.util.concurrent.FutureCallback; - import com.google.common.util.concurrent.Futures; - import com.google.common.util.concurrent.ListenableFuture; - import com.google.common.util.concurrent.Uninterruptibles; - ++import static java.util.Arrays.asList; +import static java.util.stream.Collectors.toList; - +import static org.apache.cassandra.index.SecondaryIndexManager.getIndexName; +import static org.apache.cassandra.index.SecondaryIndexManager.isIndexColumnFamily; - import static java.util.Arrays.asList; + /** * This abstraction contains the token/identifier of this node * on the identifier space. This token gets gossiped around.
