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 2016/03/10 19:14:18 UTC
[20/20] incubator-tinkerpop git commit: Fixed GroovyOrderTest to use
ScripTraversal instead of TraversalScriptHelper from the upmerge from tp31.
CTR.
Fixed GroovyOrderTest to use ScripTraversal instead of TraversalScriptHelper from the upmerge from tp31. CTR.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/21e780be
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/21e780be
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/21e780be
Branch: refs/heads/master
Commit: 21e780be2686b6ccb17a4d14587259d4172a47ac
Parents: be0b788 636dc2b
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Mar 10 11:13:48 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Mar 10 11:13:48 2016 -0700
----------------------------------------------------------------------
CHANGELOG.asciidoc | 6 +-
docs/src/dev/provider/index.asciidoc | 3 +-
.../src/reference/gremlin-applications.asciidoc | 91 +++++++-
.../reference/implementations-hadoop.asciidoc | 4 +-
.../reference/implementations-neo4j.asciidoc | 2 +-
docs/src/reference/intro.asciidoc | 8 +-
docs/src/reference/the-graph.asciidoc | 6 +-
docs/src/reference/the-traversal.asciidoc | 8 +-
.../tutorials/getting-started/index.asciidoc | 16 +-
docs/src/upgrade/index.asciidoc | 1 +
.../upgrade/release-3.1.x-incubating.asciidoc | 42 ++++
.../tinkerpop/gremlin/console/Console.groovy | 4 +-
.../gremlin/console/GremlinGroovysh.groovy | 65 ++++++
.../tinkerpop/gremlin/console/Mediator.groovy | 4 +-
.../console/commands/RemoteCommand.groovy | 23 +-
.../groovy/plugin/DriverRemoteAcceptor.java | 29 ++-
.../DriverRemoteAcceptorIntegrateTest.java | 49 +++-
.../GephiRemoteAcceptorIntegrateTest.java | 3 +-
.../traversal/step/map/OrderGlobalStep.java | 3 +-
.../apache/tinkerpop/gremlin/driver/Client.java | 231 ++++++++-----------
.../tinkerpop/gremlin/driver/Connection.java | 2 +-
.../traversal/step/map/GroovyOrderTest.groovy | 5 +
.../gremlin/groovy/plugin/RemoteAcceptor.java | 16 ++
.../server/op/session/SessionOpProcessor.java | 79 ++++++-
.../server/GremlinDriverIntegrateTest.java | 60 +++++
.../process/traversal/step/map/OrderTest.java | 29 ++-
.../groovy/plugin/HadoopRemoteAcceptor.java | 5 +
27 files changed, 589 insertions(+), 205 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/21e780be/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/21e780be/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/21e780be/docs/src/reference/implementations-hadoop.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/21e780be/docs/src/reference/intro.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/21e780be/docs/src/reference/the-graph.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/21e780be/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/21e780be/docs/src/upgrade/index.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/upgrade/index.asciidoc
index f23d693,e1d07db..ee0c6d3
--- a/docs/src/upgrade/index.asciidoc
+++ b/docs/src/upgrade/index.asciidoc
@@@ -33,9 -33,8 +33,10 @@@ These providers include
** Graph Processor Provider
* Graph Driver Provider
* Graph Language Provider
+ * Graph Plugin Provider
+include::release-3.2.x-incubating.asciidoc[]
+
include::release-3.1.x-incubating.asciidoc[]
include::release-3.0.x-incubating.asciidoc[]
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/21e780be/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
----------------------------------------------------------------------
diff --cc gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
index c8d8323,dd085e9..70fa883
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderGlobalStep.java
@@@ -124,14 -113,4 +124,13 @@@ public final class OrderGlobalStep<S> e
clone.chainedComparator = null;
return clone;
}
+
+ /*@Override
+ public void setTraversal(final Traversal.Admin<?, ?> parentTraversal) {
+ super.setTraversal(parentTraversal);
+ integrateChild(this.keyTraversal);
+ integrateChild(this.valueTraversal);
+ integrateChild(this.reduceTraversal);
+ }*/
+
-
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/21e780be/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
----------------------------------------------------------------------
diff --cc gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
index d250c9d,d5a71e1..8d1df8f
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
@@@ -104,17 -104,12 +104,22 @@@ public abstract class GroovyOrderTest
@Override
public Traversal<Vertex, List<Vertex>> get_g_V_hasLabelXpersonX_fold_orderXlocalX_byXageX() {
- TraversalScriptHelper.compute("g.V.hasLabel('person').fold.order(local).by('age')", g)
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').fold.order(local).by('age')")
+ }
+
+ @Override
+ public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXvalueXageX__decrX_name() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').order.by({it.age},decr).name")
+ }
+
+ @Override
+ public Traversal<Vertex, String> get_g_V_properties_order_byXkey_decrX_key() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.properties().order.by(key, decr).key")
}
+
+ @Override
+ public Traversal<Vertex, Vertex> get_g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_incrX() {
- TraversalScriptHelper.compute("g.V.has('song', 'name', 'OH BOY').out('followedBy').out('followedBy').order.by('performances').by('songType',decr)", g);
++ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.has('song', 'name', 'OH BOY').out('followedBy').out('followedBy').order.by('performances').by('songType',decr)")
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/21e780be/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
index b1d94cc,43fa5b7..117425d
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
@@@ -21,11 -21,11 +21,9 @@@ package org.apache.tinkerpop.gremlin.pr
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
--import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
import org.apache.tinkerpop.gremlin.process.traversal.Order;
import org.apache.tinkerpop.gremlin.process.traversal.Scope;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
--import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.structure.Column;
import org.apache.tinkerpop.gremlin.structure.T;
@@@ -82,10 -83,8 +81,12 @@@ public abstract class OrderTest extend
public abstract Traversal<Vertex, List<Vertex>> get_g_V_hasLabelXpersonX_fold_orderXlocalX_byXageX();
+ public abstract Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXvalueXageX__decrX_name();
+
+ public abstract Traversal<Vertex, String> get_g_V_properties_order_byXkey_decrX_key();
+
+ public abstract Traversal<Vertex, Vertex> get_g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_incrX();
+
@Test
@LoadGraphWith(MODERN)
public void g_V_name_order() {
@@@ -323,37 -323,25 +324,56 @@@
}
@Test
+ @LoadGraphWith(MODERN)
+ public void g_V_hasLabelXpersonX_order_byXvalueXageX__decrX_name() {
+ final Traversal<Vertex, String> traversal = get_g_V_hasLabelXpersonX_order_byXvalueXageX__decrX_name();
+ printTraversalForm(traversal);
+ assertEquals("peter", traversal.next());
+ assertEquals("josh", traversal.next());
+ assertEquals("marko", traversal.next());
+ assertEquals("vadas", traversal.next());
+ assertFalse(traversal.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_properties_order_byXkey_decrX_key() {
+ final Traversal<Vertex, String> traversal = get_g_V_properties_order_byXkey_decrX_key();
+ printTraversalForm(traversal);
+ assertEquals("name", traversal.next());
+ assertEquals("name", traversal.next());
+ assertEquals("name", traversal.next());
+ assertEquals("name", traversal.next());
+ assertEquals("name", traversal.next());
+ assertEquals("name", traversal.next());
+ assertEquals("lang", traversal.next());
+ assertEquals("lang", traversal.next());
+ assertEquals("age", traversal.next());
+ assertEquals("age", traversal.next());
+ assertEquals("age", traversal.next());
+ assertEquals("age", traversal.next());
+ assertFalse(traversal.hasNext());
+ }
+
+ @LoadGraphWith(GRATEFUL)
+ public void g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_incrX() {
+ final Traversal<Vertex, Vertex> traversal = get_g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_incrX();
+ int counter = 0;
+ String lastSongType = "a";
+ int lastPerformances = Integer.MIN_VALUE;
+ while (traversal.hasNext()) {
+ final Vertex vertex = traversal.next();
+ final String currentSongType = vertex.value("songType");
+ final int currentPerformances = vertex.value("performances");
+ assertTrue(currentPerformances == lastPerformances || currentPerformances > lastPerformances);
+ if (currentPerformances == lastPerformances)
+ assertTrue(currentSongType.equals(lastSongType) || currentSongType.compareTo(lastSongType) < 0);
+ lastSongType = currentSongType;
+ lastPerformances = currentPerformances;
+ counter++;
+ }
+ assertEquals(144, counter);
+ }
public static class Traversals extends OrderTest {
@@@ -437,13 -425,8 +457,18 @@@
}
@Override
+ public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXvalueXageX__decrX_name() {
+ return g.V().hasLabel("person").order().<Vertex>by(v -> v.value("age"), Order.decr).values("name");
+ }
+
+ @Override
+ public Traversal<Vertex, String> get_g_V_properties_order_byXkey_decrX_key() {
+ return g.V().properties().order().by(T.key, Order.decr).key();
+ }
++
++ @Override
+ public Traversal<Vertex, Vertex> get_g_V_hasXsong_name_OHBOYX_outXfollowedByX_outXfollowedByX_order_byXperformancesX_byXsongType_incrX() {
+ return g.V().has("song", "name", "OH BOY").out("followedBy").out("followedBy").order().by("performances").by("songType", Order.decr);
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/21e780be/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java
----------------------------------------------------------------------