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 2017/04/06 11:34:11 UTC
[44/50] tinkerpop git commit: Merge branch 'tp32'
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d7697abc
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d7697abc
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d7697abc
Branch: refs/heads/TINKERPOP-1443
Commit: d7697abc80f0809c54b95e3e642551e6087b151d
Parents: c839dc3 f73d7ca
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Mar 30 14:04:39 2017 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Mar 30 14:04:39 2017 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 6 +
.../process/traversal/Parameterizing.java | 8 +
.../traversal/dsl/graph/GraphTraversal.java | 9 +-
.../gremlin/process/traversal/step/Scoping.java | 20 +-
.../step/filter/WherePredicateStep.java | 6 +-
.../step/filter/WhereTraversalStep.java | 4 +-
.../process/traversal/step/map/AddEdgeStep.java | 26 ++-
.../traversal/step/map/AddVertexStartStep.java | 15 +-
.../traversal/step/map/AddVertexStep.java | 15 +-
.../traversal/step/map/SelectOneStep.java | 10 +-
.../process/traversal/step/map/SelectStep.java | 4 +-
.../step/sideEffect/AddPropertyStep.java | 16 +-
.../process/traversal/step/util/Parameters.java | 106 +++++++---
.../strategy/decoration/ElementIdStrategy.java | 2 +-
.../strategy/finalization/ProfileStrategy.java | 39 ++--
.../optimization/PathRetractionStrategy.java | 30 ++-
.../StandardVerificationStrategy.java | 3 +-
.../traverser/B_LP_O_S_SE_SL_Traverser.java | 2 +-
.../traversal/util/DefaultTraversal.java | 2 +
.../process/traversal/util/PathUtil.java | 17 +-
.../process/traversal/util/TraversalHelper.java | 40 +++-
.../traversal/step/filter/WhereStepTest.java | 4 +-
.../traversal/step/util/ParametersTest.java | 185 +++++++++++++++--
.../process/computer/GraphComputerTest.java | 200 +++++++++----------
24 files changed, 508 insertions(+), 261 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7697abc/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7697abc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7697abc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/Scoping.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7697abc/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectOneStep.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d7697abc/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
index 58fbd9e,5c66673..10ca251
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/computer/GraphComputerTest.java
@@@ -2350,31 -2350,27 +2351,26 @@@ public class GraphComputerTest extends
@Test
@LoadGraphWith(MODERN)
public void shouldSucceedWithProperTraverserRequirements() throws Exception {
-
- final AtomicInteger counter = new AtomicInteger(0);
- final Map<String, Object> idsByName = new HashMap<>();
- final VertexProgramQ vp = VertexProgramQ.build().from("a").property("coworkers").create();
--
- g.V().hasLabel("person").filter(outE("created")).valueMap(true, "name").forEachRemaining((Map<Object,Object> map) ->
- idsByName.put((String) ((List) map.get("name")).get(0), map.get(id)));
+ final VertexProgramQ vp = VertexProgramQ.build().property("pl").create();
+ final Map<String, List<Integer>> expected = new HashMap<>();
+ expected.put("vadas", Collections.singletonList(2));
+ expected.put("lop", Arrays.asList(2, 2, 2, 3));
+ expected.put("josh", Collections.singletonList(2));
+ expected.put("ripple", Arrays.asList(2, 3));
try {
- g.V().as("a").out("created").in("created").program(vp).dedup()
- .valueMap("name", "coworkers").forEachRemaining((Map<String, Object> map) -> {
+ g.V().repeat(__.out()).emit().program(vp).dedup()
+ .valueMap("name", "pl").forEachRemaining((Map<String, Object> map) -> {
final String name = (String) ((List) map.get("name")).get(0);
- final Map<Object, Long> coworkers = (Map<Object, Long>) ((List) map.get("coworkers")).get(0);
- assertTrue(idsByName.containsKey(name));
- assertEquals(2, coworkers.size());
- idsByName.keySet().stream().filter(cn -> !cn.equals(name)).forEach(cn -> {
- final Object cid = idsByName.get(cn);
- assertTrue(coworkers.containsKey(cid));
- assertEquals(1L, coworkers.get(cid).longValue());
- });
- counter.incrementAndGet();
+ final List<Integer> pathLengths = (List<Integer>) map.get("pl");
+ assertTrue(expected.containsKey(name));
+ final List<Integer> expectedPathLengths = expected.remove(name);
+ assertTrue(expectedPathLengths.containsAll(pathLengths));
+ assertTrue(pathLengths.containsAll(expectedPathLengths));
});
- assertEquals(3, counter.intValue());
+ assertTrue(expected.isEmpty());
} catch (VerificationException ex) {
assumeNoException(ex);
}