Merge branch cassandra-3.5 into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/6e69c759 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/6e69c759 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/6e69c759 Branch: refs/heads/trunk Commit: 6e69c75900f3640195130085ad69daa1659184eb Parents: 980e476 8c83c8e Author: Benjamin Lerer <[email protected]> Authored: Fri Mar 4 22:15:17 2016 +0100 Committer: Benjamin Lerer <[email protected]> Committed: Fri Mar 4 22:15:29 2016 +0100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/cql3/SingleColumnRelation.java | 4 - .../restrictions/StatementRestrictions.java | 25 +- .../cql3/statements/SelectStatement.java | 12 +- .../apache/cassandra/db/filter/RowFilter.java | 50 +- .../index/internal/CassandraIndex.java | 23 +- .../entities/FrozenCollectionsTest.java | 3 +- .../validation/entities/SecondaryIndexTest.java | 3 +- .../cql3/validation/operations/DeleteTest.java | 10 +- .../SelectMultiColumnRelationTest.java | 54 +- .../SelectSingleColumnRelationTest.java | 51 +- .../cql3/validation/operations/SelectTest.java | 1063 +++++++++++++++++- .../cql3/validation/operations/UpdateTest.java | 8 +- .../apache/cassandra/index/CustomIndexTest.java | 4 +- .../index/internal/CassandraIndexTest.java | 34 +- 15 files changed, 1199 insertions(+), 146 deletions(-) ----------------------------------------------------------------------
