Repository: incubator-tinkerpop Updated Branches: refs/heads/TINKERPOP-1312 5751456fc -> 3f9a256db
Fixed the previous commit. We don't want to increase the step offset, but decrease the traversal size, after removing steps from a traversal. Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3f9a256d Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3f9a256d Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3f9a256d Branch: refs/heads/TINKERPOP-1312 Commit: 3f9a256db449f0a8bbca3ca9fce8355a6dbb9a39 Parents: 5751456 Author: Daniel Kuppitz <daniel_kupp...@hotmail.com> Authored: Wed May 25 21:55:27 2016 +0200 Committer: Daniel Kuppitz <daniel_kupp...@hotmail.com> Committed: Wed May 25 21:55:27 2016 +0200 ---------------------------------------------------------------------- .../traversal/strategy/optimization/RangeByIsCountStrategy.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3f9a256d/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java index 1b544c2..efa79e6 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RangeByIsCountStrategy.java @@ -70,7 +70,7 @@ public final class RangeByIsCountStrategy extends AbstractTraversalStrategy<Trav @Override public void apply(final Traversal.Admin<?, ?> traversal) { - final int size = traversal.getSteps().size(); + int size = traversal.getSteps().size(); Step prev = null; for (int i = 0; i < size; i++) { final Step curr = traversal.getSteps().get(i); @@ -109,7 +109,7 @@ public final class RangeByIsCountStrategy extends AbstractTraversalStrategy<Trav if (useNotStep) { traversal.asAdmin().removeStep(next); // IsStep traversal.asAdmin().removeStep(curr); // CountStep - i += 2; + size -= 2; final Traversal.Admin inner = __.start().asAdmin(); TraversalHelper.insertAfterStep(prev, inner.getStartStep(), inner); TraversalHelper.replaceStep(prev, new NotStep<>(traversal, inner), traversal);
