Repository: tinkerpop Updated Branches: refs/heads/TRAVIS-TEST 15e3fcb81 -> 22b1692c0
foo Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/22b1692c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/22b1692c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/22b1692c Branch: refs/heads/TRAVIS-TEST Commit: 22b1692c09853217a09cb5855cac055e5230371f Parents: 15e3fcb Author: Daniel Kuppitz <daniel_kupp...@hotmail.com> Authored: Mon Mar 12 12:04:40 2018 -0700 Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com> Committed: Mon Mar 12 12:04:40 2018 -0700 ---------------------------------------------------------------------- .../traversal/strategy/decoration/RequirementsStrategy.java | 3 ++- .../process/traversal/strategy/decoration/SubgraphStrategy.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22b1692c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java index aa3da3d..c99ad2b 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/RequirementsStrategy.java @@ -33,6 +33,7 @@ import org.slf4j.LoggerFactory; import java.util.Collections; import java.util.HashSet; import java.util.Set; +import java.util.stream.Collectors; /** * @author Marko A. Rodriguez (http://markorodriguez.com) @@ -48,7 +49,6 @@ public final class RequirementsStrategy extends AbstractTraversalStrategy<Traver @Override public void apply(final Traversal.Admin<?, ?> traversal) { - logger.error("Applying RequirementsStrrategy."); if (traversal.getParent() instanceof EmptyStep && !this.requirements.isEmpty()) traversal.addStep(new RequirementsStep<>(traversal, this.requirements)); } @@ -61,6 +61,7 @@ public final class RequirementsStrategy extends AbstractTraversalStrategy<Traver } else { final RequirementsStrategy cloneStrategy = new RequirementsStrategy(); cloneStrategy.requirements.addAll(strategy.requirements); + logger.error("Applying requirements: " + cloneStrategy.requirements.stream().map(TraverserRequirement::toString).collect(Collectors.toList())); strategy = cloneStrategy; traversalStrategies.addStrategies(strategy); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/22b1692c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java index f31c39e..85e9020 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/decoration/SubgraphStrategy.java @@ -147,12 +147,12 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS @Override public void apply(final Traversal.Admin<?, ?> traversal) { - logger.error("Applying SubgraphStrategy."); // do not apply subgraph strategy to already created subgraph filter branches (or else you get infinite recursion) if (traversal.getStartStep().getLabels().contains(MARKER)) { traversal.getStartStep().removeLabel(MARKER); return; } + logger.error("Applying SubgraphStrategy."); // final List<GraphStep> graphSteps = TraversalHelper.getStepsOfAssignableClass(GraphStep.class, traversal); final List<VertexStep> vertexSteps = TraversalHelper.getStepsOfAssignableClass(VertexStep.class, traversal);
