Repository: cassandra
Updated Branches:
  refs/heads/cassandra-3.0 95e16005e -> c10ae57d9
  refs/heads/trunk c0f2dc5d3 -> 04b2528bf


Include ks params in KeyspaceMetadata::validate

Patch by Sam Tunnicliffe; reviewed by Paulo Motta for CASSANDRA-10569


Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c10ae57d
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c10ae57d
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c10ae57d

Branch: refs/heads/cassandra-3.0
Commit: c10ae57d967b7f7b2342b1ff9b66e14b7ad7a0f2
Parents: 95e1600
Author: Sam Tunnicliffe <s...@beobal.com>
Authored: Fri Oct 23 16:06:38 2015 +0100
Committer: Sam Tunnicliffe <s...@beobal.com>
Committed: Tue Oct 27 12:48:41 2015 +0000

----------------------------------------------------------------------
 CHANGES.txt                                                | 1 +
 src/java/org/apache/cassandra/schema/KeyspaceMetadata.java | 1 +
 2 files changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/c10ae57d/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index 12f62f7..286e490 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 3.0
+ * Ensure compaction options are validated when updating KeyspaceMetadata 
(CASSANDRA-10569)
  * Flatten Iterator Transformation Hierarchy (CASSANDRA-9975)
  * Remove token generator (CASSANDRA-5261)
  * RolesCache should not be created for any authenticator that does not 
requireAuthentication (CASSANDRA-10562)

http://git-wip-us.apache.org/repos/asf/cassandra/blob/c10ae57d/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java 
b/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java
index 01c88bd..76ba27d 100644
--- a/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java
+++ b/src/java/org/apache/cassandra/schema/KeyspaceMetadata.java
@@ -171,6 +171,7 @@ public final class KeyspaceMetadata
                                                            + "or contain 
non-alphanumeric-underscore characters (got \"%s\")",
                                                            Schema.NAME_LENGTH,
                                                            name));
+        params.validate(name);
         tablesAndViews().forEach(CFMetaData::validate);
     }
 }

Reply via email to