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 2015/11/11 16:44:19 UTC
incubator-tinkerpop git commit: Added a Traversal test case that
verifies that HashMap is not a problem in Spark/Giraph/TinkerGraph/etc.
#TINKERPOP3-955.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master b9de389b8 -> 49e2b35ae
Added a Traversal test case that verifies that HashMap is not a problem in Spark/Giraph/TinkerGraph/etc. #TINKERPOP3-955.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/49e2b35a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/49e2b35a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/49e2b35a
Branch: refs/heads/master
Commit: 49e2b35aeca726e38cd3a7f7d9a9db8c2fef42f9
Parents: b9de389
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Nov 11 08:43:57 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Nov 11 08:44:12 2015 -0700
----------------------------------------------------------------------
.../step/sideEffect/GroovyGroupCountTest.groovy | 5 +++
.../step/sideEffect/GroupCountTest.java | 32 +++++++++++++++-----
2 files changed, 30 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/49e2b35a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupCountTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupCountTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupCountTest.groovy
index 22fae06..fa90957 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupCountTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroovyGroupCountTest.groovy
@@ -77,5 +77,10 @@ public abstract class GroovyGroupCountTest {
__.repeat(__.in).times(2).groupCount('m').by('name')).cap('m')
""", g)
}
+
+ @Override
+ public Traversal<Vertex, Map<Long, Long>> get_g_V_groupCount_byXbothE_countX() {
+ TraversalScriptHelper.compute("g.V.groupCount.by(bothE().count)", g)
+ }
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/49e2b35a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java
index 616daa2..a8ccb19 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/GroupCountTest.java
@@ -23,10 +23,10 @@ import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.structure.Vertex;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
+import java.util.HashMap;
import java.util.Map;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
@@ -58,10 +58,12 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, Long>> get_g_V_unionXrepeatXoutX_timesX2X_groupCountXmX_byXlangXX__repeatXinX_timesX2X_groupCountXmX_byXnameXX_capXmX();
+ public abstract Traversal<Vertex, Map<Long, Long>> get_g_V_groupCount_byXbothE_countX();
+
@Test
@LoadGraphWith(MODERN)
public void g_V_outXcreatedX_groupCount_byXnameX() {
- final Traversal<Vertex, Map<String,Long>> traversal = get_g_V_outXcreatedX_groupCount_byXnameX();
+ final Traversal<Vertex, Map<String, Long>> traversal = get_g_V_outXcreatedX_groupCount_byXnameX();
printTraversalForm(traversal);
assertCommonA(traversal);
}
@@ -69,7 +71,7 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_outXcreatedX_groupCountXaX_byXnameX_capXaX() {
- final Traversal<Vertex, Map<String,Long>> traversal = get_g_V_outXcreatedX_groupCountXaX_byXnameX_capXaX();
+ final Traversal<Vertex, Map<String, Long>> traversal = get_g_V_outXcreatedX_groupCountXaX_byXnameX_capXaX();
printTraversalForm(traversal);
assertCommonA(traversal);
}
@@ -113,7 +115,7 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_outXcreatedX_name_groupCount() {
- final Traversal<Vertex,Map<String, Long>> traversal = get_g_V_outXcreatedX_name_groupCount();
+ final Traversal<Vertex, Map<String, Long>> traversal = get_g_V_outXcreatedX_name_groupCount();
printTraversalForm(traversal);
assertCommonB(traversal);
}
@@ -121,7 +123,7 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_outXcreatedX_name_groupCountXaX_capXaX() {
- final Traversal<Vertex,Map<String, Long>> traversal = get_g_V_outXcreatedX_name_groupCountXaX_capXaX();
+ final Traversal<Vertex, Map<String, Long>> traversal = get_g_V_outXcreatedX_name_groupCountXaX_capXaX();
printTraversalForm(traversal);
assertCommonB(traversal);
}
@@ -137,7 +139,7 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_filterXfalseX_groupCount() {
- final Traversal<Vertex,Map<Object,Long>> traversal = get_g_V_hasXnoX_groupCount();
+ final Traversal<Vertex, Map<Object, Long>> traversal = get_g_V_hasXnoX_groupCount();
printTraversalForm(traversal);
assertCommonC(traversal);
}
@@ -145,7 +147,7 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasXnoX_groupCountXaX_capXaX() {
- final Traversal<Vertex,Map<Object,Long>> traversal = get_g_V_hasXnoX_groupCountXaX_capXaX();
+ final Traversal<Vertex, Map<Object, Long>> traversal = get_g_V_hasXnoX_groupCountXaX_capXaX();
printTraversalForm(traversal);
assertCommonC(traversal);
}
@@ -182,6 +184,17 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
assertEquals(2, map.get("java").longValue());
}
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_V_groupCount_byXbothE_countX() {
+ final Traversal<Vertex, Map<Long, Long>> traversal = get_g_V_groupCount_byXbothE_countX();
+ printTraversalForm(traversal);
+ checkMap(new HashMap<Long, Long>() {{
+ put(1l, 3l);
+ put(3l, 3l);
+ }}, traversal.next());
+ }
+
public static class Traversals extends GroupCountTest {
@Override
@@ -230,5 +243,10 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
repeat(out()).times(2).groupCount("m").by("lang"),
repeat(in()).times(2).groupCount("m").by("name")).cap("m");
}
+
+ @Override
+ public Traversal<Vertex, Map<Long, Long>> get_g_V_groupCount_byXbothE_countX() {
+ return g.V().<Long>groupCount().by(bothE().count());
+ }
}
}
\ No newline at end of file