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 2017/01/24 18:09:19 UTC
tinkerpop git commit: Got rid of the concept of StartMessage. Once
the WorkerActor is loaded, its starts processing its GraphStep partition. Also,
got InjectStep working, if and only if,
its the start step. Like mid-traversal V, mid-traversal inject requ
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1564 4e4c64de2 -> 8cf050416
Got rid of the concept of StartMessage. Once the WorkerActor is loaded, its starts processing its GraphStep partition. Also, got InjectStep working, if and only if, its the start step. Like mid-traversal V, mid-traversal inject requires some extra logic. Cleaned up TraversalActorProgram -- also, ran into a bug in PathRetractionStrategy.. dah. Hopefully the @twilmes fixes for tp32/ will rectify the bug being exposed in GraphActors.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8cf05041
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8cf05041
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8cf05041
Branch: refs/heads/TINKERPOP-1564
Commit: 8cf05041635be3b7ec1fa7f85e20ab0a32825a97
Parents: 4e4c64d
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jan 24 11:09:15 2017 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jan 24 11:09:15 2017 -0700
----------------------------------------------------------------------
.../process/actors/io/gryo/GryoSerializer.java | 3 --
.../actors/traversal/TraversalActorProgram.java | 23 ++-----------
.../traversal/TraversalMasterProgram.java | 11 ++++--
.../traversal/TraversalWorkerProgram.java | 17 +++++-----
.../actors/traversal/message/StartMessage.java | 35 --------------------
.../verification/ActorVerificationStrategy.java | 7 ++--
6 files changed, 24 insertions(+), 72 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf05041/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/gryo/GryoSerializer.java
----------------------------------------------------------------------
diff --git a/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/gryo/GryoSerializer.java b/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/gryo/GryoSerializer.java
index 515c902..733528c 100644
--- a/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/gryo/GryoSerializer.java
+++ b/akka-gremlin/src/main/java/org/apache/tinkerpop/gremlin/akka/process/actors/io/gryo/GryoSerializer.java
@@ -28,7 +28,6 @@ import org.apache.tinkerpop.gremlin.process.actors.traversal.message.BarrierAddM
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.BarrierDoneMessage;
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.SideEffectAddMessage;
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.SideEffectSetMessage;
-import org.apache.tinkerpop.gremlin.process.actors.traversal.message.StartMessage;
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.Terminate;
import org.apache.tinkerpop.gremlin.process.actors.util.DefaultActorsResult;
import org.apache.tinkerpop.gremlin.structure.io.IoRegistry;
@@ -73,7 +72,6 @@ public final class GryoSerializer implements Serializer {
addRegistries(registryList).
addCustom(
Terminate.class,
- StartMessage.class,
BarrierAddMessage.class,
BarrierDoneMessage.class,
SideEffectSetMessage.class,
@@ -90,7 +88,6 @@ public final class GryoSerializer implements Serializer {
addRegistries(IoRegistryHelper.createRegistries(configuration)).
addCustom(
Terminate.class,
- StartMessage.class,
BarrierAddMessage.class,
BarrierDoneMessage.class,
SideEffectSetMessage.class,
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf05041/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalActorProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalActorProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalActorProgram.java
index 637c9a0..68fcb2d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalActorProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalActorProgram.java
@@ -27,7 +27,6 @@ import org.apache.tinkerpop.gremlin.process.actors.traversal.message.BarrierAddM
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.BarrierDoneMessage;
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.SideEffectAddMessage;
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.SideEffectSetMessage;
-import org.apache.tinkerpop.gremlin.process.actors.traversal.message.StartMessage;
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.Terminate;
import org.apache.tinkerpop.gremlin.process.actors.traversal.strategy.decoration.ActorProgramStrategy;
import org.apache.tinkerpop.gremlin.process.actors.traversal.strategy.verification.ActorVerificationStrategy;
@@ -36,13 +35,13 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.Traverser;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.InlineFilterStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.LazyBarrierStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.MatchPredicateStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.PathRetractionStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization.RepeatUnrollStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
+import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Partition;
import org.apache.tinkerpop.gremlin.structure.util.Attachable;
@@ -65,7 +64,6 @@ public final class TraversalActorProgram<R> implements ActorProgram<Pair<Travers
public static final String TRAVERSAL_ACTOR_PROGRAM_BYTECODE = "gremlin.traversalActorProgram.bytecode";
private static final List<Class> MESSAGE_PRIORITIES = Arrays.asList(
- StartMessage.class,
BarrierDoneMessage.class,
Traverser.class,
SideEffectAddMessage.class,
@@ -81,22 +79,7 @@ public final class TraversalActorProgram<R> implements ActorProgram<Pair<Travers
public TraversalActorProgram(final Traversal.Admin<?, R> traversal) {
this.traversal = traversal;
- final TraversalStrategies strategies = this.traversal.getStrategies().clone();
- strategies.addStrategies(ActorVerificationStrategy.instance(), ReadOnlyStrategy.instance());
- // TODO: make TinkerGraph/etc. strategies smart about actors
- new ArrayList<>(strategies.toList()).stream().
- filter(s -> s instanceof TraversalStrategy.ProviderOptimizationStrategy).
- map(TraversalStrategy::getClass).
- forEach(strategies::removeStrategies);
- strategies.removeStrategies(
- ActorProgramStrategy.class,
- LazyBarrierStrategy.class,
- RepeatUnrollStrategy.class,
- MatchPredicateStrategy.class,
- InlineFilterStrategy.class,
- PathRetractionStrategy.class);
- this.traversal.setStrategies(strategies);
- this.traversal.applyStrategies();
+ TraversalHelper.applyTraversalRecursively(ActorVerificationStrategy.instance()::apply, traversal);
}
@Override
@@ -111,7 +94,6 @@ public final class TraversalActorProgram<R> implements ActorProgram<Pair<Travers
this.traversal = (Traversal.Admin<?, R>) JavaTranslator.of(graph.traversal()).translate(bytecode);
final TraversalStrategies strategies = this.traversal.getStrategies().clone();
strategies.addStrategies(ActorVerificationStrategy.instance(), ReadOnlyStrategy.instance());
- // TODO: make TinkerGraph/etc. strategies smart about actors
new ArrayList<>(strategies.toList()).stream().
filter(s -> s instanceof TraversalStrategy.ProviderOptimizationStrategy).
map(TraversalStrategy::getClass).
@@ -121,7 +103,6 @@ public final class TraversalActorProgram<R> implements ActorProgram<Pair<Travers
LazyBarrierStrategy.class,
RepeatUnrollStrategy.class,
MatchPredicateStrategy.class,
- InlineFilterStrategy.class,
PathRetractionStrategy.class);
this.traversal.setStrategies(strategies);
this.traversal.applyStrategies();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf05041/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalMasterProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalMasterProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalMasterProgram.java
index cbefcb4..eb12a25 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalMasterProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalMasterProgram.java
@@ -26,7 +26,6 @@ import org.apache.tinkerpop.gremlin.process.actors.traversal.message.BarrierAddM
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.BarrierDoneMessage;
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.SideEffectAddMessage;
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.SideEffectSetMessage;
-import org.apache.tinkerpop.gremlin.process.actors.traversal.message.StartMessage;
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.Terminate;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
@@ -39,6 +38,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectCapable;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.TailGlobalStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderGlobalStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectCapStep;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.OrderedTraverser;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.util.TraverserSet;
@@ -85,8 +85,13 @@ final class TraversalMasterProgram<R> implements ActorProgram.Master<Object> {
for (int i = 0; i < this.master.partitioner().getPartitions().size(); i++) {
this.partitionToWorkerMap.put(this.master.partitioner().getPartitions().get(i), this.master.workers().get(i));
}
- // initiate all workers
- this.broadcast(StartMessage.instance());
+ // inject step processing should start at the master traversal
+ if (this.traversal.getStartStep() instanceof InjectStep) {
+ final Step<?, ?> step = this.traversal.getStartStep().getNextStep();
+ while (step.hasNext()) {
+ this.processTraverser(step.next());
+ }
+ }
// first pass of a two pass termination detection
this.voteToHalt = false;
this.master.send(this.neighborAddress, Terminate.NO);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf05041/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalWorkerProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalWorkerProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalWorkerProgram.java
index f472a35..f654044 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalWorkerProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/TraversalWorkerProgram.java
@@ -25,7 +25,6 @@ import org.apache.tinkerpop.gremlin.process.actors.Address;
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.BarrierAddMessage;
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.BarrierDoneMessage;
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.SideEffectSetMessage;
-import org.apache.tinkerpop.gremlin.process.actors.traversal.message.StartMessage;
import org.apache.tinkerpop.gremlin.process.actors.traversal.message.Terminate;
import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
@@ -35,6 +34,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.Distributing;
import org.apache.tinkerpop.gremlin.process.traversal.step.LocalBarrier;
import org.apache.tinkerpop.gremlin.process.traversal.step.Pushing;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectStep;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalMatrix;
import org.apache.tinkerpop.gremlin.structure.Element;
@@ -86,17 +86,18 @@ final class TraversalWorkerProgram implements ActorProgram.Worker<Object> {
() -> IteratorUtils.filter(self.partition().edges(graphStep.getIds()), this.self.partition()::contains));
}
});
+ // once loaded, start processing start step (unless its an inject step)
+ final Step<?, ?> step = this.matrix.getTraversal().getStartStep();
+ if (!(step instanceof InjectStep)) {
+ while (step.hasNext()) {
+ this.processTraverser(step.next());
+ }
+ }
}
@Override
public void execute(final Object message) {
- if (message instanceof StartMessage) {
- // initial message from master that says: "start processing"
- final GraphStep<?, ?> step = (GraphStep) this.matrix.getTraversal().getStartStep();
- while (step.hasNext()) {
- this.sendTraverser(step.next());
- }
- } else if (message instanceof Traverser.Admin) {
+ if (message instanceof Traverser.Admin) {
this.processTraverser((Traverser.Admin) message);
} else if (message instanceof SideEffectSetMessage) {
this.matrix.getTraversal().getSideEffects().
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf05041/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/message/StartMessage.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/message/StartMessage.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/message/StartMessage.java
deleted file mode 100644
index e704033..0000000
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/message/StartMessage.java
+++ /dev/null
@@ -1,35 +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.process.actors.traversal.message;
-
-/**
- * @author Marko A. Rodriguez (http://markorodriguez.com)
- */
-public final class StartMessage {
-
- private static final StartMessage INSTANCE = new StartMessage();
-
- private StartMessage() {
- }
-
- public static StartMessage instance() {
- return INSTANCE;
- }
-}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8cf05041/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/strategy/verification/ActorVerificationStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/strategy/verification/ActorVerificationStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/strategy/verification/ActorVerificationStrategy.java
index cdf5465..82f0e0c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/strategy/verification/ActorVerificationStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/actors/traversal/strategy/verification/ActorVerificationStrategy.java
@@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.InjectStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.ReadOnlyStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.VerificationException;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
@@ -38,8 +39,10 @@ public final class ActorVerificationStrategy extends AbstractTraversalStrategy<T
@Override
public void apply(final Traversal.Admin<?, ?> traversal) {
- if (!TraversalHelper.getStepsOfAssignableClass(InjectStep.class, traversal).isEmpty())
- throw new VerificationException("Inject traversal currently not supported", traversal);
+ if (TraversalHelper.getStepsOfAssignableClass(InjectStep.class, TraversalHelper.getRootTraversal(traversal)).size() > 0)
+ if (!(TraversalHelper.getRootTraversal(traversal).getStartStep() instanceof InjectStep))
+ throw new VerificationException("Inject traversal currently not supported", traversal);
+ ReadOnlyStrategy.instance().apply(traversal);
}
public static ActorVerificationStrategy instance() {