Merge branch 'cassandra-3.0' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/1b876bc6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/1b876bc6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/1b876bc6 Branch: refs/heads/trunk Commit: 1b876bc6004356295ad64257f63718d099a3aaf7 Parents: fd6e27a 340df43 Author: Aleksey Yeschenko <alek...@apache.org> Authored: Wed Nov 4 17:08:43 2015 +0000 Committer: Aleksey Yeschenko <alek...@apache.org> Committed: Wed Nov 4 17:08:43 2015 +0000 ---------------------------------------------------------------------- CHANGES.txt | 1 + NOTICE.txt | 4 + build.xml | 9 +- ...assandra-driver-core-3.0.0-alpha4-shaded.jar | Bin 2275541 -> 0 bytes ...core-3.0.0-beta1-92c4c80-SNAPSHOT-shaded.jar | Bin 0 -> 2284484 bytes ...iver-internal-only-3.0.0a2.post0-95c6008.zip | Bin 233564 -> 0 bytes ...iver-internal-only-3.0.0a3.post0-a983923.zip | Bin 0 -> 229492 bytes lib/jgrapht-core-0.9.1.jar | Bin 0 -> 351208 bytes lib/licenses/jgrapht-core-0.9.1.txt | 227 +++ .../org/apache/cassandra/config/CFMetaData.java | 12 +- .../org/apache/cassandra/config/Schema.java | 44 +- .../org/apache/cassandra/cql3/CQL3Type.java | 77 +- .../apache/cassandra/cql3/ColumnIdentifier.java | 2 +- .../cql3/statements/CreateTableStatement.java | 12 +- .../db/DefinitionsUpdateVerbHandler.java | 3 +- src/java/org/apache/cassandra/db/Keyspace.java | 1 - .../apache/cassandra/db/marshal/EmptyType.java | 7 + .../apache/cassandra/db/marshal/TypeParser.java | 45 - .../cassandra/io/sstable/CQLSSTableWriter.java | 14 +- .../apache/cassandra/schema/CQLTypeParser.java | 93 ++ .../org/apache/cassandra/schema/Keyspaces.java | 124 ++ .../apache/cassandra/schema/SchemaKeyspace.java | 1422 +++++++----------- .../org/apache/cassandra/schema/Tables.java | 7 + src/java/org/apache/cassandra/schema/Types.java | 135 +- src/java/org/apache/cassandra/schema/Views.java | 7 + .../cassandra/service/MigrationManager.java | 15 +- .../apache/cassandra/service/MigrationTask.java | 4 - .../apache/cassandra/config/CFMetaDataTest.java | 29 +- .../cql3/validation/entities/TupleTypeTest.java | 4 +- .../cql3/validation/entities/UFTest.java | 4 +- .../schema/LegacySchemaMigratorTest.java | 12 +- .../cassandra/schema/SchemaKeyspaceTest.java | 30 +- 32 files changed, 1318 insertions(+), 1026 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b876bc6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index b5ded10,1914fa1..5e2826c --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,10 -1,5 +1,11 @@@ +3.2 + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.0 + * Use CQL type names in schema metadata tables (CASSANDRA-10365) * Guard batchlog replay against integer division by zero (CASSANDRA-9223) * Fix bug when adding a column to thrift with the same name than a primary key (CASSANDRA-10608) * Add client address argument to IAuthenticator::newSaslNegotiator (CASSANDRA-8068) http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b876bc6/build.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b876bc6/src/java/org/apache/cassandra/config/CFMetaData.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/1b876bc6/src/java/org/apache/cassandra/schema/SchemaKeyspace.java ----------------------------------------------------------------------
