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/10 17:34:37 UTC
[2/4] tinkerpop git commit: no local children end steps need
NoOpBarriers.
no local children end steps need NoOpBarriers.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bdd1924a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bdd1924a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bdd1924a
Branch: refs/heads/tp32
Commit: bdd1924a4cdf32d9b0cc841cf24a73864ff64f04
Parents: 2760645
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jan 9 09:41:42 2017 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jan 9 09:41:42 2017 -0700
----------------------------------------------------------------------
.../traversal/strategy/optimization/PathRetractionStrategy.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bdd1924a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategy.java
index 1d09748..b5992a5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategy.java
@@ -110,7 +110,7 @@ public final class PathRetractionStrategy extends AbstractTraversalStrategy<Trav
!(currentStep instanceof Barrier) &&
!(currentStep.getNextStep() instanceof Barrier) &&
!(currentStep.getTraversal().getParent() instanceof MatchStep) &&
- TraversalHelper.isGlobalChild(currentStep.getTraversal()))
+ (currentStep.getNextStep() instanceof EmptyStep && TraversalHelper.isGlobalChild(currentStep.getTraversal())))
TraversalHelper.insertAfterStep(new NoOpBarrierStep<>(traversal, this.standardBarrierSize), currentStep, traversal);
}
}