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 2015/02/11 13:13:29 UTC
incubator-tinkerpop git commit: fixed a small bug in how
applyStrategies() works in DefaultTraversal.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master cb7aacfc6 -> 75c7ee067
fixed a small bug in how applyStrategies() works in DefaultTraversal.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/75c7ee06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/75c7ee06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/75c7ee06
Branch: refs/heads/master
Commit: 75c7ee0678b8808cacf8f8a746514efc0263d927
Parents: cb7aacf
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Feb 11 05:13:26 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Feb 11 05:13:26 2015 -0700
----------------------------------------------------------------------
.../gremlin/process/traversal/DefaultTraversal.java | 7 ++++---
.../gremlin/process/traversal/util/TraversalHelper.java | 12 ++++++------
2 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/75c7ee06/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversal.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
index 1ae3f2a..eef59db 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/DefaultTraversal.java
@@ -157,11 +157,11 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
final DefaultTraversal<S, E> clone = (DefaultTraversal<S, E>) super.clone();
clone.steps = new ArrayList<>();
clone.sideEffects = this.sideEffects.clone();
- clone.strategies = this.strategies.clone();
+ clone.strategies = this.strategies.clone(); // TODO: does this need to be cloned?
clone.lastEnd = null;
clone.lastEndCount = 0l;
- clone.traversalEngine = this.traversalEngine.isPresent() ? Optional.of(this.traversalEngine.get()) : Optional.empty();
- clone.locked = !clone.traversalEngine.isPresent();
+ //clone.traversalEngine = this.traversalEngine.isPresent() ? Optional.of(this.traversalEngine.get()) : Optional.empty();
+ //clone.locked = this.traversalEngine.isPresent();
for (final Step<?, ?> step : this.steps) {
final Step<?, ?> clonedStep = step.clone();
clonedStep.setTraversal(clone);
@@ -170,6 +170,7 @@ public class DefaultTraversal<S, E> implements Traversal.Admin<S, E> {
previousStep.setNextStep(clonedStep);
clone.steps.add(clonedStep);
}
+ clone.finalEndStep = clone.getEndStep();
return clone;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/75c7ee06/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
index a1b1127..63b0742 100644
--- a/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
+++ b/gremlin-core/src/main/java/com/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
@@ -270,17 +270,17 @@ public final class TraversalHelper {
Traversal.Admin<?, ?> current = traversal;
while (!(current instanceof EmptyTraversal)) {
stepPosition.y++;
- final TraversalParent holder = current.getParent();
- if (null == stepPosition.parentId && !(holder instanceof EmptyStep))
- stepPosition.parentId = holder.asStep().getId();
+ final TraversalParent parent = current.getParent();
+ if (null == stepPosition.parentId && !(parent instanceof EmptyStep))
+ stepPosition.parentId = parent.asStep().getId();
if (-1 == stepPosition.z) {
- for (int i = 0; i < holder.getGlobalChildren().size(); i++) {
- if (holder.getGlobalChildren().get(i) == current) {
+ for (int i = 0; i < parent.getGlobalChildren().size(); i++) {
+ if (parent.getGlobalChildren().get(i) == current) {
stepPosition.z = i;
}
}
}
- current = holder.asStep().getTraversal();
+ current = parent.asStep().getTraversal();
}
if (-1 == stepPosition.z) stepPosition.z = 0;
if (null == stepPosition.parentId) stepPosition.parentId = "";