Repository: tinkerpop Updated Branches: refs/heads/TRAVIS-TEST 806a7275b -> ed2366009
foo Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ed236600 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ed236600 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ed236600 Branch: refs/heads/TRAVIS-TEST Commit: ed2366009054defd19f456911296d09bee2a919b Parents: 806a727 Author: Daniel Kuppitz <daniel_kupp...@hotmail.com> Authored: Tue Mar 13 12:11:19 2018 -0700 Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com> Committed: Tue Mar 13 12:11:19 2018 -0700 ---------------------------------------------------------------------- .../apache/tinkerpop/gremlin/process/traversal/Traversal.java | 4 ++++ .../process/traversal/strategy/decoration/SubgraphStrategy.java | 3 +-- .../gremlin/process/traversal/util/DefaultTraversal.java | 5 +++++ 3 files changed, 10 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ed236600/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java index 220c995..e4a3869 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Traversal.java @@ -425,6 +425,10 @@ public interface Traversal<S, E> extends Iterator<E>, Serializable, Cloneable, A */ public Set<TraverserRequirement> getTraverserRequirements(); + public default void resetTraverserRequirements() { + + }; + /** * Call the {@link Step#reset} method on every step in the traversal. */ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ed236600/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 f19e83b..e5c783a 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 @@ -198,8 +198,7 @@ public final class SubgraphStrategy extends AbstractTraversalStrategy<TraversalS } if (addPathRequirement) { - final Traversal.Admin rootTraversal = TraversalHelper.getRootTraversal(traversal); - RequirementsStrategy.addRequirements(rootTraversal.getStrategies(), TraverserRequirement.PATH); + traversal.resetTraverserRequirements(); } // turn g.V().properties() to g.V().properties().xxx http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ed236600/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java index 585a82b..f045632 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversal.java @@ -166,6 +166,11 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> { } @Override + public void resetTraverserRequirements() { + this.requirements = null; + } + + @Override public List<Step> getSteps() { return this.unmodifiableSteps; }
