cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ble...@apache.org
Subject [5/5] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 04 Sep 2015 19:14:23 GMT
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/86faf8cb
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/86faf8cb
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/86faf8cb

Branch: refs/heads/trunk
Commit: 86faf8cb3ca2d193c7a5b9c2cfa2f098ff46070a
Parents: 10fa329 2e3727e
Author: blerer <benjamin.lerer@datastax.com>
Authored: Fri Sep 4 21:13:18 2015 +0200
Committer: blerer <benjamin.lerer@datastax.com>
Committed: Fri Sep 4 21:13:42 2015 +0200

----------------------------------------------------------------------
 NEWS.txt                                        |   6 +-
 doc/cql3/CQL.textile                            |  13 +-
 .../cassandra/config/ColumnDefinition.java      |   6 +-
 .../cassandra/cql3/AbstractConditions.java      |  65 ++
 .../apache/cassandra/cql3/ColumnConditions.java | 167 ++++
 .../apache/cassandra/cql3/ColumnIdentifier.java |  56 +-
 .../org/apache/cassandra/cql3/Conditions.java   | 100 +++
 src/java/org/apache/cassandra/cql3/Cql.g        |   6 +-
 .../cassandra/cql3/IfExistsCondition.java       |  36 +
 .../cassandra/cql3/IfNotExistsCondition.java    |  36 +
 src/java/org/apache/cassandra/cql3/Json.java    |  36 +-
 .../org/apache/cassandra/cql3/Operations.java   | 135 ++++
 .../cassandra/cql3/SingleColumnRelation.java    |   1 +
 .../apache/cassandra/cql3/UpdateParameters.java |   9 +-
 .../restrictions/StatementRestrictions.java     | 246 ++++--
 .../cql3/statements/BatchStatement.java         |  91 +--
 .../cql3/statements/CQL3CasRequest.java         |  14 +-
 .../cql3/statements/DeleteStatement.java        |  99 +--
 .../cql3/statements/ModificationStatement.java  | 765 +++++++++----------
 .../cql3/statements/SelectStatement.java        |   9 +-
 .../cql3/statements/StatementType.java          | 138 ++++
 .../cql3/statements/UpdateStatement.java        | 198 +++--
 .../cql3/statements/UpdatesCollector.java       | 130 ++++
 src/java/org/apache/cassandra/db/CBuilder.java  |   9 +-
 .../org/apache/cassandra/db/RangeTombstone.java |   4 +-
 src/java/org/apache/cassandra/db/Slices.java    |   9 +
 .../cassandra/io/sstable/CQLSSTableWriter.java  |   7 +-
 .../cassandra/cql3/MaterializedViewTest.java    |  33 +
 .../cql3/validation/entities/UFAuthTest.java    |   8 +-
 .../entities/UFIdentificationTest.java          |  44 +-
 .../cql3/validation/operations/BatchTest.java   |  79 +-
 .../cql3/validation/operations/DeleteTest.java  | 681 ++++++++++++++++-
 .../cql3/validation/operations/InsertTest.java  | 233 ++++++
 .../operations/InsertUpdateIfConditionTest.java |  28 +-
 .../cql3/validation/operations/UpdateTest.java  | 447 +++++++++++
 .../cassandra/db/RangeTombstoneListTest.java    | 222 +++++-
 36 files changed, 3384 insertions(+), 782 deletions(-)
----------------------------------------------------------------------



Mime
View raw message