cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s...@apache.org
Subject [3/3] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Fri, 18 Sep 2015 10:35: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/0c3575fa
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0c3575fa
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0c3575fa

Branch: refs/heads/trunk
Commit: 0c3575fabd6c29a0d7b97e6ad4487816fabc8984
Parents: 5400b93 64e2f5d
Author: Sam Tunnicliffe <sam@beobal.com>
Authored: Fri Sep 18 11:32:35 2015 +0100
Committer: Sam Tunnicliffe <sam@beobal.com>
Committed: Fri Sep 18 11:32:35 2015 +0100

----------------------------------------------------------------------
 CHANGES.txt                                     |   1 +
 src/java/org/apache/cassandra/cql3/Cql.g        |  26 +++-
 .../org/apache/cassandra/cql3/WhereClause.java  |  74 ++++++++++
 .../restrictions/CustomIndexExpression.java     |  58 ++++++++
 .../cql3/restrictions/IndexRestrictions.java    |  83 +++++++++++
 .../restrictions/StatementRestrictions.java     |  76 +++++++---
 .../cql3/statements/DeleteStatement.java        |   4 +-
 .../cql3/statements/ModificationStatement.java  |  14 +-
 .../cql3/statements/SelectStatement.java        |  11 +-
 .../cql3/statements/UpdateStatement.java        |  21 ++-
 .../apache/cassandra/db/filter/RowFilter.java   | 141 ++++++++++++++++---
 src/java/org/apache/cassandra/index/Index.java  |  22 ++-
 .../cassandra/index/SecondaryIndexManager.java  |  46 ++++--
 .../index/internal/CassandraIndex.java          |   5 +
 .../apache/cassandra/net/MessagingService.java  |  32 +++--
 .../cassandra/cql3/PreparedStatementsTest.java  |  38 ++++-
 .../apache/cassandra/index/CustomIndexTest.java | 106 ++++++++++++++
 .../org/apache/cassandra/index/StubIndex.java   |  44 +++++-
 .../index/internal/CustomCassandraIndex.java    |   6 +
 19 files changed, 717 insertions(+), 91 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/0c3575fa/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 334927a,cc57ba6..a6beca4
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,5 +1,9 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-rc1
+  * Add custom query expressions to SELECT (CASSANDRA-10217)
   * Fix minor bugs in MV handling (CASSANDRA-10362)
   * Allow custom indexes with 0,1 or multiple target columns (CASSANDRA-10124)
   * Improve MV schema representation (CASSANDRA-9921)


Mime
View raw message