sync'd master with GraphActors branch. New tests are failing cause of ProjectedTraverser. Will fix after lunch.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/76eb3d10 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/76eb3d10 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/76eb3d10 Branch: refs/heads/TINKERPOP-1564 Commit: 76eb3d100aad6a8b36fa50c7cafc2907e940dfe6 Parents: 3ac4f3d Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Thu Jan 19 10:39:48 2017 -0700 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Mon Jan 23 14:22:53 2017 -0700 ---------------------------------------------------------------------- .../gremlin/akka/process/actors/AkkaActorsProvider.java | 10 ++++++---- .../process/traversal/traverser/ProjectedTraverser.java | 7 +++++++ 2 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76eb3d10/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaActorsProvider.java ---------------------------------------------------------------------- diff --git a/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaActorsProvider.java b/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaActorsProvider.java index 59c5c7d..a87fa6d 100644 --- a/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaActorsProvider.java +++ b/akka-gremlin/src/test/java/org/apache/tinkerpop/gremlin/akka/process/actors/AkkaActorsProvider.java @@ -29,6 +29,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionTest; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; import org.apache.tinkerpop.gremlin.process.traversal.step.ComplexTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphTest; +import org.apache.tinkerpop.gremlin.process.traversal.step.map.OrderTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProfileTest; import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroupTest; import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.SideEffectTest; @@ -76,10 +77,11 @@ public class AkkaActorsProvider extends AbstractGraphProvider { "g_V_repeatXdedupX_timesX2X_count", "g_V_repeatXoutX_timesX2X_path_byXitX_byXnameX_byXlangX", "g_withSackXmap__map_cloneX_V_out_out_sackXmap_a_nameX_sack", - "g_V_repeatXbothXfollowedByXX_timesX2X_group_byXsongTypeX_byXcountX", - "g_V_out_group_byXlabelX_selectXpersonX_unfold_outXcreatedX_name_limitX2X", - "g_V_hasLabelXsongX_group_byXnameX_byXproperties_groupCount_byXlabelXX", - "g_V_outXfollowedByX_group_byXsongTypeX_byXbothE_group_byXlabelX_byXweight_sumXX", + "g_V_hasLabelXpersonX_order_byXageX_valuesXnameX_skipX1X", + //"g_V_out_group_byXlabelX_selectXpersonX_unfold_outXcreatedX_name_limitX2X", + //"g_V_hasLabelXsongX_group_byXnameX_byXproperties_groupCount_byXlabelXX", + //"g_V_outXfollowedByX_group_byXsongTypeX_byXbothE_group_byXlabelX_byXweight_sumXX", + OrderTest.Traversals.class.getCanonicalName(), GraphTest.Traversals.class.getCanonicalName(), ComplexTest.Traversals.class.getCanonicalName(), SideEffectTest.Traversals.class.getCanonicalName(), http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/76eb3d10/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 602f88f..e32e80d 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 @@ -24,6 +24,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.Step; import org.apache.tinkerpop.gremlin.process.traversal.TraversalSideEffects; import org.apache.tinkerpop.gremlin.process.traversal.Traverser; import org.apache.tinkerpop.gremlin.structure.util.Attachable; +import org.apache.tinkerpop.gremlin.structure.util.Host; import java.util.List; import java.util.Set; @@ -127,6 +128,12 @@ public final class ProjectedTraverser<T, P> implements Traverser.Admin<T> { } @Override + public Admin<T> attach(final Host host) { + this.baseTraverser = this.baseTraverser.attach(host); + return this; + } + + @Override public void setSideEffects(final TraversalSideEffects sideEffects) { this.baseTraverser.setSideEffects(sideEffects); }
