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 2016/09/26 14:46:36 UTC
tinkerpop git commit: used the new TraversalHelper.copyLabels() in
RepeatUnrollStrategy and got rid of a stream().
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1456 5b2c723f4 -> be990d421
used the new TraversalHelper.copyLabels() in RepeatUnrollStrategy and got rid of a stream().
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/be990d42
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/be990d42
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/be990d42
Branch: refs/heads/TINKERPOP-1456
Commit: be990d42160131ef78168bc3c3b124d41943c3e0
Parents: 5b2c723
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Sep 26 08:46:27 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Sep 26 08:46:27 2016 -0600
----------------------------------------------------------------------
.../strategy/optimization/RepeatUnrollStrategy.java | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/be990d42/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
index f996ec5..9e1a98d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/RepeatUnrollStrategy.java
@@ -19,7 +19,6 @@
package org.apache.tinkerpop.gremlin.process.traversal.strategy.optimization;
-import org.apache.tinkerpop.gremlin.process.traversal.Step;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.LoopTraversal;
@@ -61,11 +60,8 @@ public final class RepeatUnrollStrategy extends AbstractTraversalStrategy<Traver
traversal.addStep(++insertIndex, new NoOpBarrierStep<>(traversal, 5000));
}
// label last step if repeat() was labeled
- if (!repeatStep.getLabels().isEmpty()) {
- final Step<?, ?> lastStep = traversal.getSteps().get(insertIndex);
- repeatStep.getLabels().forEach(lastStep::addLabel);
- }
-
+ if (!repeatStep.getLabels().isEmpty())
+ TraversalHelper.copyLabels(repeatStep, traversal.getSteps().get(insertIndex), false);
traversal.removeStep(i); // remove the RepeatStep
}
}