You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/06/11 23:07:50 UTC
incubator-tinkerpop git commit: using AtomicLong.getAndSet() in
GraphComputerTest as that, hopefully,
solves an assertion error on the build servers -- threading issues.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 635a03886 -> 8cbc211a9
using AtomicLong.getAndSet() in GraphComputerTest as that, hopefully, solves an assertion error on the build servers -- threading issues.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8cbc211a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8cbc211a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8cbc211a
Branch: refs/heads/master
Commit: 8cbc211a93ced003967885211bbd47258d7ddfce
Parents: 635a038
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Jun 11 15:07:45 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Jun 11 15:07:45 2015 -0600
----------------------------------------------------------------------
.../process/computer/GraphComputerTest.java | 18 ++++++------------
1 file changed, 6 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8cbc211a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 8278195..010f369 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@ -1026,8 +1026,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
final long time = System.nanoTime();
if (!memory.isInitialIteration())
assertNotEquals(-1l, TIME_KEEPER.get());
- assertTrue(TIME_KEEPER.get() < time);
- TIME_KEEPER.set(time);
+ assertTrue(TIME_KEEPER.getAndSet(time) < time);
try {
memory.set("test", memory.getIteration());
fail("Should throw an immutable memory exception");
@@ -1054,14 +1053,13 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
public void workerIterationEnd(final Memory memory) {
assertEquals(memory.getIteration(), memory.<Integer>get("test").intValue());
assertNotEquals(-1l, TIME_KEEPER.get());
- assertTrue(TIME_KEEPER.get() < System.nanoTime());
+ assertTrue(TIME_KEEPER.getAndSet(Long.MIN_VALUE) < System.nanoTime());
try {
memory.set("test", memory.getIteration());
fail("Should throw an immutable memory exception");
} catch (IllegalStateException e) {
assertEquals(Memory.Exceptions.memoryIsCurrentlyImmutable().getMessage(), e.getMessage());
}
- TIME_KEEPER.set(Long.MIN_VALUE);
}
@Override
@@ -1099,9 +1097,8 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
@Override
public void workerStart(final Stage stage) {
final long time = System.nanoTime();
- assertTrue(TIME_KEEPER.get() < time);
if (!stage.equals(Stage.MAP)) assertNotEquals(-1l, TIME_KEEPER.get());
- TIME_KEEPER.set(time);
+ assertTrue(TIME_KEEPER.getAndSet(time) < time);
WORKER_START.add(stage);
if (!stage.equals(Stage.MAP))
assertFalse(WORKER_END.isEmpty());
@@ -1113,8 +1110,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
sleep(10);
assertNotEquals(-1l, TIME_KEEPER.get());
final long time = System.nanoTime();
- assertTrue(TIME_KEEPER.get() < time);
- TIME_KEEPER.set(time);
+ assertTrue(TIME_KEEPER.getAndSet(time) < time);
assertEquals(1, WORKER_START.size());
assertTrue(WORKER_START.contains(Stage.MAP));
}
@@ -1125,8 +1121,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
sleep(10);
assertNotEquals(-1l, TIME_KEEPER.get());
final long time = System.nanoTime();
- assertTrue(TIME_KEEPER.get() < time);
- TIME_KEEPER.set(time);
+ assertTrue(TIME_KEEPER.getAndSet(time) < time);
assertEquals(2, WORKER_START.size());
assertTrue(WORKER_START.contains(Stage.MAP) && WORKER_START.contains(Stage.COMBINE));
assertFalse(WORKER_END.isEmpty());
@@ -1138,8 +1133,7 @@ public class GraphComputerTest extends AbstractGremlinProcessTest {
sleep(10);
assertNotEquals(-1l, TIME_KEEPER.get());
final long time = System.nanoTime();
- assertTrue(TIME_KEEPER.get() < time);
- TIME_KEEPER.set(time);
+ assertTrue(TIME_KEEPER.getAndSet(time) < time);
if (WORKER_START.size() == 2) {
assertEquals(2, WORKER_START.size());
assertTrue(WORKER_START.contains(Stage.MAP) && WORKER_START.contains(Stage.REDUCE));