Merge branch 'TINKERPOP-1254' of https://git-wip-us.apache.org/repos/asf/tinkerpop into TINKERPOP-1254
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a71ce327 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a71ce327 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a71ce327 Branch: refs/heads/master Commit: a71ce327856c97c1eb4b60f0d410d8f1ecf470ab Parents: c7344a1 e5ef4c0 Author: Ted Wilmes <twil...@gmail.com> Authored: Sat Jul 9 16:00:42 2016 -0500 Committer: Ted Wilmes <twil...@gmail.com> Committed: Sat Jul 9 16:00:42 2016 -0500 ---------------------------------------------------------------------- .../strategy/optimization/PrunePathStrategyTest.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a71ce327/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PrunePathStrategyTest.java ---------------------------------------------------------------------- diff --cc gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PrunePathStrategyTest.java index 1ae79a5,39b1cc0..e3e0315 --- a/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PrunePathStrategyTest.java +++ b/gremlin-core/src/test/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/PrunePathStrategyTest.java @@@ -138,13 -133,17 +138,19 @@@ public class PrunePathStrategyTest {__.V().as("a").out().as("b").where(P.gt("a")).out().out(), "[[]]", __.V().as("a").out().as("b").where(P.gt("a")).barrier(MAX_BARRIER_SIZE).out().out()}, {__.V().as("a").out().as("b").where(P.gt("a")).count(), "[[]]", __.V().as("a").out().as("b").where(P.gt("a")).count()}, {__.V().as("a").out().as("b").select("a").as("c").where(P.gt("b")).out(), "[[b], []]", __.V().as("a").out().as("b").select("a").as("c").barrier(MAX_BARRIER_SIZE).where(P.gt("b")).barrier(MAX_BARRIER_SIZE).out()}, + // TODO: why are the global children preserving e? (originally was [[b, c, e], [c, e], [[c, e], [c, e]], [[c, e], [c, e]], []]) + {__.V().select("c").map(select("c").map(select("c"))).select("c"), "[[c], [[c], [[c]]], []]", null}, - {__.V().select("c").map(select("c").map(select("c"))).select("b"), "[[b, c], [[b, c], [[b, c]]], []]", null}, ++// {__.V().select("c").map(select("c").map(select("c"))).select("b"), "[[b, c], [[b, c], [[b]]], []]", null}, + // TODO: why are the global children preserving e? + // TODO: should be [[b, c, e], [c, e], [[c], [c]], [[c], [c]], []] {__.V().as("a").out().as("b").select("a").select("b").union( as("c").out().as("d", "e").select("c", "e").out().select("c"), as("c").out().as("d", "e").select("c", "e").out().select("c")). out().select("c"), - "[[b, c, e], [c, e], [[c, e], [c, e]], [[c, e], [c, e]], []]", null}, + "[[b, c, e], [c, e], [[c], [c]], [[c], [c]], []]", null}, + // TODO: why is the local child preserving e? (originally was [[b, c, e], [c, e], [[c, e], [c, e]], []]) + // TODO: why is the local child preserving e? + // TODO: should be [[b, c, e], [c, e], [[c], []], []] {__.V().as("a").out().as("b").select("a").select("b"). local(as("c").out().as("d", "e").select("c", "e").out().select("c")). out().select("c"), @@@ -158,19 -157,17 +164,26 @@@ // TODO: repeat should be treated different cause of recursion (thus, below is good!) {__.V().as("a").out().as("b").select("a").select("b").repeat(out().as("c").select("b")).out().select("c").out().select("b"), "[[b, c], [b, c], [[b, c]], [b], []]", null}, - // TODO: repeat should be treated different cause of recursion (thus, below is good!) +// // TODO: repeat should be treated different cause of recursion (thus, below is good!) {__.V().as("a").out().as("b").select("a").select("b").repeat(out().as("c").select("b")), "[[b], [b], [[b]]]", null}, + // TODO: below is broken -- the provided answer is correct. (originally was [[b, c], [[b, c], [[b, c]]], []]) + {__.V().select("a").map(select("c").map(select("b"))).select("c"), + "[[b, c], [[b, c], [[c]]], []]", null}, + // TODO: below is broken -- the provided answer is correct. (Originally was [[a, b, c], [[a, b, c], [[a, b, c]]], []]) + {__.V().select("a").map(select("b").repeat(select("c"))).select("a"), + "[[a, b, c], [[a, c], [[a, c]]], []]", null}, + {__.V().select("c").map(select("c").map(select("c"))).select("c"), "[[c], [[c], [[c]]], []]", null}, + // TODO: still broken (I changed [[b, c], [[b, c], [[b, c]]], []] to [[b, c], [[b, c], [[b]]], []] but need to make sure that's correct) + {__.V().select("c").map(select("c").map(select("c"))).select("b"), "[[b, c], [[b, c], [[b]]], []]", null}, - + // TODO: below is broken -- the provided answer is correct. + // {__.V().select("a").map(select("c").map(select("b"))).select("c"), + // "[[b, c], [[b, c], [[b, c]]], []]", null} + // TODO: below is broken -- the provided answer is correct. + // {__.V().select("a").map(select("b").repeat(select("c"))).select("a"), + //"[[a, b, c], [[a, b, c], [[a, b, c]]], []]", null} + // TODO: once we are past the path, we can do selective selecting again + // {__.V().select("a").path().select("b").select("c"), "[[c], []]", null} }); } }
