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/02/25 15:59:43 UTC
[1/2] incubator-tinkerpop git commit: added tests for sideEffect
steps (group and groupCount)
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 960eeb541 -> 4befd1deb
added tests for sideEffect steps (group and groupCount)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/83ebad7f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/83ebad7f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/83ebad7f
Branch: refs/heads/master
Commit: 83ebad7fe964ac2be07a936b226c092fd82a1d75
Parents: fef1f78
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Feb 23 21:39:19 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Feb 23 21:39:19 2015 +0100
----------------------------------------------------------------------
.../step/sideEffect/GroovyGroupCountTest.groovy | 23 ++++++++++-
.../step/sideEffect/GroupCountTest.java | 40 ++++++++++++++------
2 files changed, 49 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/83ebad7f/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy
index ce29d0d..6505384 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupCountTest.groovy
@@ -18,12 +18,11 @@
*/
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
+import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
import org.apache.tinkerpop.gremlin.process.Traversal
import org.apache.tinkerpop.gremlin.process.TraversalEngine
import org.apache.tinkerpop.gremlin.process.UseEngine
import org.apache.tinkerpop.gremlin.process.graph.traversal.__
-import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupCountTest
import org.apache.tinkerpop.gremlin.structure.Vertex
/**
@@ -40,6 +39,11 @@ public abstract class GroovyGroupCountTest {
}
@Override
+ public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_groupCountXaX_byXnameX_capXaX() {
+ g.V.out('created').groupCount('a').by('name').cap('a')
+ }
+
+ @Override
public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_name_groupCount() {
g.V.out('created').name.groupCount
}
@@ -55,6 +59,11 @@ public abstract class GroovyGroupCountTest {
}
@Override
+ public Traversal<Vertex, Map<Object, Long>> get_g_V_hasXnoX_groupCountXaX_capXaX() {
+ g.V.has('no').groupCount('a').cap('a');
+ }
+
+ @Override
public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupCountXaX_byXnameXX_timesX2X_capXaX() {
g.V.repeat(__.out.groupCount('a').by('name')).times(2).cap('a')
}
@@ -76,6 +85,11 @@ public abstract class GroovyGroupCountTest {
}
@Override
+ public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_groupCountXaX_byXnameX_capXaX() {
+ ComputerTestHelper.compute("g.V.out('created').groupCount('a').by('name').cap('a')", g)
+ }
+
+ @Override
public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_name_groupCount() {
ComputerTestHelper.compute("g.V.out('created').name.groupCount", g)
}
@@ -91,6 +105,11 @@ public abstract class GroovyGroupCountTest {
}
@Override
+ public Traversal<Vertex, Map<Object, Long>> get_g_V_hasXnoX_groupCountXaX_capXaX() {
+ ComputerTestHelper.compute("g.V.has('no').groupCount('a').cap('a')", g)
+ }
+
+ @Override
public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupCountXaX_byXnameXX_timesX2X_capXaX() {
ComputerTestHelper.compute("g.V.repeat(__.out.groupCount('a').by('name')).times(2).cap('a')", g)
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/83ebad7f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java
index b0cbb2f..fbdd0c6 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupCountTest.java
@@ -44,12 +44,16 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_groupCount_byXnameX();
+ public abstract Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_groupCountXaX_byXnameX_capXaX();
+
public abstract Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_name_groupCount();
public abstract Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_name_groupCountXaX_capXaX();
public abstract Traversal<Vertex, Map<Object, Long>> get_g_V_hasXnoX_groupCount();
+ public abstract Traversal<Vertex, Map<Object, Long>> get_g_V_hasXnoX_groupCountXaX_capXaX();
+
public abstract Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupCountXaX_byXnameXX_timesX2X_capXaX();
public abstract Traversal<Vertex, Map<String, Long>> get_g_V_unionXrepeatXoutX_timesX2X_groupCountXmX_byXlangXX__repeatXinX_timesX2X_groupCountXmX_byXnameXX_capXmX();
@@ -58,13 +62,14 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_outXcreatedX_groupCount_byXnameX() {
- final Traversal<Vertex, Map<String, Long>> traversal = get_g_V_outXcreatedX_groupCount_byXnameX();
- printTraversalForm(traversal);
- final Map<String, Long> map = traversal.next();
- assertEquals(map.size(), 2);
- assertEquals(Long.valueOf(3l), map.get("lop"));
- assertEquals(Long.valueOf(1l), map.get("ripple"));
- assertFalse(traversal.hasNext());
+ Arrays.asList(get_g_V_outXcreatedX_groupCount_byXnameX(), get_g_V_outXcreatedX_groupCountXaX_byXnameX_capXaX()).forEach(traversal -> {
+ printTraversalForm(traversal);
+ final Map<String, Long> map = traversal.next();
+ assertEquals(map.size(), 2);
+ assertEquals(Long.valueOf(3l), map.get("lop"));
+ assertEquals(Long.valueOf(1l), map.get("ripple"));
+ assertFalse(traversal.hasNext());
+ });
}
@Test
@@ -83,11 +88,12 @@ 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();
- printTraversalForm(traversal);
- final Map<Object, Long> map = traversal.next();
- assertEquals(0, map.size());
- assertFalse(traversal.hasNext());
+ Arrays.asList(get_g_V_hasXnoX_groupCount(), get_g_V_hasXnoX_groupCountXaX_capXaX()).forEach(traversal -> {
+ printTraversalForm(traversal);
+ final Map<Object, Long> map = traversal.next();
+ assertEquals(0, map.size());
+ assertFalse(traversal.hasNext());
+ });
}
@Test
@@ -132,6 +138,11 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
}
@Override
+ public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_groupCountXaX_byXnameX_capXaX() {
+ return g.V().out("created").<String>groupCount("a").by("name").cap("a");
+ }
+
+ @Override
public Traversal<Vertex, Map<String, Long>> get_g_V_outXcreatedX_name_groupCount() {
return g.V().out("created").values("name").groupCount();
}
@@ -147,6 +158,11 @@ public abstract class GroupCountTest extends AbstractGremlinProcessTest {
}
@Override
+ public Traversal<Vertex, Map<Object, Long>> get_g_V_hasXnoX_groupCountXaX_capXaX() {
+ return g.V().has("no").groupCount("a").cap("a");
+ }
+
+ @Override
public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupCountXaX_byXnameXX_timesX2X_capXaX() {
return g.V().repeat(out().groupCount("a").by("name")).times(2).cap("a");
}
[2/2] incubator-tinkerpop git commit: Merge branch 'master' into
sideeffect-reduce
Posted by ok...@apache.org.
Merge branch 'master' into sideeffect-reduce
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4befd1de
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4befd1de
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4befd1de
Branch: refs/heads/master
Commit: 4befd1debe58e03b971ec5834e78326bbd6ebcef
Parents: 83ebad7 960eeb5
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Feb 23 21:41:03 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Feb 23 21:41:03 2015 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +-
gremlin-console/bin/gremlin.sh | 3 +-
.../graph/traversal/step/map/TreeStep.java | 52 +++++++++-----------
.../sideEffect/GroupCountSideEffectStep.java | 6 +--
.../step/sideEffect/TreeSideEffectStep.java | 20 ++++++--
.../step/util/ReducingBarrierStep.java | 4 +-
.../util/metric/DependantMutableMetrics.java | 5 ++
.../process/util/metric/MutableMetrics.java | 2 +-
.../gremlin/structure/io/kryo/KryoMapper.java | 6 ++-
.../step/sideEffect/GroovyProfileTest.groovy | 9 ++--
.../traversal/step/sideEffect/ProfileTest.java | 35 +++++++------
11 files changed, 80 insertions(+), 64 deletions(-)
----------------------------------------------------------------------