Merge branch 'cassandra-2.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/bc9b0be3 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bc9b0be3 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bc9b0be3 Branch: refs/heads/trunk Commit: bc9b0be321b34c55366a61418b94e9bae6ddb26b Parents: 7392fb9 01115f7 Author: Josh McKenzie <josh.mcken...@datastax.com> Authored: Wed Jun 24 12:13:15 2015 -0400 Committer: Josh McKenzie <josh.mcken...@datastax.com> Committed: Wed Jun 24 12:13:15 2015 -0400 ---------------------------------------------------------------------- .../cassandra/config/DatabaseDescriptor.java | 6 + .../org/apache/cassandra/cql3/ResultSet.java | 9 + .../apache/cassandra/cql3/UntypedResultSet.java | 2 +- .../cql3/statements/BatchStatement.java | 69 +- .../cql3/statements/CQL3CasRequest.java | 8 +- .../cql3/statements/ModificationStatement.java | 70 +- .../cql3/statements/SelectStatement.java | 84 +- .../cql3/statements/TruncateStatement.java | 13 +- .../apache/cassandra/service/StorageProxy.java | 4 +- .../org/apache/cassandra/utils/UUIDGen.java | 16 +- .../org/apache/cassandra/cql3/ManyRowsTest.java | 92 + .../apache/cassandra/cql3/AggregationTest.java | 1479 ---------- .../org/apache/cassandra/cql3/AliasTest.java | 40 - .../apache/cassandra/cql3/AlterTableTest.java | 113 - .../org/apache/cassandra/cql3/CQLTester.java | 172 +- .../apache/cassandra/cql3/CollectionsTest.java | 340 --- .../cassandra/cql3/ContainsRelationTest.java | 283 -- .../cassandra/cql3/CrcCheckChanceTest.java | 159 -- .../cql3/CreateAndAlterKeyspaceTest.java | 37 - .../cql3/CreateIndexStatementTest.java | 101 - .../apache/cassandra/cql3/CreateTableTest.java | 69 - .../cql3/CreateTriggerStatementTest.java | 121 - .../cassandra/cql3/FrozenCollectionsTest.java | 1101 -------- .../cql3/IndexedValuesValidationTest.java | 149 - .../org/apache/cassandra/cql3/JsonTest.java | 947 ------- .../apache/cassandra/cql3/ModificationTest.java | 112 - .../cassandra/cql3/MultiColumnRelationTest.java | 936 ------- .../org/apache/cassandra/cql3/PgStringTest.java | 76 - .../cassandra/cql3/RangeDeletionTest.java | 35 - .../apache/cassandra/cql3/RoleSyntaxTest.java | 51 - .../cql3/SSTableMetadataTrackingTest.java | 160 -- .../cql3/SecondaryIndexOnMapEntriesTest.java | 337 --- .../cql3/SelectWithTokenFunctionTest.java | 233 -- .../cassandra/cql3/SelectionOrderingTest.java | 233 -- .../cql3/SingleColumnRelationTest.java | 553 ---- .../SliceQueryFilterWithTombstonesTest.java | 170 -- .../cassandra/cql3/StaticColumnsQueryTest.java | 280 -- .../cassandra/cql3/ThriftCompatibilityTest.java | 1 + .../apache/cassandra/cql3/TimestampTest.java | 36 - .../apache/cassandra/cql3/TupleTypeTest.java | 114 - .../org/apache/cassandra/cql3/TypeCastTest.java | 54 - .../org/apache/cassandra/cql3/TypeTest.java | 89 - .../org/apache/cassandra/cql3/UFAuthTest.java | 724 ----- .../cassandra/cql3/UFIdentificationTest.java | 376 --- test/unit/org/apache/cassandra/cql3/UFTest.java | 2585 ----------------- .../apache/cassandra/cql3/UseStatementTest.java | 29 - .../apache/cassandra/cql3/UserTypesTest.java | 334 --- .../selection/SelectionColumnMappingTest.java | 9 + .../validation/entities/CollectionsTest.java | 588 ++++ .../cql3/validation/entities/CountersTest.java | 115 + .../cql3/validation/entities/DateTypeTest.java | 39 + .../entities/FrozenCollectionsTest.java | 1111 ++++++++ .../cql3/validation/entities/JsonTest.java | 958 +++++++ .../SecondaryIndexOnMapEntriesTest.java | 348 +++ .../validation/entities/SecondaryIndexTest.java | 645 +++++ .../validation/entities/StaticColumnsTest.java | 271 ++ .../cql3/validation/entities/TimestampTest.java | 155 ++ .../cql3/validation/entities/TimeuuidTest.java | 81 + .../cql3/validation/entities/TupleTypeTest.java | 171 ++ .../cql3/validation/entities/TypeTest.java | 92 + .../cql3/validation/entities/UFAuthTest.java | 728 +++++ .../entities/UFIdentificationTest.java | 380 +++ .../cql3/validation/entities/UFTest.java | 2596 ++++++++++++++++++ .../cql3/validation/entities/UserTypesTest.java | 404 +++ .../miscellaneous/CrcCheckChanceTest.java | 160 ++ .../validation/miscellaneous/OverflowTest.java | 331 +++ .../validation/miscellaneous/PgStringTest.java | 77 + .../miscellaneous/RoleSyntaxTest.java | 53 + .../SSTableMetadataTrackingTest.java | 161 ++ .../miscellaneous/TombstonesTest.java | 171 ++ .../validation/operations/AggregationTest.java | 1481 ++++++++++ .../cql3/validation/operations/AlterTest.java | 203 ++ .../cql3/validation/operations/BatchTest.java | 106 + .../cql3/validation/operations/CreateTest.java | 498 ++++ .../cql3/validation/operations/DeleteTest.java | 329 +++ .../cql3/validation/operations/InsertTest.java | 59 + .../operations/InsertUpdateIfCondition.java | 861 ++++++ .../validation/operations/SelectLimitTest.java | 112 + .../SelectMultiColumnRelationTest.java | 962 +++++++ .../operations/SelectOrderByTest.java | 504 ++++ .../SelectOrderedPartitionerTest.java | 481 ++++ .../SelectSingleColumnRelationTest.java | 555 ++++ .../cql3/validation/operations/SelectTest.java | 1336 +++++++++ .../cql3/validation/operations/UpdateTest.java | 86 + .../cql3/validation/operations/UseTest.java | 31 + .../cassandra/service/ClientWarningsTest.java | 5 +- .../cassandra/transport/MessagePayloadTest.java | 6 +- .../stress/generate/values/TimeUUIDs.java | 2 +- 88 files changed, 17720 insertions(+), 12543 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/bc9b0be3/src/java/org/apache/cassandra/config/DatabaseDescriptor.java ----------------------------------------------------------------------