You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by al...@apache.org on 2015/11/23 21:24:43 UTC
[1/3] cassandra git commit: Test an NTS keyspace migration in
LegacySchemaMigratorTest
Repository: cassandra
Updated Branches:
refs/heads/trunk fa4c17383 -> 2e8bb3a64
Test an NTS keyspace migration in LegacySchemaMigratorTest
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c7e74f34
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c7e74f34
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c7e74f34
Branch: refs/heads/trunk
Commit: c7e74f349455bbdb6efd88e1b68a75ac1da83284
Parents: 0b3cfae
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Nov 23 20:23:46 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Nov 23 20:23:46 2015 +0000
----------------------------------------------------------------------
.../org/apache/cassandra/schema/KeyspaceParams.java | 5 +++++
.../apache/cassandra/schema/ReplicationParams.java | 15 +++++++++++++++
.../cassandra/schema/LegacySchemaMigratorTest.java | 3 +++
3 files changed, 23 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7e74f34/src/java/org/apache/cassandra/schema/KeyspaceParams.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/KeyspaceParams.java b/src/java/org/apache/cassandra/schema/KeyspaceParams.java
index 6cdf27f..c0e8916 100644
--- a/src/java/org/apache/cassandra/schema/KeyspaceParams.java
+++ b/src/java/org/apache/cassandra/schema/KeyspaceParams.java
@@ -69,6 +69,11 @@ public final class KeyspaceParams
return new KeyspaceParams(false, ReplicationParams.simple(replicationFactor));
}
+ public static KeyspaceParams nts(Object... args)
+ {
+ return new KeyspaceParams(true, ReplicationParams.nts(args));
+ }
+
public void validate(String name)
{
replication.validate(name);
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7e74f34/src/java/org/apache/cassandra/schema/ReplicationParams.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/ReplicationParams.java b/src/java/org/apache/cassandra/schema/ReplicationParams.java
index cdeb4c2..21c029e 100644
--- a/src/java/org/apache/cassandra/schema/ReplicationParams.java
+++ b/src/java/org/apache/cassandra/schema/ReplicationParams.java
@@ -51,6 +51,21 @@ public final class ReplicationParams
return new ReplicationParams(SimpleStrategy.class, ImmutableMap.of("replication_factor", Integer.toString(replicationFactor)));
}
+ static ReplicationParams nts(Object... args)
+ {
+ assert args.length % 2 == 0;
+
+ Map<String, String> options = new HashMap<>();
+ for (int i = 0; i < args.length; i += 2)
+ {
+ String dc = (String) args[i];
+ Integer rf = (Integer) args[i + 1];
+ options.put(dc, rf.toString());
+ }
+
+ return new ReplicationParams(NetworkTopologyStrategy.class, options);
+ }
+
public void validate(String name)
{
// Attempt to instantiate the ARS, which will throw a ConfigurationException if the options aren't valid.
http://git-wip-us.apache.org/repos/asf/cassandra/blob/c7e74f34/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java b/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java
index 7d0be4d..1ef3005 100644
--- a/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java
+++ b/test/unit/org/apache/cassandra/schema/LegacySchemaMigratorTest.java
@@ -245,6 +245,9 @@ public class LegacySchemaMigratorTest
+ "PRIMARY KEY((bar, baz), qux, quz) ) "
+ "WITH COMPACT STORAGE", ks_cql))));
+ // NTS keyspace
+ keyspaces.add(KeyspaceMetadata.create("nts", KeyspaceParams.nts("dc1", 1, "dc2", 2)));
+
keyspaces.add(keyspaceWithDroppedCollections());
keyspaces.add(keyspaceWithTriggers());
keyspaces.add(keyspaceWithUDTs());
[2/3] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.1
Posted by al...@apache.org.
Merge branch 'cassandra-3.0' into cassandra-3.1
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/383eb46b
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/383eb46b
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/383eb46b
Branch: refs/heads/trunk
Commit: 383eb46b33de0ce6a9f0d493a4fa88f8793a7e02
Parents: e8737fd c7e74f3
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Nov 23 20:24:05 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Nov 23 20:24:05 2015 +0000
----------------------------------------------------------------------
.../org/apache/cassandra/schema/KeyspaceParams.java | 5 +++++
.../apache/cassandra/schema/ReplicationParams.java | 15 +++++++++++++++
.../cassandra/schema/LegacySchemaMigratorTest.java | 3 +++
3 files changed, 23 insertions(+)
----------------------------------------------------------------------
[3/3] cassandra git commit: Merge branch 'cassandra-3.1' into trunk
Posted by al...@apache.org.
Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/2e8bb3a6
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/2e8bb3a6
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/2e8bb3a6
Branch: refs/heads/trunk
Commit: 2e8bb3a6453c423f02825f2496fd54148a14df07
Parents: fa4c173 383eb46
Author: Aleksey Yeschenko <al...@apache.org>
Authored: Mon Nov 23 20:24:33 2015 +0000
Committer: Aleksey Yeschenko <al...@apache.org>
Committed: Mon Nov 23 20:24:33 2015 +0000
----------------------------------------------------------------------
.../org/apache/cassandra/schema/KeyspaceParams.java | 5 +++++
.../apache/cassandra/schema/ReplicationParams.java | 15 +++++++++++++++
.../cassandra/schema/LegacySchemaMigratorTest.java | 3 +++
3 files changed, 23 insertions(+)
----------------------------------------------------------------------