Merge branch 'cassandra-3.0' into cassandra-3.9 * cassandra-3.0: AssertionError with MVs on updating a row that isn't indexed due to a null value
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/e9e6a0d4 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/e9e6a0d4 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/e9e6a0d4 Branch: refs/heads/trunk Commit: e9e6a0d4e82f229f133b3f34826e5c585da7cac5 Parents: 5fe02b3 8d020e2 Author: Sylvain Lebresne <[email protected]> Authored: Wed Jul 27 11:28:17 2016 +0200 Committer: Sylvain Lebresne <[email protected]> Committed: Wed Jul 27 11:28:17 2016 +0200 ---------------------------------------------------------------------- CHANGES.txt | 1 + .../cassandra/db/view/ViewUpdateGenerator.java | 4 +-- .../org/apache/cassandra/cql3/ViewTest.java | 29 ++++++++++++++++++++ 3 files changed, 32 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9e6a0d4/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index 50f7a6d,90f1ee9..6ef9655 --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,7 -1,5 +1,8 @@@ -3.0.9 +3.9 + * cqlsh: Fix handling of $$-escaped strings (CASSANDRA-12189) + * Fix SSL JMX requiring truststore containing server cert (CASSANDRA-12109) +Merged from 3.0: + * AssertionError with MVs on updating a row that isn't indexed due to a null value (CASSANDRA-12247) * Disable RR and speculative retry with EACH_QUORUM reads (CASSANDRA-11980) * Add option to override compaction space check (CASSANDRA-12180) * Faster startup by only scanning each directory for temporary files once (CASSANDRA-12114) http://git-wip-us.apache.org/repos/asf/cassandra/blob/e9e6a0d4/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java ---------------------------------------------------------------------- diff --cc src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java index 4c6dbb7,3bdc380..a8af37b --- a/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java +++ b/src/java/org/apache/cassandra/db/view/ViewUpdateGenerator.java @@@ -452,10 -452,10 +452,10 @@@ public class ViewUpdateGenerato ColumnDefinition baseColumn = view.baseNonPKColumnsInViewPK.get(0); Cell cell = baseRow.getCell(baseColumn); - assert isLive(cell) : "We shouldn't have got there is the base row had no associated entry"; + assert isLive(cell) : "We shouldn't have got there if the base row had no associated entry"; long timestamp = Math.max(baseLiveness.timestamp(), cell.timestamp()); - return LivenessInfo.create(timestamp, cell.ttl(), cell.localDeletionTime()); + return LivenessInfo.withExpirationTime(timestamp, cell.ttl(), cell.localDeletionTime()); } private long computeTimestampForEntryDeletion(Row baseRow)
