You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cassandra.apache.org by jm...@apache.org on 2015/08/24 23:11:41 UTC
[1/2] cassandra git commit: Fix NanoTimeTocurrentTimeMillisTest on
Windows
Repository: cassandra
Updated Branches:
refs/heads/cassandra-3.0 e6a9afbb8 -> 9514aba86
Fix NanoTimeTocurrentTimeMillisTest on Windows
Patch by pmotta; reviewed by aweisberg for CASSANDRA-10139
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/06a053dd
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/06a053dd
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/06a053dd
Branch: refs/heads/cassandra-3.0
Commit: 06a053ddc928cb8a65c5ff6d1e83947f0bb81fc6
Parents: 4994f0c
Author: Paulo Motta <pa...@gmail.com>
Authored: Mon Aug 24 17:10:26 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Mon Aug 24 17:10:26 2015 -0400
----------------------------------------------------------------------
.../utils/NanoTimeToCurrentTimeMillis.java | 2 +-
.../utils/NanoTimeToCurrentTimeMillisTest.java | 16 +++++++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cassandra/blob/06a053dd/src/java/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillis.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillis.java b/src/java/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillis.java
index a6c5d28..f124383 100644
--- a/src/java/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillis.java
+++ b/src/java/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillis.java
@@ -46,7 +46,7 @@ public class NanoTimeToCurrentTimeMillis
* There is also the issue of how scalable nanoTime() and currentTimeMillis() are which is a moving target.
*
* These timestamps don't order with System.currentTimeMillis() because currentTimeMillis() can tick over
- * before this one does. I have seen it behind by as much as 2 milliseconds.
+ * before this one does. I have seen it behind by as much as 2ms on Linux and 25ms on Windows.
*/
public static final long convert(long nanoTime)
{
http://git-wip-us.apache.org/repos/asf/cassandra/blob/06a053dd/test/unit/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillisTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillisTest.java b/test/unit/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillisTest.java
index 5c025cf..1662e77 100644
--- a/test/unit/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillisTest.java
+++ b/test/unit/org/apache/cassandra/utils/NanoTimeToCurrentTimeMillisTest.java
@@ -40,13 +40,19 @@ public class NanoTimeToCurrentTimeMillisTest
}
Thread.sleep(1);
}
- nowNanos = Math.max(now, System.nanoTime());
+
+ nowNanos = Math.max(nowNanos, System.nanoTime());
long convertedNow = NanoTimeToCurrentTimeMillis.convert(nowNanos);
- assertTrue("convertedNow = " + convertedNow + " lastConverted = " + lastConverted + " in iteration " + ii, convertedNow >= (lastConverted - 1));
- lastConverted = convertedNow;
- //Seems to be off by as much as two milliseconds sadly
- assertTrue("now = " + now + " convertedNow = " + convertedNow + " in iteration " + ii, (now - 2) <= convertedNow);
+ int maxDiff = FBUtilities.isWindows()? 15 : 1;
+ assertTrue("convertedNow = " + convertedNow + " lastConverted = " + lastConverted + " in iteration " + ii,
+ convertedNow >= (lastConverted - maxDiff));
+
+ maxDiff = FBUtilities.isWindows()? 25 : 2;
+ assertTrue("now = " + now + " convertedNow = " + convertedNow + " in iteration " + ii,
+ (maxDiff - 2) <= convertedNow);
+
+ lastConverted = convertedNow;
}
}
}
[2/2] cassandra git commit: Merge branch 'cassandra-2.2' into
cassandra-3.0
Posted by jm...@apache.org.
Merge branch 'cassandra-2.2' into cassandra-3.0
Project: http://git-wip-us.apache.org/repos/asf/cassandra/repo
Commit: http://git-wip-us.apache.org/repos/asf/cassandra/commit/9514aba8
Tree: http://git-wip-us.apache.org/repos/asf/cassandra/tree/9514aba8
Diff: http://git-wip-us.apache.org/repos/asf/cassandra/diff/9514aba8
Branch: refs/heads/cassandra-3.0
Commit: 9514aba8654a5f05155fea22072a980c201d8b52
Parents: e6a9afb 06a053d
Author: Joshua McKenzie <jm...@apache.org>
Authored: Mon Aug 24 17:11:02 2015 -0400
Committer: Joshua McKenzie <jm...@apache.org>
Committed: Mon Aug 24 17:11:02 2015 -0400
----------------------------------------------------------------------
.../utils/NanoTimeToCurrentTimeMillis.java | 2 +-
.../utils/NanoTimeToCurrentTimeMillisTest.java | 16 +++++++++++-----
2 files changed, 12 insertions(+), 6 deletions(-)
----------------------------------------------------------------------