Repository: tinkerpop Updated Branches: refs/heads/TRAVIS-TEST fa3ef4da2 -> 2bb0b5075
foo Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2bb0b507 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2bb0b507 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2bb0b507 Branch: refs/heads/TRAVIS-TEST Commit: 2bb0b5075fca6a3999a6fc69f361828515aa3be9 Parents: fa3ef4d Author: Daniel Kuppitz <daniel_kupp...@hotmail.com> Authored: Mon Mar 12 11:33:40 2018 -0700 Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com> Committed: Mon Mar 12 11:33:40 2018 -0700 ---------------------------------------------------------------------- .../traversal/strategy/decoration/RequirementsStrategy.java | 5 +++++ .../traversal/strategy/decoration/SubgraphStrategy.java | 6 +++++- gremlin-test/src/test/resources/log4j-silent.properties | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2bb0b507/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 fc3f181..aa3da3d 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 @@ -27,6 +27,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep; import org.apache.tinkerpop.gremlin.process.traversal.step.util.RequirementsStep; import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy; import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.Collections; import java.util.HashSet; @@ -37,6 +39,8 @@ import java.util.Set; */ public final class RequirementsStrategy extends AbstractTraversalStrategy<TraversalStrategy.DecorationStrategy> implements TraversalStrategy.DecorationStrategy { + private static final Logger logger = LoggerFactory.getLogger(RequirementsStrategy.class); + private final Set<TraverserRequirement> requirements = new HashSet<>(); private RequirementsStrategy() { @@ -44,6 +48,7 @@ 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)); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2bb0b507/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 9f4f75c..f31c39e 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 @@ -55,6 +55,8 @@ import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.PropertyType; import org.apache.tinkerpop.gremlin.structure.Vertex; import org.apache.tinkerpop.gremlin.structure.VertexProperty; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import java.util.*; import java.util.stream.Collectors; @@ -72,6 +74,8 @@ import java.util.stream.Stream; public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalStrategy.DecorationStrategy> implements TraversalStrategy.DecorationStrategy { + private static final Logger logger = LoggerFactory.getLogger(SubgraphStrategy.class); + private final Traversal.Admin<Vertex, ?> vertexCriterion; private final Traversal.Admin<Edge, ?> edgeCriterion; private final Traversal.Admin<VertexProperty, ?> vertexPropertyCriterion; @@ -143,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; } - RequirementsStrategy.addRequirements(traversal.getStrategies(), TraverserRequirement.PATH); // final List<GraphStep> graphSteps = TraversalHelper.getStepsOfAssignableClass(GraphStep.class, traversal); final List<VertexStep> vertexSteps = TraversalHelper.getStepsOfAssignableClass(VertexStep.class, traversal); http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2bb0b507/gremlin-test/src/test/resources/log4j-silent.properties ---------------------------------------------------------------------- diff --git a/gremlin-test/src/test/resources/log4j-silent.properties b/gremlin-test/src/test/resources/log4j-silent.properties index ce0647e..11d48f6 100644 --- a/gremlin-test/src/test/resources/log4j-silent.properties +++ b/gremlin-test/src/test/resources/log4j-silent.properties @@ -17,7 +17,7 @@ # this file should always have logging set to OFF. it seems, however, that an appender of some sort is # required or else some logs throw error and use other log4j.properties files on the path. -log4j.rootLogger=OFF, stdout +log4j.rootLogger=ERROR, stdout log4j.appender.stdout=org.apache.log4j.ConsoleAppender log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=[%p] %C - %m%n
