Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1629 5e6dd725e -> 35bb17ebb
removed the verification exception with barriers inside of repeat(). @dkuppitz, can you fix you test cases as they are expected different return types. store() uses BulkSet, not List. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/35bb17eb Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/35bb17eb Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/35bb17eb Branch: refs/heads/TINKERPOP-1629 Commit: 35bb17ebbb7395b8655d930d6caec2d3249b20bf Parents: 5e6dd72 Author: Marko A. Rodriguez <[email protected]> Authored: Thu Feb 16 16:36:20 2017 -0700 Committer: Marko A. Rodriguez <[email protected]> Committed: Thu Feb 16 16:36:20 2017 -0700 ---------------------------------------------------------------------- .../strategy/verification/StandardVerificationStrategy.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/35bb17eb/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategy.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategy.java index f72de50..4d8b754 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/verification/StandardVerificationStrategy.java @@ -57,8 +57,9 @@ public final class StandardVerificationStrategy extends AbstractTraversalStrateg if (Graph.Hidden.isHidden(label)) step.removeLabel(label); } - if (step instanceof ReducingBarrierStep && step.getTraversal().getParent() instanceof RepeatStep && step.getTraversal().getParent().getGlobalChildren().get(0).getSteps().contains(step)) - throw new VerificationException("The parent of a reducing barrier can not be repeat()-step: " + step, traversal); + // TODO: REMOVE THIS WHEN THIS BRANCH IS DONE (TINKERPOP-1629) + /*if (step instanceof ReducingBarrierStep && step.getTraversal().getParent() instanceof RepeatStep && step.getTraversal().getParent().getGlobalChildren().get(0).getSteps().contains(step)) + throw new VerificationException("The parent of a reducing barrier can not be repeat()-step: " + step, traversal);*/ } // The ProfileSideEffectStep must be the last step, 2nd last step when accompanied by the cap step,
