Merge branch 'cassandra-3.11' into trunk
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/0d70789f Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/0d70789f Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/0d70789f Branch: refs/heads/trunk Commit: 0d70789fda2b9b9c39a5508857eb028b311e6fa4 Parents: df51d0c f77b663 Author: Paulo Motta <[email protected]> Authored: Thu Dec 7 08:20:47 2017 +1100 Committer: Paulo Motta <[email protected]> Committed: Thu Dec 7 08:21:37 2017 +1100 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../org/apache/cassandra/cql3/Attributes.java | 6 + .../org/apache/cassandra/db/LivenessInfo.java | 62 ++++- .../cassandra/db/view/ViewUpdateGenerator.java | 10 +- .../apache/cassandra/schema/TableParams.java | 4 + .../apache/cassandra/tools/JsonTransformer.java | 2 +- .../org/apache/cassandra/cql3/ViewLongTest.java | 231 +++++++++++++++++++ .../cql3/validation/operations/TTLTest.java | 104 +++++++++ .../apache/cassandra/db/LivenessInfoTest.java | 112 +++++++++ 9 files changed, 524 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d70789f/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index d526c09,8a7158d..cfec6d3 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -178,6 -8,7 +178,7 @@@ * Avoid locks when checking LCS fanout and if we should defrag (CASSANDRA-13930) Merged from 3.0: 3.0.16 - * Fix updating base table rows with TTL not removing view entries (CASSANDRA-14071) ++ * Fix updating base table rows with TTL not removing materialized view entries (CASSANDRA-14071) * Reduce garbage created by DynamicSnitch (CASSANDRA-14091) * More frequent commitlog chained markers (CASSANDRA-13987) * Fix serialized size of DataLimits (CASSANDRA-14057) http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d70789f/src/java/org/apache/cassandra/db/LivenessInfo.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d70789f/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d70789f/src/java/org/apache/cassandra/schema/TableParams.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d70789f/src/java/org/apache/cassandra/tools/JsonTransformer.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/0d70789f/test/long/org/apache/cassandra/cql3/ViewLongTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
