You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/03/03 12:56:00 UTC
[1/3] incubator-tinkerpop git commit: added tests for
group-sideEffects
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 5f7761406 -> a7af8523f
added tests for group-sideEffects
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8747bfbb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8747bfbb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8747bfbb
Branch: refs/heads/master
Commit: 8747bfbb879c0cec0c30527908a436478e4a6df1
Parents: 4befd1d
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Feb 27 19:37:41 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri Feb 27 19:37:41 2015 +0100
----------------------------------------------------------------------
.../step/sideEffect/GroovyGroupTest.groovy | 16 ++++++---
.../traversal/step/sideEffect/GroupTest.java | 35 ++++++++++----------
2 files changed, 29 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8747bfbb/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 ddd7e19..db721de 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
@@ -18,11 +18,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.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
+import org.apache.tinkerpop.gremlin.process.*
import org.apache.tinkerpop.gremlin.process.graph.traversal.__
import org.apache.tinkerpop.gremlin.structure.Vertex
@@ -40,6 +36,11 @@ public abstract class GroovyGroupTest {
}
@Override
+ public Traversal<Vertex, Map<String, Collection<Vertex>>> get_g_V_groupXaX_byXnameX_capXaX() {
+ g.V.group('a').by('name').cap('a')
+ }
+
+ @Override
public Traversal<Vertex, Map<String, Collection<String>>> get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX() {
g.V.has('lang').group('a').by('lang').by('name').out.cap('a')
}
@@ -69,6 +70,11 @@ public abstract class GroovyGroupTest {
}
@Override
+ public Traversal<Vertex, Map<String, Collection<Vertex>>> get_g_V_groupXaX_byXnameX_capXaX() {
+ ComputerTestHelper.compute("g.V.group('a').by('name').cap('a')", g)
+ }
+
+ @Override
public Traversal<Vertex, Map<String, Collection<String>>> get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX() {
ComputerTestHelper.compute("g.V.has('lang').group('a').by('lang').by('name').out.cap('a')", g)
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8747bfbb/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 da68e1d..a5dc7e2 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
@@ -19,18 +19,11 @@
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.process.TraversalEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
+import org.apache.tinkerpop.gremlin.process.*;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*;
@@ -44,6 +37,8 @@ public abstract class GroupTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, Collection<Vertex>>> get_g_V_group_byXnameX();
+ public abstract Traversal<Vertex, Map<String, Collection<Vertex>>> get_g_V_groupXaX_byXnameX_capXaX();
+
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_byXcountXlocalXX();
@@ -55,15 +50,16 @@ public abstract class GroupTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_group_byXnameX() {
- final Traversal<Vertex, Map<String, Collection<Vertex>>> traversal = get_g_V_group_byXnameX();
- printTraversalForm(traversal);
- final Map<String, Collection<Vertex>> map = traversal.next();
- assertEquals(6, map.size());
- map.forEach((key, values) -> {
- assertEquals(1, values.size());
- assertEquals(convertToVertexId(key), values.iterator().next().id());
+ Arrays.asList(get_g_V_group_byXnameX(), get_g_V_groupXaX_byXnameX_capXaX()).forEach(traversal -> {
+ printTraversalForm(traversal);
+ final Map<String, Collection<Vertex>> map = traversal.next();
+ assertEquals(6, map.size());
+ map.forEach((key, values) -> {
+ assertEquals(1, values.size());
+ assertEquals(convertToVertexId(key), values.iterator().next().id());
+ });
+ assertFalse(traversal.hasNext());
});
- assertFalse(traversal.hasNext());
}
@Test
@@ -148,6 +144,11 @@ public abstract class GroupTest extends AbstractGremlinProcessTest {
}
@Override
+ public Traversal<Vertex, Map<String, Collection<Vertex>>> get_g_V_groupXaX_byXnameX_capXaX() {
+ return g.V().<String, Collection<Vertex>>group("a").by("name").cap("a");
+ }
+
+ @Override
public Traversal<Vertex, Map<String, Collection<String>>> get_g_V_hasXlangX_groupXaX_byXlangX_byXnameX_out_capXaX() {
return g.V().has("lang").group("a").by("lang").by("name").out().cap("a");
}
[2/3] incubator-tinkerpop git commit: added tree tests (reducer)
Posted by sp...@apache.org.
added tree tests (reducer)
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/49f9b449
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/49f9b449
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/49f9b449
Branch: refs/heads/master
Commit: 49f9b4492326bf5ff573e018e5a23a334bad6bb2
Parents: 8747bfb
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Mar 3 07:57:32 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Mar 3 07:57:32 2015 +0100
----------------------------------------------------------------------
.../step/sideEffect/GroovyTreeTest.groovy | 20 ++++++++++++--------
.../traversal/step/sideEffect/TreeTest.java | 16 +++++++++-------
2 files changed, 21 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/49f9b449/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy
----------------------------------------------------------------------
diff --git a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy
index 16da9dd..337d2ba 100644
--- a/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy
+++ b/gremlin-groovy-test/src/main/groovy/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroovyTreeTest.groovy
@@ -18,13 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect
-import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest
-import org.apache.tinkerpop.gremlin.process.T
-import org.apache.tinkerpop.gremlin.process.Traversal
-import org.apache.tinkerpop.gremlin.process.ComputerTestHelper
-import org.apache.tinkerpop.gremlin.process.TraversalEngine
-import org.apache.tinkerpop.gremlin.process.UseEngine
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.TreeTest
+import org.apache.tinkerpop.gremlin.process.*
import org.apache.tinkerpop.gremlin.process.graph.util.Tree
import org.apache.tinkerpop.gremlin.structure.Vertex
import org.junit.Test
@@ -58,8 +52,13 @@ public abstract class GroovyTreeTest {
}
@Override
+ public Traversal<Vertex, Tree> get_g_V_out_out_tree() {
+ g.V.out.out.tree();
+ }
+
+ @Override
public Traversal<Vertex, Tree> get_g_V_out_out_treeXaX_capXaX() {
- g.V.out.out.tree("a").cap('a');
+ g.V.out.out.tree('a').cap('a');
}
}
@@ -77,6 +76,11 @@ public abstract class GroovyTreeTest {
}
@Override
+ public Traversal<Vertex, Tree> get_g_V_out_out_tree() {
+ ComputerTestHelper.compute("g.V.out.out.tree()", g)
+ }
+
+ @Override
public Traversal<Vertex, Tree> get_g_V_out_out_treeXaX_capXaX() {
ComputerTestHelper.compute("g.V.out.out.tree('a').cap('a')", g)
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/49f9b449/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java
index d3d0cd8..b1e4674 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java
@@ -19,12 +19,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.IgnoreEngine;
-import org.apache.tinkerpop.gremlin.process.T;
-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.*;
import org.apache.tinkerpop.gremlin.process.graph.util.Tree;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
@@ -46,6 +41,8 @@ public abstract class TreeTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Tree> get_g_V_out_out_treeXaX_byXidX_capXaX();
+ public abstract Traversal<Vertex, Tree> get_g_V_out_out_tree();
+
public abstract Traversal<Vertex, Tree> get_g_V_out_out_treeXaX_capXaX();
public abstract Traversal<Vertex, Tree> get_g_VX1X_out_out_tree_byXnameX(final Object v1Id);
@@ -92,7 +89,7 @@ public abstract class TreeTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void g_V_out_out_treeXaX_capXaX() {
- List<Traversal<Vertex, Tree>> traversals = Arrays.asList(get_g_V_out_out_treeXaX_capXaX());
+ List<Traversal<Vertex, Tree>> traversals = Arrays.asList(get_g_V_out_out_tree(), get_g_V_out_out_treeXaX_capXaX());
traversals.forEach(traversal -> {
printTraversalForm(traversal);
final Tree tree = traversal.next();
@@ -130,6 +127,11 @@ public abstract class TreeTest extends AbstractGremlinProcessTest {
}
@Override
+ public Traversal<Vertex, Tree> get_g_V_out_out_tree() {
+ return (Traversal) g.V().out().out().tree();
+ }
+
+ @Override
public Traversal<Vertex, Tree> get_g_V_out_out_treeXaX_capXaX() {
return (Traversal) g.V().out().out().tree("a").cap("a");
}
[3/3] incubator-tinkerpop git commit: Merge branch 'master' into
sideeffect-reduce
Posted by sp...@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/a7af8523
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a7af8523
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a7af8523
Branch: refs/heads/master
Commit: a7af8523fdeb588e01999946205f5abf5a25384b
Parents: 49f9b44 5f77614
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Mar 3 07:57:56 2015 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Mar 3 07:57:56 2015 +0100
----------------------------------------------------------------------
.../traversal/step/sideEffect/ProfileStep.java | 3 +
.../traversal/strategy/ProfileStrategy.java | 3 +
.../computer/util/ScriptEngineLambdaTest.java | 144 +++++++++++++++++++
.../traversal/step/sideEffect/ProfileTest.java | 14 ++
4 files changed, 164 insertions(+)
----------------------------------------------------------------------