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/09/30 18:14:53 UTC
incubator-tinkerpop git commit: moved the clone() bug fixes in
RepeatStep and TraversalRing down to tp30.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/tp30 78cfe5b12 -> 675b9c4cd
moved the clone() bug fixes in RepeatStep and TraversalRing down to tp30.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/675b9c4c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/675b9c4c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/675b9c4c
Branch: refs/heads/tp30
Commit: 675b9c4cdf272137aa9e4d9729632b722f8ec684
Parents: 78cfe5b
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Sep 30 10:14:48 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Sep 30 10:14:48 2015 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 1 +
.../traversal/step/branch/RepeatStep.java | 35 ++++++++++++--------
.../process/traversal/util/TraversalRing.java | 6 ++--
3 files changed, 25 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/675b9c4c/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ee7e7d9..3ae1142 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -25,6 +25,7 @@ image::https://raw.githubusercontent.com/apache/incubator-tinkerpop/master/docs/
TinkerPop 3.0.2 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Fixed a `clone()` bug in `RepeatStep` and `TraversalRing`.
* Fixed a thread context bug in `TinkerGraphComputer`.
* Improved session closing for transactional graphs during shutdown of Gremlin Server.
* Fixed id parameter used in tests for `GroovyStoreTest` and `GroovyRepeatTest` to not be treated as an embedded string.
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/675b9c4c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
index 21d848a..518bf51 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/RepeatStep.java
@@ -28,7 +28,12 @@ import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalUtil;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.List;
+import java.util.NoSuchElementException;
+import java.util.Set;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -218,7 +223,7 @@ public final class RepeatStep<S> extends ComputerAwareStep<S, S> implements Trav
///////////////////////////////////
- public class RepeatEndStep extends ComputerAwareStep<S, S> {
+ public static class RepeatEndStep<S> extends ComputerAwareStep<S, S> {
public RepeatEndStep(final Traversal.Admin traversal) {
super(traversal);
@@ -226,18 +231,19 @@ public final class RepeatStep<S> extends ComputerAwareStep<S, S> implements Trav
@Override
protected Iterator<Traverser<S>> standardAlgorithm() throws NoSuchElementException {
+ final RepeatStep<S> repeatStep = (RepeatStep<S>) this.getTraversal().getParent();
while (true) {
final Traverser.Admin<S> start = this.starts.next();
start.incrLoops(this.getId());
- if (doUntil(start, false)) {
+ if (repeatStep.doUntil(start, false)) {
start.resetLoops();
return IteratorUtils.of(start);
} else {
- if (!RepeatStep.this.untilFirst && !RepeatStep.this.emitFirst)
- RepeatStep.this.repeatTraversal.addStart(start);
+ if (!repeatStep.untilFirst && !repeatStep.emitFirst)
+ repeatStep.repeatTraversal.addStart(start);
else
- RepeatStep.this.addStart(start);
- if (doEmit(start, false)) {
+ repeatStep.addStart(start);
+ if (repeatStep.doEmit(start, false)) {
final Traverser.Admin<S> emitSplit = start.split();
emitSplit.resetLoops();
return IteratorUtils.of(emitSplit);
@@ -248,18 +254,19 @@ public final class RepeatStep<S> extends ComputerAwareStep<S, S> implements Trav
@Override
protected Iterator<Traverser<S>> computerAlgorithm() throws NoSuchElementException {
+ final RepeatStep<S> repeatStep = (RepeatStep<S>) this.getTraversal().getParent();
final Traverser.Admin<S> start = this.starts.next();
- start.incrLoops(RepeatStep.this.getId());
- if (doUntil(start, false)) {
+ start.incrLoops(repeatStep.getId());
+ if (repeatStep.doUntil(start, false)) {
start.resetLoops();
- start.setStepId(RepeatStep.this.getNextStep().getId());
+ start.setStepId(repeatStep.getNextStep().getId());
return IteratorUtils.of(start);
} else {
- start.setStepId(RepeatStep.this.getId());
- if (doEmit(start, false)) {
+ start.setStepId(repeatStep.getId());
+ if (repeatStep.doEmit(start, false)) {
final Traverser.Admin<S> emitSplit = start.split();
emitSplit.resetLoops();
- emitSplit.setStepId(RepeatStep.this.getNextStep().getId());
+ emitSplit.setStepId(repeatStep.getNextStep().getId());
return IteratorUtils.of(start, emitSplit);
}
return IteratorUtils.of(start);
@@ -267,4 +274,4 @@ public final class RepeatStep<S> extends ComputerAwareStep<S, S> implements Trav
}
}
-}
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/675b9c4c/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalRing.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalRing.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalRing.java
index 3b4c709..f1e6c87 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalRing.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalRing.java
@@ -32,8 +32,7 @@ import java.util.List;
*/
public final class TraversalRing<A, B> implements Serializable, Cloneable {
- private final IdentityTraversal<A, B> identityTraversal = new IdentityTraversal<>();
-
+ private IdentityTraversal<A, B> identityTraversal = new IdentityTraversal<>();
private List<Traversal.Admin<A, B>> traversals = new ArrayList<>();
private int currentTraversal = -1;
@@ -80,6 +79,7 @@ public final class TraversalRing<A, B> implements Serializable, Cloneable {
try {
final TraversalRing<A, B> clone = (TraversalRing<A, B>) super.clone();
clone.traversals = new ArrayList<>();
+ clone.identityTraversal = new IdentityTraversal<>();
for (final Traversal.Admin<A, B> traversal : this.traversals) {
clone.addTraversal(traversal.clone());
}
@@ -97,4 +97,4 @@ public final class TraversalRing<A, B> implements Serializable, Cloneable {
}
return result;
}
-}
+}
\ No newline at end of file