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/05/10 13:33:48 UTC
[09/13] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp31'
Merge remote-tracking branch 'origin/tp31'
Conflicts:
gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/map/GroovyOrderTest.groovy
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3fc50eb6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3fc50eb6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3fc50eb6
Branch: refs/heads/TINKERPOP-1293
Commit: 3fc50eb61f71623aa9b08eea8654c5faa87ac99f
Parents: efe33eb c8901f3
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon May 9 13:10:59 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon May 9 13:10:59 2016 -0400
----------------------------------------------------------------------
.../gremlin/process/traversal/step/map/GroovyOrderTest.groovy | 4 ++--
.../tinkerpop/gremlin/process/traversal/step/map/OrderTest.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fc50eb6/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 717c694,5b7ccea..de33944
--- 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
@@@ -46,7 -46,7 +46,7 @@@ public abstract class GroovyOrderTest
@Override
public Traversal<Vertex, String> get_g_V_order_byXnameX_name() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.V.order.by('name', incr).name")
- TraversalScriptHelper.compute("g.V.order.by('name').name", g)
++ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.order.by('name').name")
}
@Override
@@@ -67,7 -67,7 +67,7 @@@
@Override
public Traversal<Vertex, Map<Integer, Integer>> get_g_VX1X_hasXlabel_personX_mapXmapXint_ageXX_orderXlocalX_byXvalues_decrX_byXkeys_incrX(
final Object v1Id) {
- new ScriptTraversal<>(g, "gremlin-groovy", """g.V(v1Id).map {
- TraversalScriptHelper.compute("""g.V(v1Id).hasLabel("person").map {
++ new ScriptTraversal<>(g, "gremlin-groovy", """g.V(v1Id).hasLabel("person").map {
final Map map = [:];
map[1] = it.age;
map[2] = it.age * 2;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3fc50eb6/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/OrderTest.java
----------------------------------------------------------------------