Merged tp32 and fixed PathRetractionStrategyTest merge conflict.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d09c2f3a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d09c2f3a Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d09c2f3a Branch: refs/heads/master Commit: d09c2f3a151bbe55aae0e28ec3b84072fa35760e Parents: 2293539 71d0d91 Author: Ted Wilmes <[email protected]> Authored: Fri Mar 24 16:08:02 2017 -0500 Committer: Ted Wilmes <[email protected]> Committed: Fri Mar 24 16:08:02 2017 -0500 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 3 ++- .../optimization/PathRetractionStrategy.java | 7 ++++- .../PathRetractionStrategyTest.java | 28 +++++++++++++++++--- 3 files changed, 32 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d09c2f3a/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d09c2f3a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java ---------------------------------------------------------------------- diff --cc gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java index 641a8d3,f42a914..99a66d8 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java +++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PathRetractionStrategyTest.java @@@ -190,7 -207,10 +207,10 @@@ public class PathRetractionStrategyTes "[[[z, seen]], [[z, seen]]]", null}, {__.V().as("a").optional(bothE().dedup().as("b")). choose(select("b"), select("a","b"), project("a").by(select("a"))), - "[[[a, b]], [[a, b]], [[a, b]], [[[a, b]]], [[a, b]]]", null}, + "[[[a, b]], [[a, b]], [[[a, b]]], [[a, b]]]", null}, + {__.V().as("a").out().where(neq("a")).program(labeledPathVertexProgram), PATH_RETRACTION_STRATEGY_DISABLED, null}, + {__.V().as("a").out().where(neq("a")).program(pathVertexProgram).select("a"), PATH_RETRACTION_STRATEGY_DISABLED, null}, + {__.V().as("a").out().program(emptyRequirementsVertexProgram).select("a"), "[[]]", null} }); } - } + }
