Merge remote-tracking branch 'origin/tp31' Conflicts: gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/192d5ec7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/192d5ec7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/192d5ec7 Branch: refs/heads/TINKERPOP-1308 Commit: 192d5ec7e9770d1c40d0d54605f8028f44ee5d1b Parents: 44d40f6 55a509f Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue May 24 16:20:18 2016 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue May 24 16:20:18 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../traversal/step/sideEffect/SubgraphStep.java | 19 ++++++---- .../step/sideEffect/GroovySubgraphTest.groovy | 5 +++ .../traversal/step/sideEffect/SubgraphTest.java | 40 ++++++++++++++++++-- 4 files changed, 53 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/192d5ec7/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/192d5ec7/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySubgraphTest.groovy ---------------------------------------------------------------------- diff --cc gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySubgraphTest.groovy index 12adbca,c3ae74a..7e3765a --- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySubgraphTest.groovy +++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovySubgraphTest.groovy @@@ -39,7 -39,12 +39,12 @@@ public abstract class GroovySubgraphTes @Override public Traversal<Vertex, String> get_g_V_withSideEffectXsgX_repeatXbothEXcreatedX_subgraphXsgX_outVX_timesX5X_name_dedup( final Graph subgraph) { - TraversalScriptHelper.compute("g.withSideEffect('sg') { subgraph }.V.repeat(__.bothE('created').subgraph('sg').outV).times(5).name.dedup", g, "subgraph", subgraph) + new ScriptTraversal<>(g, "gremlin-groovy", "g.withSideEffect('sg') { subgraph }.V.repeat(__.bothE('created').subgraph('sg').outV).times(5).name.dedup", "subgraph", subgraph) } + + @Override + public Traversal<Vertex, Vertex> get_g_withSideEffectXsgX_V_hasXname_danielX_outE_subgraphXsgX_inV(final Graph subgraph) { - TraversalScriptHelper.compute("g.withSideEffect('sg') { subgraph }.V.has('name','daniel').outE.subgraph('sg').inV", g, "subgraph", subgraph); ++ new ScriptTraversal<>(g, "gremlin-groovy", "g.withSideEffect('sg') { subgraph }.V.has('name','daniel').outE.subgraph('sg').inV", "subgraph", subgraph) + } } } http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/192d5ec7/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java ---------------------------------------------------------------------- diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java index b01bcb5,dc55685..9f2a662 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java @@@ -95,8 -100,30 +100,30 @@@ public abstract class SubgraphTest exte final Traversal<Vertex, String> traversal = get_g_V_withSideEffectXsgX_repeatXbothEXcreatedX_subgraphXsgX_outVX_timesX5X_name_dedup(subgraph); printTraversalForm(traversal); checkResults(Arrays.asList("marko", "josh", "peter"), traversal); - final Graph subGraph = traversal.asAdmin().getSideEffects().<Graph>get("sg"); - assertVertexEdgeCounts(subGraph, 5, 4); - subgraph = traversal.asAdmin().getSideEffects().<Graph>get("sg").get(); ++ subgraph = traversal.asAdmin().getSideEffects().<Graph>get("sg"); + assertVertexEdgeCounts(subgraph, 5, 4); + + graphProvider.clear(subgraph, config); + } + + @Test + @LoadGraphWith(CREW) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_ADD_VERTICES) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = FEATURE_ADD_EDGES) + @FeatureRequirement(featureClass = Graph.Features.VertexFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS) + @FeatureRequirement(featureClass = Graph.Features.EdgeFeatures.class, feature = FEATURE_USER_SUPPLIED_IDS) + public void g_withSideEffectXsgX_V_hasXname_danielXout_capXsgX() throws Exception { + final Configuration config = graphProvider.newGraphConfiguration("subgraph", this.getClass(), name.getMethodName(), CREW); + graphProvider.clear(config); + final Graph subgraph = graphProvider.openTestGraph(config); + ///// + final Traversal<Vertex, Vertex> traversal = get_g_withSideEffectXsgX_V_hasXname_danielX_outE_subgraphXsgX_inV(subgraph); + printTraversalForm(traversal); + traversal.iterate(); + assertVertexEdgeCounts(subgraph, 3, 2); + + final List<String> locations = subgraph.traversal().V().has("name", "daniel").<String>values("location").toList(); + assertThat(locations, contains("spremberg", "kaiserslautern", "aachen")); graphProvider.clear(subgraph, config); }