cassandra-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tylerho...@apache.org
Subject [4/4] cassandra git commit: Merge branch 'cassandra-3.0' into trunk
Date Sat, 19 Sep 2015 15:07:53 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/e44e21ce
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e44e21ce
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e44e21ce

Branch: refs/heads/trunk
Commit: e44e21ce5561464f635609d01d76bea7858018f4
Parents: c21a2b7 5a4253b
Author: Tyler Hobbs <tylerlhobbs@gmail.com>
Authored: Sat Sep 19 10:07:31 2015 -0500
Committer: Tyler Hobbs <tylerlhobbs@gmail.com>
Committed: Sat Sep 19 10:07:31 2015 -0500

----------------------------------------------------------------------
 CHANGES.txt                                     |    2 +
 .../apache/cassandra/config/ViewDefinition.java |   74 +-
 .../apache/cassandra/cql3/AbstractMarker.java   |   31 +-
 .../apache/cassandra/cql3/ColumnIdentifier.java |   35 +
 .../org/apache/cassandra/cql3/Constants.java    |   26 +-
 src/java/org/apache/cassandra/cql3/Cql.g        |   12 +-
 src/java/org/apache/cassandra/cql3/Json.java    |   42 +-
 src/java/org/apache/cassandra/cql3/Lists.java   |    8 +-
 src/java/org/apache/cassandra/cql3/Maps.java    |   18 +-
 .../cassandra/cql3/MultiColumnRelation.java     |   28 +-
 .../org/apache/cassandra/cql3/Operator.java     |   58 +-
 .../org/apache/cassandra/cql3/Relation.java     |   23 +
 src/java/org/apache/cassandra/cql3/Sets.java    |    8 +-
 .../cassandra/cql3/SingleColumnRelation.java    |   30 +
 src/java/org/apache/cassandra/cql3/Term.java    |   19 +-
 .../apache/cassandra/cql3/TokenRelation.java    |   26 +
 src/java/org/apache/cassandra/cql3/Tuples.java  |   24 +-
 .../org/apache/cassandra/cql3/TypeCast.java     |    5 +-
 .../org/apache/cassandra/cql3/UserTypes.java    |    7 +-
 .../cassandra/cql3/functions/FunctionCall.java  |   16 +-
 .../cql3/restrictions/AbstractRestriction.java  |   14 +-
 .../ForwardingPrimaryKeyRestrictions.java       |    6 +
 .../restrictions/MultiColumnRestriction.java    |   55 +
 .../cql3/restrictions/Restriction.java          |    1 +
 .../restrictions/SingleColumnRestriction.java   |   58 +
 .../restrictions/StatementRestrictions.java     |   69 +-
 .../cql3/statements/AlterTableStatement.java    |    2 +-
 .../cql3/statements/CreateViewStatement.java    |   74 +-
 .../cassandra/cql3/statements/IndexTarget.java  |   14 +-
 .../cql3/statements/ModificationStatement.java  |    2 +-
 .../cql3/statements/ParsedStatement.java        |    5 +
 .../cql3/statements/SelectStatement.java        |   27 +-
 .../cql3/statements/UpdateStatement.java        |    2 +
 .../cassandra/db/PartitionRangeReadCommand.java |   13 +-
 .../org/apache/cassandra/db/ReadCommand.java    |   12 -
 src/java/org/apache/cassandra/db/ReadQuery.java |   24 +-
 .../db/SinglePartitionReadCommand.java          |   25 +-
 .../apache/cassandra/db/filter/RowFilter.java   |   39 +
 .../apache/cassandra/db/view/TemporalRow.java   |   17 +-
 src/java/org/apache/cassandra/db/view/View.java |  156 ++-
 .../apache/cassandra/db/view/ViewBuilder.java   |   15 +-
 .../internal/composites/CompositesSearcher.java |    2 +-
 .../apache/cassandra/schema/SchemaKeyspace.java |   16 +-
 .../org/apache/cassandra/cql3/CQLTester.java    |   78 ++
 .../cassandra/cql3/ViewFilteringTest.java       | 1292 ++++++++++++++++++
 .../org/apache/cassandra/cql3/ViewTest.java     |    4 +-
 .../SelectSingleColumnRelationTest.java         |    4 +
 47 files changed, 2270 insertions(+), 248 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cassandra/blob/e44e21ce/CHANGES.txt
----------------------------------------------------------------------
diff --cc CHANGES.txt
index 6c3ac84,e589626..7e7a6c3
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@@ -1,8 -1,6 +1,10 @@@
 +3.2
 + * Add transparent data encryption core classes (CASSANDRA-9945)
 +
 +
  3.0.0-rc1
+  * Allow MATERIALIZED VIEW's SELECT statement to restrict primary key
+    columns (CASSANDRA-9664)
   * Move crc_check_chance out of compression options (CASSANDRA-9839)
   * Fix descending iteration past end of BTreeSearchIterator (CASSANDRA-10301)
   * Transfer hints to a different node on decommission (CASSANDRA-10198)


Mime
View raw message