Updated Branches: refs/heads/trunk 5df067418 -> c6204b595
Merge branch 'cassandra-1.2' into trunk Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/c6204b59 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/c6204b59 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/c6204b59 Branch: refs/heads/trunk Commit: c6204b595dc8bdc8484f97d8aca0e235cafeaa89 Parents: 5df0674 2659640 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Thu Feb 14 01:20:47 2013 +0300 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Thu Feb 14 01:20:47 2013 +0300 ---------------------------------------------------------------------- CHANGES.txt | 1 + bin/cqlsh | 2 +- pylib/cqlshlib/cql3handling.py | 12 +- src/java/org/apache/cassandra/auth/Auth.java | 132 +++++++++++++-- .../org/apache/cassandra/config/CFMetaData.java | 8 +- .../cassandra/config/DatabaseDescriptor.java | 4 +- .../org/apache/cassandra/config/KSMetaData.java | 7 - src/java/org/apache/cassandra/config/Schema.java | 3 +- .../org/apache/cassandra/cql3/QueryProcessor.java | 4 +- .../cql3/statements/ListUsersStatement.java | 2 +- .../apache/cassandra/service/CassandraDaemon.java | 4 - .../org/apache/cassandra/service/ClientState.java | 14 ++- .../apache/cassandra/service/MigrationManager.java | 7 +- .../apache/cassandra/service/StorageService.java | 10 +- .../cassandra/db/compaction/CompactionsTest.java | 3 + 15 files changed, 156 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/CHANGES.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/pylib/cqlshlib/cql3handling.py ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/src/java/org/apache/cassandra/config/KSMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/src/java/org/apache/cassandra/config/Schema.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/src/java/org/apache/cassandra/cql3/QueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/src/java/org/apache/cassandra/service/MigrationManager.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/service/MigrationManager.java index 2f41743,82d56e3..967ea44 --- a/src/java/org/apache/cassandra/service/MigrationManager.java +++ b/src/java/org/apache/cassandra/service/MigrationManager.java @@@ -197,9 -198,14 +197,14 @@@ public class MigrationManager implement public static void announceNewKeyspace(KSMetaData ksm) throws ConfigurationException { + announceNewKeyspace(ksm, FBUtilities.timestampMicros()); + } + + public static void announceNewKeyspace(KSMetaData ksm, long timestamp) throws ConfigurationException + { ksm.validate(); - if (Schema.instance.getTableDefinition(ksm.name) != null) + if (Schema.instance.getKSMetaData(ksm.name) != null) throw new AlreadyExistsException(ksm.name); logger.info(String.format("Create new Keyspace: %s", ksm)); http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/src/java/org/apache/cassandra/service/StorageService.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/c6204b59/test/unit/org/apache/cassandra/db/compaction/CompactionsTest.java ----------------------------------------------------------------------
