Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/394fb0ba Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/394fb0ba Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/394fb0ba Branch: refs/heads/cassandra-3.11 Commit: 394fb0bab6f90fbb8bb133e37b14b8bae85fb388 Parents: aee02e4 d8a18f9 Author: Aleksey Yeschenko <alek...@yeschenko.com> Authored: Tue Oct 17 11:52:45 2017 +0100 Committer: Aleksey Yeschenko <alek...@yeschenko.com> Committed: Tue Oct 17 11:54:41 2017 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/config/Schema.java | 12 ++++++++ .../apache/cassandra/schema/SchemaKeyspace.java | 18 ++++++++++- .../cassandra/service/StorageService.java | 6 ++++ .../cassandra/service/StorageServiceMBean.java | 2 ++ .../org/apache/cassandra/tools/NodeProbe.java | 5 +++ .../org/apache/cassandra/tools/NodeTool.java | 1 + .../tools/nodetool/ReloadLocalSchema.java | 32 ++++++++++++++++++++ 8 files changed, 76 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/394fb0ba/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 81444d2,db3f502..9a8dd05 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,6 -1,5 +1,7 @@@ -3.0.16 +3.11.2 + * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930) +Merged from 3.0: + * Provide a JMX call to sync schema with local storage (CASSANDRA-13954) * Mishandling of cells for removed/dropped columns when reading legacy files (CASSANDRA-13939) * Deserialise sstable metadata in nodetool verify (CASSANDRA-13922) http://git-wip-us.apache.org/repos/asf/cassandra/blob/394fb0ba/src/java/org/apache/cassandra/config/Schema.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/config/Schema.java index c6fc2a8,cc24e1e..ec6974d --- a/src/java/org/apache/cassandra/config/Schema.java +++ b/src/java/org/apache/cassandra/config/Schema.java @@@ -325,9 -365,21 +325,21 @@@ public class Schem */ public List<String> getUserKeyspaces() { - return ImmutableList.copyOf(Sets.difference(getNonSystemKeyspacesSet(), REPLICATED_SYSTEM_KEYSPACE_NAMES)); + return ImmutableList.copyOf(Sets.difference(getNonSystemKeyspacesSet(), SchemaConstants.REPLICATED_SYSTEM_KEYSPACE_NAMES)); } + public Keyspaces getReplicatedKeyspaces() + { + Keyspaces.Builder builder = Keyspaces.builder(); + + keyspaces.values() + .stream() - .filter(k -> !Schema.isSystemKeyspace(k.name)) ++ .filter(k -> !SchemaConstants.isSystemKeyspace(k.name)) + .forEach(builder::add); + + return builder.build(); + } + /** * Get metadata about keyspace inner ColumnFamilies * http://git-wip-us.apache.org/repos/asf/cassandra/blob/394fb0ba/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/394fb0ba/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/StorageService.java index fd13d8d,743ed24..2c17fb8 --- a/src/java/org/apache/cassandra/service/StorageService.java +++ b/src/java/org/apache/cassandra/service/StorageService.java @@@ -83,8 -76,8 +83,9 @@@ import org.apache.cassandra.metrics.Sto import org.apache.cassandra.net.*; import org.apache.cassandra.repair.*; import org.apache.cassandra.repair.messages.RepairOption; +import org.apache.cassandra.schema.CompactionParams.TombstoneOption; import org.apache.cassandra.schema.KeyspaceMetadata; + import org.apache.cassandra.schema.SchemaKeyspace; import org.apache.cassandra.service.paxos.CommitVerbHandler; import org.apache.cassandra.service.paxos.PrepareVerbHandler; import org.apache.cassandra.service.paxos.ProposeVerbHandler; http://git-wip-us.apache.org/repos/asf/cassandra/blob/394fb0ba/src/java/org/apache/cassandra/service/StorageServiceMBean.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/394fb0ba/src/java/org/apache/cassandra/tools/NodeProbe.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/394fb0ba/src/java/org/apache/cassandra/tools/NodeTool.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
