You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jk...@apache.org on 2017/09/15 21:37:24 UTC
[1/6] cassandra git commit: Prevent integer overflow of timestamps in
CellTest and RowsTest
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 9ea61305e -> d79fc9a22
refs/heads/cassandra-3.11 436761ed6 -> f9e7c2b69
refs/heads/trunk 8b5d1acde -> bb542ce71
Prevent integer overflow of timestamps in CellTest and RowsTest
patch by Joel Knighton; reviewed by Jeff Jirsa for CASSANDRA-13866
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d79fc9a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d79fc9a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d79fc9a2
Branch: refs/heads/cassandra-3.0
Commit: d79fc9a2258d10e8a54fd4136d5544e10ad3ddda
Parents: 9ea6130
Author: Joel Knighton <jk...@apache.org>
Authored: Wed Sep 13 18:35:10 2017 -0500
Committer: Joel Knighton <jk...@apache.org>
Committed: Fri Sep 15 16:16:37 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/d79fc9a2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a259545..7afbfaa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * 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/d79fc9a2/test/unit/org/apache/cassandra/db/CellTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/CellTest.java b/test/unit/org/apache/cassandra/db/CellTest.java
index cd6000f..22f1b78 100644
--- a/test/unit/org/apache/cassandra/db/CellTest.java
+++ b/test/unit/org/apache/cassandra/db/CellTest.java
@@ -255,7 +255,7 @@ public class CellTest
{
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)));
@@ -263,7 +263,7 @@ public class CellTest
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)));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d79fc9a2/test/unit/org/apache/cassandra/db/rows/RowsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/rows/RowsTest.java b/test/unit/org/apache/cassandra/db/rows/RowsTest.java
index b47bea2..8683808 100644
--- a/test/unit/org/apache/cassandra/db/rows/RowsTest.java
+++ b/test/unit/org/apache/cassandra/db/rows/RowsTest.java
@@ -202,7 +202,7 @@ public class RowsTest
private static long secondToTs(int now)
{
- return now * 1000000;
+ return now * 1000000L;
}
private static Row.Builder createBuilder(Clustering c, int now, ByteBuffer vVal, ByteBuffer mKey, ByteBuffer mVal)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[6/6] cassandra git commit: Merge branch 'cassandra-3.11' into trunk
Posted by jk...@apache.org.
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/bb542ce7
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/bb542ce7
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/bb542ce7
Branch: refs/heads/trunk
Commit: bb542ce7110f48b2c60f6c52613d37ae406309fc
Parents: 8b5d1ac f9e7c2b
Author: Joel Knighton <jk...@apache.org>
Authored: Fri Sep 15 16:23:58 2017 -0500
Committer: Joel Knighton <jk...@apache.org>
Committed: Fri Sep 15 16:23:58 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/bb542ce7/CHANGES.txt
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb542ce7/test/unit/org/apache/cassandra/db/CellTest.java
----------------------------------------------------------------------
diff --cc test/unit/org/apache/cassandra/db/CellTest.java
index 906da8a,ea009f6..660bc38
--- a/test/unit/org/apache/cassandra/db/CellTest.java
+++ b/test/unit/org/apache/cassandra/db/CellTest.java
@@@ -350,9 -349,9 +350,9 @@@ public class CellTes
@Test
public void testComplexCellReconcile()
{
- ColumnDefinition m = cfm2.getColumnDefinition(new ColumnIdentifier("m", false));
+ ColumnMetadata m = cfm2.getColumn(new ColumnIdentifier("m", false));
int now1 = FBUtilities.nowInSeconds();
- long ts1 = now1*1000000;
+ long ts1 = now1*1000000L;
Cell r1m1 = BufferCell.live(m, ts1, bb(1), CellPath.create(bb(1)));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/bb542ce7/test/unit/org/apache/cassandra/db/rows/RowsTest.java
----------------------------------------------------------------------
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[4/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by jk...@apache.org.
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 <jk...@apache.org>
Authored: Fri Sep 15 16:22:03 2017 -0500
Committer: Joel Knighton <jk...@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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[2/6] cassandra git commit: Prevent integer overflow of timestamps in
CellTest and RowsTest
Posted by jk...@apache.org.
Prevent integer overflow of timestamps in CellTest and RowsTest
patch by Joel Knighton; reviewed by Jeff Jirsa for CASSANDRA-13866
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d79fc9a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d79fc9a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d79fc9a2
Branch: refs/heads/cassandra-3.11
Commit: d79fc9a2258d10e8a54fd4136d5544e10ad3ddda
Parents: 9ea6130
Author: Joel Knighton <jk...@apache.org>
Authored: Wed Sep 13 18:35:10 2017 -0500
Committer: Joel Knighton <jk...@apache.org>
Committed: Fri Sep 15 16:16:37 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/d79fc9a2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a259545..7afbfaa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * 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/d79fc9a2/test/unit/org/apache/cassandra/db/CellTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/CellTest.java b/test/unit/org/apache/cassandra/db/CellTest.java
index cd6000f..22f1b78 100644
--- a/test/unit/org/apache/cassandra/db/CellTest.java
+++ b/test/unit/org/apache/cassandra/db/CellTest.java
@@ -255,7 +255,7 @@ public class CellTest
{
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)));
@@ -263,7 +263,7 @@ public class CellTest
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)));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d79fc9a2/test/unit/org/apache/cassandra/db/rows/RowsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/rows/RowsTest.java b/test/unit/org/apache/cassandra/db/rows/RowsTest.java
index b47bea2..8683808 100644
--- a/test/unit/org/apache/cassandra/db/rows/RowsTest.java
+++ b/test/unit/org/apache/cassandra/db/rows/RowsTest.java
@@ -202,7 +202,7 @@ public class RowsTest
private static long secondToTs(int now)
{
- return now * 1000000;
+ return now * 1000000L;
}
private static Row.Builder createBuilder(Clustering c, int now, ByteBuffer vVal, ByteBuffer mKey, ByteBuffer mVal)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[5/6] cassandra git commit: Merge branch 'cassandra-3.0' into
cassandra-3.11
Posted by jk...@apache.org.
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/cassandra-3.11
Commit: f9e7c2b691970f63481ce9f7c5e8b8ac48f4e597
Parents: 436761e d79fc9a
Author: Joel Knighton <jk...@apache.org>
Authored: Fri Sep 15 16:22:03 2017 -0500
Committer: Joel Knighton <jk...@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-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org
[3/6] cassandra git commit: Prevent integer overflow of timestamps in
CellTest and RowsTest
Posted by jk...@apache.org.
Prevent integer overflow of timestamps in CellTest and RowsTest
patch by Joel Knighton; reviewed by Jeff Jirsa for CASSANDRA-13866
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/d79fc9a2
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/d79fc9a2
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/d79fc9a2
Branch: refs/heads/trunk
Commit: d79fc9a2258d10e8a54fd4136d5544e10ad3ddda
Parents: 9ea6130
Author: Joel Knighton <jk...@apache.org>
Authored: Wed Sep 13 18:35:10 2017 -0500
Committer: Joel Knighton <jk...@apache.org>
Committed: Fri Sep 15 16:16:37 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/d79fc9a2/CHANGES.txt
----------------------------------------------------------------------
diff --git a/CHANGES.txt b/CHANGES.txt
index a259545..7afbfaa 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
3.0.15
+ * 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/d79fc9a2/test/unit/org/apache/cassandra/db/CellTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/CellTest.java b/test/unit/org/apache/cassandra/db/CellTest.java
index cd6000f..22f1b78 100644
--- a/test/unit/org/apache/cassandra/db/CellTest.java
+++ b/test/unit/org/apache/cassandra/db/CellTest.java
@@ -255,7 +255,7 @@ public class CellTest
{
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)));
@@ -263,7 +263,7 @@ public class CellTest
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)));
http://git-wip-us.apache.org/repos/asf/cassandra/blob/d79fc9a2/test/unit/org/apache/cassandra/db/rows/RowsTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/db/rows/RowsTest.java b/test/unit/org/apache/cassandra/db/rows/RowsTest.java
index b47bea2..8683808 100644
--- a/test/unit/org/apache/cassandra/db/rows/RowsTest.java
+++ b/test/unit/org/apache/cassandra/db/rows/RowsTest.java
@@ -202,7 +202,7 @@ public class RowsTest
private static long secondToTs(int now)
{
- return now * 1000000;
+ return now * 1000000L;
}
private static Row.Builder createBuilder(Clustering c, int now, ByteBuffer vVal, ByteBuffer mKey, ByteBuffer mVal)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cassandra.apache.org
For additional commands, e-mail: commits-help@cassandra.apache.org