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 2017/01/11 00:56:45 UTC
[1/2] tinkerpop git commit: DedupTest now uses name for the order()
instead of id.
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 0f5efa401 -> 31439c03c
DedupTest now uses name for the order() instead of id.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/683c2dfa
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/683c2dfa
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/683c2dfa
Branch: refs/heads/tp32
Commit: 683c2dfa80ddb2fe5f9c19e6a3f9d6f9e9db4950
Parents: 3c80611
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jan 10 11:19:37 2017 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jan 10 11:19:37 2017 -0700
----------------------------------------------------------------------
.../step/filter/GroovyDedupTest.groovy | 4 ++--
.../traversal/step/filter/DedupTest.java | 23 ++++++++++----------
2 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/683c2dfa/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
index 8f5e928..a041fdb 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/filter/GroovyDedupTest.groovy
@@ -101,8 +101,8 @@ public abstract class GroovyDedupTest {
}
@Override
- public Traversal<Vertex, Collection<Vertex>> get_g_V_asXaX_repeatXbothX_timesX3X_emit_asXbX_group_byXselectXaXX_byXselectXbX_dedup_order_byXidX_foldX_selectXvaluesX_unfold_dedup() {
- new ScriptTraversal<>(g, "gremlin-groovy", "g.V.as('a').repeat(both()).times(3).emit.as('b').group.by(select('a')).by(select('b').dedup.order.by(id).fold).select(values).unfold.dedup")
+ public Traversal<Vertex, Collection<String>> get_g_V_asXaX_repeatXbothX_timesX3X_emit_name_asXbX_group_byXselectXaXX_byXselectXbX_dedup_order_foldX_selectXvaluesX_unfold_dedup() {
+ new ScriptTraversal<>(g, "gremlin-groovy", "g.V.as('a').repeat(both()).times(3).emit.name.as('b').group.by(select('a')).by(select('b').dedup.order.fold).select(values).unfold.dedup")
}
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/683c2dfa/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
index 183a3a9..5ac5e22 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/DedupTest.java
@@ -31,6 +31,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -86,7 +87,7 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Long> get_g_V_groupCount_selectXvaluesX_unfold_dedup();
- public abstract Traversal<Vertex, Collection<Vertex>> get_g_V_asXaX_repeatXbothX_timesX3X_emit_asXbX_group_byXselectXaXX_byXselectXbX_dedup_order_byXidX_foldX_selectXvaluesX_unfold_dedup();
+ public abstract Traversal<Vertex, Collection<String>> get_g_V_asXaX_repeatXbothX_timesX3X_emit_name_asXbX_group_byXselectXaXX_byXselectXbX_dedup_order_foldX_selectXvaluesX_unfold_dedup();
public abstract Traversal<Vertex, Long> get_g_V_repeatXdedupX_timesX2X_count();
@@ -289,17 +290,17 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_asXaX_repeatXbothX_timesX3X_emit_asXbX_group_byXselectXaXX_byXselectXbX_dedup_order_byXidX_foldX_selectXvaluesX_unfold_dedup() {
- final Traversal<Vertex, Collection<Vertex>> traversal = get_g_V_asXaX_repeatXbothX_timesX3X_emit_asXbX_group_byXselectXaXX_byXselectXbX_dedup_order_byXidX_foldX_selectXvaluesX_unfold_dedup();
+ final Traversal<Vertex, Collection<String>> traversal = get_g_V_asXaX_repeatXbothX_timesX3X_emit_name_asXbX_group_byXselectXaXX_byXselectXbX_dedup_order_foldX_selectXvaluesX_unfold_dedup();
printTraversalForm(traversal);
- final Collection<Vertex> vertices = traversal.next();
+ final List<String> vertices = new ArrayList<>(traversal.next());
assertFalse(traversal.hasNext());
assertEquals(6, vertices.size());
- assertTrue(vertices.contains(convertToVertex(graph, "marko")));
- assertTrue(vertices.contains(convertToVertex(graph, "vadas")));
- assertTrue(vertices.contains(convertToVertex(graph, "josh")));
- assertTrue(vertices.contains(convertToVertex(graph, "peter")));
- assertTrue(vertices.contains(convertToVertex(graph, "lop")));
- assertTrue(vertices.contains(convertToVertex(graph, "ripple")));
+ assertEquals("josh", vertices.get(0));
+ assertEquals("lop", vertices.get(1));
+ assertEquals("marko", vertices.get(2));
+ assertEquals("peter", vertices.get(3));
+ assertEquals("ripple", vertices.get(4));
+ assertEquals("vadas", vertices.get(5));
}
@Test
@@ -384,8 +385,8 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Collection<Vertex>> get_g_V_asXaX_repeatXbothX_timesX3X_emit_asXbX_group_byXselectXaXX_byXselectXbX_dedup_order_byXidX_foldX_selectXvaluesX_unfold_dedup() {
- return g.V().as("a").repeat(both()).times(3).emit().as("b").group().by(select("a")).by(select("b").dedup().order().by(T.id).fold()).select(values).<Collection<Vertex>>unfold().dedup();
+ public Traversal<Vertex, Collection<String>> get_g_V_asXaX_repeatXbothX_timesX3X_emit_name_asXbX_group_byXselectXaXX_byXselectXbX_dedup_order_foldX_selectXvaluesX_unfold_dedup() {
+ return g.V().as("a").repeat(both()).times(3).emit().values("name").as("b").group().by(select("a")).by(select("b").dedup().order().fold()).select(values).<Collection<String>>unfold().dedup();
}
@Override
[2/2] tinkerpop git commit: Merge branch 'TINKERPOP-1531' into tp32
Posted by ok...@apache.org.
Merge branch 'TINKERPOP-1531' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/31439c03
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/31439c03
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/31439c03
Branch: refs/heads/tp32
Commit: 31439c03cde08ebb2be81c4ef53181b00035d02e
Parents: 0f5efa4 683c2df
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jan 10 17:56:34 2017 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jan 10 17:56:34 2017 -0700
----------------------------------------------------------------------
.../step/filter/GroovyDedupTest.groovy | 4 ++--
.../traversal/step/filter/DedupTest.java | 23 ++++++++++----------
2 files changed, 14 insertions(+), 13 deletions(-)
----------------------------------------------------------------------