You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2017/02/28 15:37:25 UTC
tinkerpop git commit: Select ids instead of names in all shortest
paths complex test in order to make it work in OLAP.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1640 2db7ddad3 -> 9d34524e7
Select ids instead of names in all shortest paths complex test in order to make it work in OLAP.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9d34524e
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9d34524e
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9d34524e
Branch: refs/heads/TINKERPOP-1640
Commit: 9d34524e78e3375cfb925020e081e33f18dd9f1a
Parents: 2db7dda
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue Feb 28 16:36:20 2017 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue Feb 28 16:36:20 2017 +0100
----------------------------------------------------------------------
.../process/traversal/step/ComplexTest.java | 76 +++++++++++---------
1 file changed, 41 insertions(+), 35 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9d34524e/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java
index cd44403..fbbcc5a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/ComplexTest.java
@@ -117,7 +117,7 @@ public abstract class ComplexTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Map<String, Map<String, Map<String, Object>>>> getCoworkerSummaryOLTP();
- public abstract Traversal<Vertex, List<String>> getAllShortestPaths();
+ public abstract Traversal<Vertex, List<Object>> getAllShortestPaths();
@Test
@LoadGraphWith(LoadGraphWith.GraphData.GRATEFUL)
@@ -176,39 +176,45 @@ public abstract class ComplexTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
public void allShortestPaths() {
- final Traversal<Vertex, List<String>> traversal = getAllShortestPaths();
+ final Traversal<Vertex, List<Object>> traversal = getAllShortestPaths();
printTraversalForm(traversal);
- final List<List<String>> allShortestPaths = Arrays.asList(
- Arrays.asList("josh", "lop"),
- Arrays.asList("josh", "marko"),
- Arrays.asList("josh", "ripple"),
- Arrays.asList("josh", "marko", "vadas"),
- Arrays.asList("josh", "lop", "peter"),
- Arrays.asList("lop", "marko"),
- Arrays.asList("lop", "peter"),
- Arrays.asList("lop", "josh"),
- Arrays.asList("lop", "josh", "ripple"),
- Arrays.asList("lop", "marko", "vadas"),
- Arrays.asList("marko", "lop"),
- Arrays.asList("marko", "josh"),
- Arrays.asList("marko", "vadas"),
- Arrays.asList("marko", "josh", "ripple"),
- Arrays.asList("marko", "lop", "peter"),
- Arrays.asList("peter", "lop"),
- Arrays.asList("peter", "lop", "marko"),
- Arrays.asList("peter", "lop", "josh"),
- Arrays.asList("peter", "lop", "josh", "ripple"),
- Arrays.asList("peter", "lop", "marko", "vadas"),
- Arrays.asList("ripple", "josh"),
- Arrays.asList("ripple", "josh", "lop"),
- Arrays.asList("ripple", "josh", "marko"),
- Arrays.asList("ripple", "josh", "marko", "vadas"),
- Arrays.asList("ripple", "josh", "lop", "peter"),
- Arrays.asList("vadas", "marko"),
- Arrays.asList("vadas", "marko", "josh"),
- Arrays.asList("vadas", "marko", "lop"),
- Arrays.asList("vadas", "marko", "josh", "ripple"),
- Arrays.asList("vadas", "marko", "lop", "peter")
+ final Object marko = convertToVertexId(graph, "marko");
+ final Object vadas = convertToVertexId(graph, "vadas");
+ final Object lop = convertToVertexId(graph, "lop");
+ final Object josh = convertToVertexId(graph, "josh");
+ final Object ripple = convertToVertexId(graph, "ripple");
+ final Object peter = convertToVertexId(graph, "peter");
+ final List<List<Object>> allShortestPaths = Arrays.asList(
+ Arrays.asList(josh, lop),
+ Arrays.asList(josh, marko),
+ Arrays.asList(josh, ripple),
+ Arrays.asList(josh, marko, vadas),
+ Arrays.asList(josh, lop, peter),
+ Arrays.asList(lop, marko),
+ Arrays.asList(lop, peter),
+ Arrays.asList(lop, josh),
+ Arrays.asList(lop, josh, ripple),
+ Arrays.asList(lop, marko, vadas),
+ Arrays.asList(marko, lop),
+ Arrays.asList(marko, josh),
+ Arrays.asList(marko, vadas),
+ Arrays.asList(marko, josh, ripple),
+ Arrays.asList(marko, lop, peter),
+ Arrays.asList(peter, lop),
+ Arrays.asList(peter, lop, marko),
+ Arrays.asList(peter, lop, josh),
+ Arrays.asList(peter, lop, josh, ripple),
+ Arrays.asList(peter, lop, marko, vadas),
+ Arrays.asList(ripple, josh),
+ Arrays.asList(ripple, josh, lop),
+ Arrays.asList(ripple, josh, marko),
+ Arrays.asList(ripple, josh, marko, vadas),
+ Arrays.asList(ripple, josh, lop, peter),
+ Arrays.asList(vadas, marko),
+ Arrays.asList(vadas, marko, josh),
+ Arrays.asList(vadas, marko, lop),
+ Arrays.asList(vadas, marko, josh, ripple),
+ Arrays.asList(vadas, marko, lop, peter)
);
checkResults(allShortestPaths, traversal);
}
@@ -252,7 +258,7 @@ public abstract class ComplexTest extends AbstractGremlinProcessTest {
}
@Override
- public Traversal<Vertex, List<String>> getAllShortestPaths() {
+ public Traversal<Vertex, List<Object>> getAllShortestPaths() {
// TODO: remove .withoutStrategies(PathRetractionStrategy.class)
return g.withoutStrategies(PathRetractionStrategy.class).V().as("v").both().as("v").
project("src", "tgt", "p").by(select(first, "v")).
@@ -272,7 +278,7 @@ public abstract class ComplexTest extends AbstractGremlinProcessTest {
filter(select(values).unfold().or(count(local).where(lt("l")), where(eq("p"))))).
group("x").by(select("src", "tgt")).
by(select("p").fold()).select("tgt").barrier()).
- cap("x").select(values).unfold().unfold().map(unfold().<String>values("name").fold());
+ cap("x").select(values).unfold().unfold().map(unfold().id().fold());
}
}
}