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 2015/05/12 20:49:07 UTC
[5/6] incubator-tinkerpop git commit: Merge branch 'master' of
https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-tinkerpop
Resolved Conflicts:
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptTest.java
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/RetainTest.java
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/8eb33084
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/8eb33084
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/8eb33084
Branch: refs/heads/master
Commit: 8eb33084bb6eadb753136dbd195a500b1b66f363
Parents: ed1ee9f da05c0e
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue May 12 20:38:46 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue May 12 20:38:46 2015 +0200
----------------------------------------------------------------------
.../traversal/dsl/graph/GraphTraversal.java | 44 ++---
.../gremlin/process/traversal/dsl/graph/__.java | 49 ++---
.../traversal/lambda/BiPredicateTraversal.java | 66 +++++++
.../traversal/step/filter/ExceptStep.java | 97 ---------
.../traversal/step/filter/RetainStep.java | 97 ---------
.../traversal/step/filter/WhereStep.java | 111 +++--------
.../process/traversal/util/TraversalUtil.java | 24 +++
.../apache/tinkerpop/gremlin/structure/P.java | 8 +-
.../step/filter/GroovyExceptTest.groovy | 76 --------
.../step/filter/GroovyRetainTest.groovy | 46 -----
.../step/filter/GroovyWhereTest.groovy | 40 +++-
.../process/GroovyProcessComputerSuite.java | 47 ++++-
.../process/GroovyProcessStandardSuite.java | 4 -
.../gremlin/server/handler/IteratorHandler.java | 3 -
.../server/op/AbstractEvalOpProcessor.java | 37 ++--
.../server/GremlinServerIntegrateTest.java | 4 +-
.../gremlin/process/ProcessComputerSuite.java | 49 ++++-
.../gremlin/process/ProcessStandardSuite.java | 8 +-
.../traversal/step/filter/ExceptTest.java | 195 -------------------
.../traversal/step/filter/RetainTest.java | 91 ---------
.../traversal/step/filter/WhereTest.java | 130 +++++++++++--
.../gremlin/structure/VertexPropertyTest.java | 8 -
22 files changed, 403 insertions(+), 831 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8eb33084/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8eb33084/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8eb33084/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/8eb33084/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
index 638acef,8e577e5..d240ab3
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/WhereTest.java
@@@ -22,6 -22,8 +22,7 @@@ import org.apache.tinkerpop.gremlin.Loa
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.GremlinProcessRunner;
import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
-import org.apache.tinkerpop.gremlin.process.UseEngine;
+ import org.apache.tinkerpop.gremlin.process.traversal.Path;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
@@@ -29,8 -31,11 +30,7 @@@ import org.apache.tinkerpop.gremlin.str
import org.junit.Test;
import org.junit.runner.RunWith;
--import java.util.Arrays;
-import java.util.HashSet;
-import java.util.List;
--import java.util.Map;
-import java.util.Set;
++import java.util.*;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__.as;
@@@ -165,7 -181,67 +176,65 @@@ public abstract class WhereTest extend
checkResults(Arrays.asList("josh", 32), traversal);
}
+ /// except/retain functionality
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_VX1X_asXaX_outXcreatedX_inXcreatedX_whereXeqXaXX_name() {
+ final Traversal<Vertex, String> traversal = get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_whereXeqXaXX_name(convertToVertexId("marko"));
+ printTraversalForm(traversal);
+ assertEquals("marko", traversal.next());
+ assertFalse(traversal.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_VX1X_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_name() {
+ final Traversal<Vertex, String> traversal = get_g_VX1X_asXaX_outXcreatedX_inXcreatedX_whereXneqXaXX_name(convertToVertexId("marko"));
+ printTraversalForm(traversal);
+ checkResults(Arrays.asList("peter", "josh"), traversal);
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_VX1X_out_aggregateXxX_out_whereXwithout_xX() {
+ final Traversal<Vertex, Vertex> traversal = get_g_VX1X_out_aggregateXxX_out_whereXwithoutXaXX(convertToVertexId("marko"));
+ printTraversalForm(traversal);
+ assertEquals("ripple", traversal.next().<String>value("name"));
+ assertFalse(traversal.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_withSideEffectXa_g_VX2XX_VX1X_out_whereXneqXaXX() {
+ final Traversal<Vertex, Vertex> traversal = get_g_withSideEffectXa_graph_verticesX2XX_VX1X_out_whereXneqXaXX(convertToVertexId("marko"), convertToVertexId("vadas"));
+ printTraversalForm(traversal);
+ int counter = 0;
+ final Set<Vertex> vertices = new HashSet<>();
+ while (traversal.hasNext()) {
+ counter++;
+ final Vertex vertex = traversal.next();
+ vertices.add(vertex);
+ assertTrue(vertex.value("name").equals("josh") || vertex.value("name").equals("lop"));
+ }
+ assertEquals(2, counter);
+ assertEquals(2, vertices.size());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void get_g_VX1X_repeatXbothEXcreatedX_whereXwithoutXeXX_aggregateXeX_otherVX_emit_path() {
+ final Traversal<Vertex, Path> traversal = get_g_VX1X_repeatXbothEXcreatedX_whereXwithoutXeXX_aggregateXeX_otherVX_emit_path(convertToVertexId("marko"));
+ printTraversalForm(traversal);
+ final List<Path> paths = traversal.toList();
+ assertEquals(4, paths.size());
+ assertEquals(1, paths.stream().filter(path -> path.size() == 3).count());
+ assertEquals(2, paths.stream().filter(path -> path.size() == 5).count());
+ assertEquals(1, paths.stream().filter(path -> path.size() == 7).count());
+ assertFalse(traversal.hasNext());
+ }
+
- @UseEngine(TraversalEngine.Type.STANDARD)
- @UseEngine(TraversalEngine.Type.COMPUTER)
public static class Traversals extends WhereTest {
/// where(local)