You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2017/01/17 12:01:33 UTC
[3/6] tinkerpop git commit: Implemented changes suggested by @okram.
Implemented changes suggested by @okram.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bfbd7d54
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bfbd7d54
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bfbd7d54
Branch: refs/heads/master
Commit: bfbd7d549a19e9b4b2beeff723b0cd821d3ea457
Parents: 71de237
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Jan 10 15:00:57 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Jan 10 15:00:57 2017 +0100
----------------------------------------------------------------------
docs/src/reference/the-traversal.asciidoc | 7 +++--
.../traversal/dsl/graph/GraphTraversal.java | 14 +++++-----
.../gremlin/process/traversal/dsl/graph/__.java | 8 +++---
.../step/filter/GroovyRangeTest.groovy | 8 +++---
.../traversal/step/filter/RangeTest.java | 27 +++++++++-----------
5 files changed, 30 insertions(+), 34 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfbd7d54/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/reference/the-traversal.asciidoc b/docs/src/reference/the-traversal.asciidoc
index 0dafd22..0bdff70 100644
--- a/docs/src/reference/the-traversal.asciidoc
+++ b/docs/src/reference/the-traversal.asciidoc
@@ -865,7 +865,6 @@ The `limit()`-step is analogous to <<range-step,`range()`-step>> save that the l
----
g.V().limit(2)
g.V().range(0, 2)
-g.V().limit(2).toString()
----
The `limit()`-step can also be applied with `Scope.local`, in which case it operates on the incoming collection.
@@ -1924,9 +1923,9 @@ The `skip()`-step is analogous to <<range-step,`range()`-step>> save that the hi
[gremlin-groovy,modern]
----
-g.V().skip(2)
-g.V().range(2, -1)
-g.V().skip(2).toString()
+g.V().values('age').order()
+g.V().values('age').order().skip(2)
+g.V().values('age').order().range(2, -1)
----
The `skip()`-step can also be applied with `Scope.local`, in which case it operates on the incoming collection.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfbd7d54/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
index ecd3cea..9eb2872 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
@@ -1135,16 +1135,16 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
: new RangeLocalStep<>(this.asAdmin(), 0, limit));
}
- public default GraphTraversal<S, E> skip(final long n) {
- this.asAdmin().getBytecode().addStep(Symbols.skip, n);
- return this.asAdmin().addStep(new RangeGlobalStep<>(this.asAdmin(), n, -1));
+ public default GraphTraversal<S, E> skip(final long skip) {
+ this.asAdmin().getBytecode().addStep(Symbols.skip, skip);
+ return this.asAdmin().addStep(new RangeGlobalStep<>(this.asAdmin(), skip, -1));
}
- public default <E2> GraphTraversal<S, E2> skip(final Scope scope, final long n) {
- this.asAdmin().getBytecode().addStep(Symbols.skip, scope, n);
+ public default <E2> GraphTraversal<S, E2> skip(final Scope scope, final long skip) {
+ this.asAdmin().getBytecode().addStep(Symbols.skip, scope, skip);
return this.asAdmin().addStep(scope.equals(Scope.global)
- ? new RangeGlobalStep<>(this.asAdmin(), n, -1)
- : new RangeLocalStep<>(this.asAdmin(), n, -1));
+ ? new RangeGlobalStep<>(this.asAdmin(), skip, -1)
+ : new RangeLocalStep<>(this.asAdmin(), skip, -1));
}
public default GraphTraversal<S, E> tail() {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfbd7d54/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index 33fe2de..d01f49a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -812,15 +812,15 @@ public class __ {
/**
* @see GraphTraversal#skip(long)
*/
- public static <A> GraphTraversal<A, A> skip(final long n) {
- return __.<A>start().skip(n);
+ public static <A> GraphTraversal<A, A> skip(final long skip) {
+ return __.<A>start().skip(skip);
}
/**
* @see GraphTraversal#skip(Scope, long)
*/
- public static <A> GraphTraversal<A, A> skip(final Scope scope, final long n) {
- return __.<A>start().skip(scope, n);
+ public static <A> GraphTraversal<A, A> skip(final Scope scope, final long skip) {
+ return __.<A>start().skip(scope, skip);
}
/**
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfbd7d54/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
index 53f475c..56cb19d 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyRangeTest.groovy
@@ -110,13 +110,13 @@ public abstract class GroovyRangeTest {
}
@Override
- public Traversal<Vertex, Long> get_g_V_skipX2X_count() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.V.skip(2).count()")
+ public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.hasLabel('person').order.by('age').skip(1).values('name')")
}
@Override
- public Traversal<Vertex, List<Vertex>> get_g_V_fold_skipXlocal_2X() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.V.fold.skip(local, 2)")
+ public Traversal<Vertex, List<Double>> get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.outE.values('weight').fold.order(local).skip(local, 2)")
}
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bfbd7d54/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
index 3307e4c..b04c3fa 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RangeTest.java
@@ -81,9 +81,9 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, String>> get_g_V_asXaX_out_asXbX_out_asXcX_selectXa_b_cX_byXnameX_rangeXlocal_1_2X();
- public abstract Traversal<Vertex, Long> get_g_V_skipX2X_count();
+ public abstract Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX();
- public abstract Traversal<Vertex, List<Vertex>> get_g_V_fold_skipXlocal_2X();
+ public abstract Traversal<Vertex, List<Double>> get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X();
@Test
@LoadGraphWith(MODERN)
@@ -321,24 +321,21 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_skipX2X_count() {
- final Traversal<Vertex, Long> traversal = get_g_V_skipX2X_count();
+ public void g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX() {
+ final Traversal<Vertex, String> traversal = get_g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX();
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
- final Long count = traversal.next();
- assertFalse(traversal.hasNext());
- assertEquals(4, count.longValue());
+ assertEquals(Arrays.asList("marko", "josh", "peter"), traversal.toList());
}
@Test
@LoadGraphWith(MODERN)
- public void g_V_fold_skipXlocal_2X() {
- final Traversal<Vertex, List<Vertex>> traversal = get_g_V_fold_skipXlocal_2X();
+ public void g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X() {
+ final Traversal<Vertex, List<Double>> traversal = get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X();
printTraversalForm(traversal);
assertTrue(traversal.hasNext());
- final List<Vertex> list = traversal.next();
+ assertEquals(Arrays.asList(0.4, 0.5, 1.0, 1.0), traversal.next());
assertFalse(traversal.hasNext());
- assertEquals(4, list.size());
}
public static class Traversals extends RangeTest {
@@ -423,13 +420,13 @@ public abstract class RangeTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Long> get_g_V_skipX2X_count() {
- return g.V().skip(2).count();
+ public Traversal<Vertex, String> get_g_V_hasLabelXpersonX_order_byXageXskipX1X_valuesXnameX() {
+ return g.V().hasLabel("person").order().by("age").skip(1).values("name");
}
@Override
- public Traversal<Vertex, List<Vertex>> get_g_V_fold_skipXlocal_2X() {
- return g.V().fold().skip(local, 2);
+ public Traversal<Vertex, List<Double>> get_g_V_outE_valuesXweightX_fold_orderXlocalX_skipXlocal_2X() {
+ return g.V().outE().values("weight").fold().order(local).skip(local, 2);
}
}
}