Merge branch 'cassandra-3.1' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/4a566139 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/4a566139 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/4a566139 Branch: refs/heads/trunk Commit: 4a566139d1763453c01ad297ab98ec633e7befd1 Parents: 1c41a9a f0d45ea Author: Tyler Hobbs <tylerlho...@gmail.com> Authored: Fri Dec 4 11:43:44 2015 -0600 Committer: Tyler Hobbs <tylerlho...@gmail.com> Committed: Fri Dec 4 11:43:44 2015 -0600 ---------------------------------------------------------------------- CHANGES.txt | 2 + .../apache/cassandra/db/rows/AbstractCell.java | 5 +- .../apache/cassandra/db/rows/AbstractRow.java | 6 +- .../apache/cassandra/db/view/TemporalRow.java | 6 +- src/java/org/apache/cassandra/db/view/View.java | 15 +- .../apache/cassandra/db/view/ViewManager.java | 4 + .../apache/cassandra/service/StorageProxy.java | 14 +- .../apache/cassandra/cql3/ViewSchemaTest.java | 762 +++++++++++++++++++ .../org/apache/cassandra/cql3/ViewTest.java | 707 +---------------- 9 files changed, 838 insertions(+), 683 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a566139/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 6c46183,7c7e301..532a77a --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,20 -1,7 +1,22 @@@ +3.2 + * bound maximum in-flight commit log replay mutation bytes to 64 megabytes (CASSANDRA-8639) + * Normalize all scripts (CASSANDRA-10679) + * Make compression ratio much more accurate (CASSANDRA-10225) + * Optimize building of Clustering object when only one is created (CASSANDRA-10409) + * Make index building pluggable (CASSANDRA-10681) + * Add sstable flush observer (CASSANDRA-10678) + * Improve NTS endpoints calculation (CASSANDRA-10200) + * Improve performance of the folderSize function (CASSANDRA-10677) + * Add support for type casting in selection clause (CASSANDRA-10310) + * Added graphing option to cassandra-stress (CASSANDRA-7918) + * Abort in-progress queries that time out (CASSANDRA-7392) + * Add transparent data encryption core classes (CASSANDRA-9945) + + 3.1 Merged from 3.0: + * Handle single-column deletions correction in materialized views + when the column is part of the view primary key (CASSANDRA-10796) * Fix issue with datadir migration on upgrade (CASSANDRA-10788) * Fix bug with range tombstones on reverse queries and test coverage for AbstractBTreePartition (CASSANDRA-10059) http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a566139/src/java/org/apache/cassandra/db/view/View.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/4a566139/src/java/org/apache/cassandra/service/StorageProxy.java ----------------------------------------------------------------------
