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/12 23:06:09 UTC
incubator-tinkerpop git commit: GroupTest no longer uses
unfold().count(), but now count(local).
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 22aa156d1 -> 8099f7349
GroupTest no longer uses unfold().count(), but now count(local).
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8099f734
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8099f734
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8099f734
Branch: refs/heads/master
Commit: 8099f7349ae560c3b62feaa92d35ee59b75c091d
Parents: 22aa156
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Feb 12 15:06:07 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Feb 12 15:06:07 2015 -0700
----------------------------------------------------------------------
.../step/sideEffect/GroovyGroupTest.groovy | 17 ++++++-------
.../traversal/step/sideEffect/GroupTest.java | 25 ++++++++++----------
2 files changed, 22 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8099f734/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy
index 88ec06b..8d744f4 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyGroupTest.groovy
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
+import org.apache.tinkerpop.gremlin.process.Scope
import org.apache.tinkerpop.gremlin.process.Traversal
import org.apache.tinkerpop.gremlin.process.graph.traversal.__
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -41,13 +42,13 @@ public abstract class GroovyGroupTest {
}
@Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_hasXlangX_group_byXlangX_byX1X_byXunfold_countX() {
- g.V.has('lang').group.by('lang').by(__.inject(1)).by(__.unfold().count());
+ public Traversal<Vertex, Map<String, Long>> get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX() {
+ g.V.has('lang').group.by('lang').by(__.inject(1)).by(__.count(Scope.local));
}
@Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupXaX_byXnameX_by_byXsizeXX_timesX2X_capXaX() {
- g.V.repeat(__.out.group('a').by('name').by.by(__.unfold().count())).times(2).cap('a')
+ public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX() {
+ g.V.repeat(__.out.group('a').by('name').by.by(__.count(Scope.local))).times(2).cap('a')
}
@Override
@@ -69,13 +70,13 @@ public abstract class GroovyGroupTest {
}
@Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_hasXlangX_group_byXlangX_byX1X_byXunfold_countX() {
- ComputerTestHelper.compute("g.V.has('lang').group.by('lang').by(__.inject(1)).by(__.unfold().count())", g)
+ public Traversal<Vertex, Map<String, Long>> get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX() {
+ ComputerTestHelper.compute("g.V.has('lang').group.by('lang').by(__.inject(1)).by(__.count(Scope.local))", g)
}
@Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupXaX_byXnameX_by_byXsizeXX_timesX2X_capXaX() {
- ComputerTestHelper.compute("g.V.repeat(__.out.group('a').by('name').by.by(__.unfold().count())).times(2).cap('a')", g)
+ public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX() {
+ ComputerTestHelper.compute("g.V.repeat(__.out.group('a').by('name').by.by(__.count(Scope.local))).times(2).cap('a')", g)
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8099f734/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java
index 76f2a77..2917302 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupTest.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+import org.apache.tinkerpop.gremlin.process.Scope;
import org.apache.tinkerpop.gremlin.process.Traversal;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -43,9 +44,9 @@ public abstract class GroupTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, Collection<String>>> get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX();
- public abstract Traversal<Vertex, Map<String, Long>> get_g_V_hasXlangX_group_byXlangX_byX1X_byXunfold_countX();
+ public abstract Traversal<Vertex, Map<String, Long>> get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX();
- public abstract Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupXaX_byXnameX_by_byXsizeXX_timesX2X_capXaX();
+ public abstract Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX();
public abstract Traversal<Vertex, Map<Long, Collection<String>>> get_g_V_group_byXoutE_countX_byXnameX();
@@ -80,7 +81,7 @@ public abstract class GroupTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_hasXlangX_group_byXlangX_byX1X_byXsizeX() {
- final Traversal<Vertex, Map<String, Long>> traversal = get_g_V_hasXlangX_group_byXlangX_byX1X_byXunfold_countX();
+ final Traversal<Vertex, Map<String, Long>> traversal = get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX();
printTraversalForm(traversal);
final Map<String, Long> map = traversal.next();
assertEquals(1, map.size());
@@ -93,7 +94,7 @@ public abstract class GroupTest extends AbstractGremlinProcessTest {
@LoadGraphWith(MODERN)
public void g_V_repeatXout_groupXaX_byXnameX_byXitX_byXsizeXX_timesX2X_capXaX() {
List<Traversal<Vertex, Map<String, Long>>> traversals = new ArrayList<>();
- traversals.add(get_g_V_repeatXout_groupXaX_byXnameX_by_byXsizeXX_timesX2X_capXaX());
+ traversals.add(get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX());
traversals.forEach(traversal -> {
printTraversalForm(traversal);
final Map<String, Long> map = traversal.next();
@@ -149,13 +150,13 @@ public abstract class GroupTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_hasXlangX_group_byXlangX_byX1X_byXunfold_countX() {
- return (Traversal) g.V().has("lang").group().by("lang").by(inject(1)).<Collection>by(unfold().count());
+ public Traversal<Vertex, Map<String, Long>> get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX() {
+ return (Traversal) g.V().has("lang").group().by("lang").by(inject(1)).<Collection>by(count(Scope.local));
}
@Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupXaX_byXnameX_by_byXsizeXX_timesX2X_capXaX() {
- return g.V().repeat(out().group("a").by("name").by().<Collection>by(unfold().count())).times(2).cap("a");
+ public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX() {
+ return g.V().repeat(out().group("a").by("name").by().<Collection>by(count(Scope.local))).times(2).cap("a");
}
@Override
@@ -182,14 +183,14 @@ public abstract class GroupTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_hasXlangX_group_byXlangX_byX1X_byXunfold_countX() {
+ public Traversal<Vertex, Map<String, Long>> get_g_V_hasXlangX_group_byXlangX_byX1X_byXcountXlocalXX() {
return (Traversal) g.V().has("lang")
- .group().by("lang").by(inject(1)).<Collection>by(unfold().count()).submit(g.compute());
+ .group().by("lang").by(inject(1)).<Collection>by(count(Scope.local)).submit(g.compute());
}
@Override
- public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupXaX_byXnameX_by_byXsizeXX_timesX2X_capXaX() {
- return g.V().repeat(out().group("a").by("name").by().<Collection>by(unfold().count())).times(2).<Map<String, Long>>cap("a").submit(g.compute());
+ public Traversal<Vertex, Map<String, Long>> get_g_V_repeatXout_groupXaX_byXnameX_by_byXcountXlocalXX_timesX2X_capXaX() {
+ return g.V().repeat(out().group("a").by("name").by().<Collection>by(count(Scope.local))).times(2).<Map<String, Long>>cap("a").submit(g.compute());
}
@Override