introduced a minor bug into CollectingBarrierStep that would only be noticed by asynchrnous traversal execution engines. I noticed it in the GraphActors branch. Also, added a toString() to ProjectedTraverser. CTR.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8ad29113 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8ad29113 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8ad29113 Branch: refs/heads/TINKERPOP-1602 Commit: 8ad291134d1b9febdae437e855812185b41c73db Parents: 6002299 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Thu Jan 19 13:01:07 2017 -0700 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Thu Jan 19 13:01:07 2017 -0700 ---------------------------------------------------------------------- .../process/traversal/step/util/CollectingBarrierStep.java | 4 ++-- .../gremlin/process/traversal/traverser/ProjectedTraverser.java | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ad29113/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/CollectingBarrierStep.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/CollectingBarrierStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/CollectingBarrierStep.java index f99201d..8409c9f 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/CollectingBarrierStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/util/CollectingBarrierStep.java @@ -97,8 +97,8 @@ public abstract class CollectingBarrierStep<S> extends AbstractStep<S, S> implem @Override public void addBarrier(final TraverserSet<S> barrier) { - this.traverserSet = barrier; - this.traverserSet.forEach(traverser -> traverser.setSideEffects(this.getTraversal().getSideEffects())); + barrier.forEach(traverser -> traverser.setSideEffects(this.getTraversal().getSideEffects())); + this.traverserSet.addAll(barrier); this.barrierConsumed = false; } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ad29113/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/ProjectedTraverser.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/ProjectedTraverser.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/ProjectedTraverser.java index 128e377..602f88f 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/ProjectedTraverser.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/ProjectedTraverser.java @@ -182,6 +182,11 @@ public final class ProjectedTraverser<T, P> implements Traverser.Admin<T> { } @Override + public String toString() { + return this.baseTraverser.toString(); + } + + @Override public ProjectedTraverser<T, P> clone() { try { final ProjectedTraverser<T, P> clone = (ProjectedTraverser<T, P>) super.clone();
