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 2016/12/09 13:19:34 UTC
tinkerpop git commit: don't need a BarrierDoneMessage anymore as the
unlock mechanism for post barrier computations by the workers is the master
passing the Termination token back to the leader worker. Slick.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1564 9a6be81b5 -> 036d8985e
don't need a BarrierDoneMessage anymore as the unlock mechanism for post barrier computations by the workers is the master passing the Termination token back to the leader worker. Slick.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/036d8985
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/036d8985
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/036d8985
Branch: refs/heads/TINKERPOP-1564
Commit: 036d8985e56fc10758daaa044b623e8cff2a28d0
Parents: 9a6be81
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Dec 9 06:19:30 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Dec 9 06:19:30 2016 -0700
----------------------------------------------------------------------
.../process/akka/MasterTraversalActor.java | 3 +-
.../process/akka/WorkerTraversalActor.java | 10 -----
.../akka/messages/BarrierDoneMessage.java | 40 --------------------
3 files changed, 1 insertion(+), 52 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/036d8985/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/akka/MasterTraversalActor.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/akka/MasterTraversalActor.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/akka/MasterTraversalActor.java
index ff72ec0..e525220 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/akka/MasterTraversalActor.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/akka/MasterTraversalActor.java
@@ -39,7 +39,6 @@ import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Partition;
import org.apache.tinkerpop.gremlin.structure.Partitioner;
import org.apache.tinkerpop.gremlin.tinkergraph.process.akka.messages.BarrierAddMessage;
-import org.apache.tinkerpop.gremlin.tinkergraph.process.akka.messages.BarrierDoneMessage;
import org.apache.tinkerpop.gremlin.tinkergraph.process.akka.messages.SideEffectAddMessage;
import org.apache.tinkerpop.gremlin.tinkergraph.process.akka.messages.StartMessage;
import org.apache.tinkerpop.gremlin.tinkergraph.process.akka.messages.VoteToHaltMessage;
@@ -96,7 +95,7 @@ public final class MasterTraversalActor extends AbstractActor implements Require
this.sendTraverser(step.next());
}
this.barrierLock = null;
- this.workers.get(this.leaderWorker).tell(WorkerTraversalActor.Terminate.MAYBE,self());
+ this.workers.get(this.leaderWorker).tell(WorkerTraversalActor.Terminate.MAYBE, self());
} else
context().system().terminate();
}).build());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/036d8985/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/akka/WorkerTraversalActor.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/akka/WorkerTraversalActor.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/akka/WorkerTraversalActor.java
index 866286d..0107273 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/akka/WorkerTraversalActor.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/akka/WorkerTraversalActor.java
@@ -34,7 +34,6 @@ import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Partition;
import org.apache.tinkerpop.gremlin.structure.Partitioner;
import org.apache.tinkerpop.gremlin.tinkergraph.process.akka.messages.BarrierAddMessage;
-import org.apache.tinkerpop.gremlin.tinkergraph.process.akka.messages.BarrierDoneMessage;
import org.apache.tinkerpop.gremlin.tinkergraph.process.akka.messages.SideEffectAddMessage;
import org.apache.tinkerpop.gremlin.tinkergraph.process.akka.messages.StartMessage;
import org.apache.tinkerpop.gremlin.tinkergraph.process.akka.messages.VoteToHaltMessage;
@@ -94,15 +93,6 @@ public final class WorkerTraversalActor extends AbstractActor implements Require
match(SideEffectAddMessage.class, sideEffect -> {
// TODO
}).
- match(BarrierDoneMessage.class, barrierSync -> {
- // barrier is complete and processing can continue
- if (null != this.barrierLock) {
- this.barrierLock.done();
- this.barrierLock = null;
- }
- if (this.leader)
- self().tell(Terminate.MAYBE, self());
- }).
match(Terminate.class, terminate -> {
assert this.leader || this.terminationToken != Terminate.MAYBE;
this.terminationToken = terminate;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/036d8985/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/akka/messages/BarrierDoneMessage.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/akka/messages/BarrierDoneMessage.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/akka/messages/BarrierDoneMessage.java
deleted file mode 100644
index 73c0611..0000000
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/akka/messages/BarrierDoneMessage.java
+++ /dev/null
@@ -1,40 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package org.apache.tinkerpop.gremlin.tinkergraph.process.akka.messages;
-
-import org.apache.tinkerpop.gremlin.process.traversal.Step;
-import org.apache.tinkerpop.gremlin.process.traversal.step.Barrier;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public final class BarrierDoneMessage implements SynchronizationMessage {
-
- private final String stepId;
-
- public BarrierDoneMessage(final Barrier barrier) {
- this.stepId = ((Step) barrier).getId();
- }
-
- public String getStepId() {
- return this.stepId;
- }
-
-}