Merge branch 'cassandra-3.0' into cassandra-3.11
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/f9e7c2b6 Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/f9e7c2b6 Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/f9e7c2b6 Branch: refs/heads/trunk Commit: f9e7c2b691970f63481ce9f7c5e8b8ac48f4e597 Parents: 436761e d79fc9a Author: Joel Knighton <j...@apache.org> Authored: Fri Sep 15 16:22:03 2017 -0500 Committer: Joel Knighton <j...@apache.org> Committed: Fri Sep 15 16:22:03 2017 -0500 ---------------------------------------------------------------------- CHANGES.txt | 1 + test/unit/org/apache/cassandra/db/CellTest.java | 4 ++-- test/unit/org/apache/cassandra/db/rows/RowsTest.java | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9e7c2b6/CHANGES.txt ---------------------------------------------------------------------- diff --cc CHANGES.txt index f0c05bf,7afbfaa..e09708d --- a/CHANGES.txt +++ b/CHANGES.txt @@@ -1,15 -1,5 +1,16 @@@ -3.0.15 +3.11.1 + * AbstractTokenTreeBuilder#serializedSize returns wrong value when there is a single leaf and overflow collisions (CASSANDRA-13869) + * Add a compaction option to TWCS to ignore sstables overlapping checks (CASSANDRA-13418) + * BTree.Builder memory leak (CASSANDRA-13754) + * Revert CASSANDRA-10368 of supporting non-pk column filtering due to correctness (CASSANDRA-13798) + * Fix cassandra-stress hang issues when an error during cluster connection happens (CASSANDRA-12938) + * Better bootstrap failure message when blocked by (potential) range movement (CASSANDRA-13744) + * "ignore" option is ignored in sstableloader (CASSANDRA-13721) + * Deadlock in AbstractCommitLogSegmentManager (CASSANDRA-13652) + * Duplicate the buffer before passing it to analyser in SASI operation (CASSANDRA-13512) + * Properly evict pstmts from prepared statements cache (CASSANDRA-13641) +Merged from 3.0: + * Prevent integer overflow of timestamps in CellTest and RowsTest (CASSANDRA-13866) * Fix counter application order in short read protection (CASSANDRA-12872) * Don't block RepairJob execution on validation futures (CASSANDRA-13797) * Wait for all management tasks to complete before shutting down CLSM (CASSANDRA-13123) http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9e7c2b6/test/unit/org/apache/cassandra/db/CellTest.java ---------------------------------------------------------------------- diff --cc test/unit/org/apache/cassandra/db/CellTest.java index d69617e,22f1b78..ea009f6 --- a/test/unit/org/apache/cassandra/db/CellTest.java +++ b/test/unit/org/apache/cassandra/db/CellTest.java @@@ -351,18 -255,18 +351,18 @@@ public class CellTes { ColumnDefinition m = cfm2.getColumnDefinition(new ColumnIdentifier("m", false)); int now1 = FBUtilities.nowInSeconds(); - long ts1 = now1*1000000; + long ts1 = now1*1000000L; - Cell r1m1 = BufferCell.live(cfm2, m, ts1, bb(1), CellPath.create(bb(1))); - Cell r1m2 = BufferCell.live(cfm2, m, ts1, bb(2), CellPath.create(bb(2))); + Cell r1m1 = BufferCell.live(m, ts1, bb(1), CellPath.create(bb(1))); + Cell r1m2 = BufferCell.live(m, ts1, bb(2), CellPath.create(bb(2))); List<Cell> cells1 = Lists.newArrayList(r1m1, r1m2); int now2 = now1 + 1; - long ts2 = now2*1000000; + long ts2 = now2*1000000L; - Cell r2m2 = BufferCell.live(cfm2, m, ts2, bb(1), CellPath.create(bb(2))); - Cell r2m3 = BufferCell.live(cfm2, m, ts2, bb(2), CellPath.create(bb(3))); - Cell r2m4 = BufferCell.live(cfm2, m, ts2, bb(3), CellPath.create(bb(4))); + Cell r2m2 = BufferCell.live(m, ts2, bb(1), CellPath.create(bb(2))); + Cell r2m3 = BufferCell.live(m, ts2, bb(2), CellPath.create(bb(3))); + Cell r2m4 = BufferCell.live(m, ts2, bb(3), CellPath.create(bb(4))); List<Cell> cells2 = Lists.newArrayList(r2m2, r2m3, r2m4); RowBuilder builder = new RowBuilder(); http://git-wip-us.apache.org/repos/asf/cassandra/blob/f9e7c2b6/test/unit/org/apache/cassandra/db/rows/RowsTest.java ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cassandra.apache.org For additional commands, e-mail: commits-h...@cassandra.apache.org
