Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-880 05ed3c293 -> 99d38d4a4
fixed a bug in release docs. TinkerGraphPlay test had groupV3d0() references. Also, new graph_traversal.py created accordingly. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/99d38d4a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/99d38d4a Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/99d38d4a Branch: refs/heads/TINKERPOP-880 Commit: 99d38d4a484ea2600d1bf7e1ec45f4f415407e07 Parents: 05ed3c2 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Mon Jul 10 10:26:54 2017 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Mon Jul 10 10:26:54 2017 -0600 ---------------------------------------------------------------------- docs/src/upgrade/release-3.3.x.asciidoc | 4 +- .../gremlin_python/process/graph_traversal.py | 12 ------ .../structure/TinkerGraphPlayTest.java | 39 +------------------- 3 files changed, 3 insertions(+), 52 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/99d38d4a/docs/src/upgrade/release-3.3.x.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index 3193906..baae438 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -211,8 +211,8 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.process.traversal.util.OrP(P...)` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptFunction` ** `org.apache.tinkerpop.gremlin.process.traversal.util.TraversalScriptHelper` -** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph#groupV3d0(String)` -** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph#groupV3d0()` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#groupV3d0(String)` +** `org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversal#groupV3d0()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#supportsAddProperty()` ** `org.apache.tinkerpop.gremlin.structure.Graph.Features.VertexPropertyFeatures#FEATURE_ADD_PROPERTY` ** `org.apache.tinkerpop.gremlin.structure.Graph.OptIn#SUITE_GROOVY_PROCESS_STANDARD` http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/99d38d4a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py ---------------------------------------------------------------------- diff --git a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py index ec5797e..c885f0a 100644 --- a/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py +++ b/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py @@ -240,10 +240,6 @@ class GraphTraversal(Traversal): self.bytecode.add_step("groupCount", *args) return self - def groupV3d0(self, *args): - self.bytecode.add_step("groupV3d0", *args) - return self - def has(self, *args): self.bytecode.add_step("has", *args) return self @@ -644,10 +640,6 @@ class __(object): return cls.graph_traversal(None, None, Bytecode()).groupCount(*args) @classmethod - def groupV3d0(cls, *args): - return cls.graph_traversal(None, None, Bytecode()).groupV3d0(*args) - - @classmethod def has(cls, *args): return cls.graph_traversal(None, None, Bytecode()).has(*args) @@ -1017,10 +1009,6 @@ def groupCount(*args): return __.groupCount(*args) statics.add_static('groupCount', groupCount) -def groupV3d0(*args): - return __.groupV3d0(*args) -statics.add_static('groupV3d0', groupV3d0) - def has(*args): return __.has(*args) statics.add_static('has', has) http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/99d38d4a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java ---------------------------------------------------------------------- diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java index 37187fe..6ab8827 100644 --- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java +++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphPlayTest.java @@ -106,44 +106,7 @@ public class TinkerGraphPlayTest { //assertEquals(result, t.next()); })); } - - @Test - @Ignore - public void benchmarkGroup() throws Exception { - Graph graph = TinkerGraph.open(); - GraphTraversalSource g = graph.traversal(); - graph.io(GraphMLIo.build()).readGraph("../data/grateful-dead.xml"); - ///////// - - //g.V().group().by(T.label).by(values("name")).forEachRemaining(x -> logger.info(x.toString())); - - System.out.println("group: " + g.V().both("followedBy").both("followedBy").group().by("songType").by(count()).next()); - System.out.println("groupV3d0: " + g.V().both("followedBy").both("followedBy").groupV3d0().by("songType").by().by(__.count(Scope.local)).next()); - - // - System.out.println("\n\nBig Values -- by(songType)"); - - System.out.println("group: " + TimeUtil.clock(10, () -> g.V().both("followedBy").both("followedBy").group().by("songType").by(count()).next())); - System.out.println("groupV3d0: " + TimeUtil.clock(10, () -> g.V().both("followedBy").both("followedBy").groupV3d0().by("songType").by().by(__.count(Scope.local)).next()) + "\n"); - - /// - - System.out.println("group: " + TimeUtil.clock(10, () -> g.V().both("followedBy").both("followedBy").group().by("songType").by(fold()).next())); - System.out.println("groupV3d0: " + TimeUtil.clock(10, () -> g.V().both("followedBy").both("followedBy").groupV3d0().by("songType").by().next())); - - /// - System.out.println("\n\nBig Keys -- by(name)"); - - System.out.println("group: " + TimeUtil.clock(10, () -> g.V().both("followedBy").both("followedBy").group().by("name").by(count()).next())); - System.out.println("groupV3d0: " + TimeUtil.clock(10, () -> g.V().both("followedBy").both("followedBy").groupV3d0().by("name").by().by(__.count(Scope.local)).next()) + "\n"); - - /// - - System.out.println("group: " + TimeUtil.clock(10, () -> g.V().both("followedBy").both("followedBy").group().by("name").by(fold()).next())); - System.out.println("groupV3d0: " + TimeUtil.clock(10, () -> g.V().both("followedBy").both("followedBy").groupV3d0().by("name").by().next())); - - } - + @Test @Ignore public void testPlay() {