Merge branch 'TINKERPOP-1254'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ef426f95 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ef426f95 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ef426f95 Branch: refs/heads/master Commit: ef426f9516620e99ccf135eebd738d911399ecef Parents: 032536e a4e89c0 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Mon Jul 11 13:33:22 2016 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Mon Jul 11 13:33:22 2016 -0600 ---------------------------------------------------------------------- .../step/map/TraversalVertexProgramStep.java | 10 +- .../gremlin/process/traversal/Path.java | 8 + .../process/traversal/TraversalStrategies.java | 2 + .../gremlin/process/traversal/Traverser.java | 6 + .../process/traversal/step/PathProcessor.java | 12 ++ .../traversal/step/filter/DedupGlobalStep.java | 14 ++ .../step/filter/WherePredicateStep.java | 19 +- .../step/filter/WhereTraversalStep.java | 15 ++ .../process/traversal/step/map/MatchStep.java | 144 +++++++++++--- .../process/traversal/step/map/PathStep.java | 16 ++ .../traversal/step/map/SelectOneStep.java | 18 ++ .../process/traversal/step/map/SelectStep.java | 18 +- .../process/traversal/step/map/TreeStep.java | 9 + .../step/sideEffect/TreeSideEffectStep.java | 16 ++ .../process/traversal/step/util/EmptyPath.java | 3 + .../traversal/step/util/ImmutablePath.java | 55 +++++- .../traversal/step/util/MutablePath.java | 26 ++- .../AdjacentToIncidentStrategy.java | 2 +- .../IncidentToAdjacentStrategy.java | 5 +- .../optimization/PathProcessorStrategy.java | 3 +- .../optimization/PathRetractionStrategy.java | 196 +++++++++++++++++++ .../traverser/B_LP_O_S_SE_SL_Traverser.java | 50 +++++ .../traverser/LP_O_OB_P_S_SE_SL_Traverser.java | 24 +++ .../traverser/util/AbstractTraverser.java | 16 ++ .../traverser/util/EmptyTraverser.java | 15 ++ .../process/traversal/util/PathUtil.java | 81 ++++++++ .../structure/util/reference/ReferencePath.java | 11 +- .../gremlin/process/traversal/PathTest.java | 11 ++ .../traversal/step/map/MatchStepTest.java | 44 +++++ .../IdentityRemovalStrategyTest.java | 2 +- .../PathRetractionStrategyTest.java | 188 ++++++++++++++++++ .../groovy/loaders/SugarLoaderTest.groovy | 10 +- .../traversal/step/map/GroovyMatchTest.groovy | 5 + .../process/traversal/step/map/MatchTest.java | 17 ++ .../neo4j/process/NativeNeo4jCypherCheck.java | 60 +++--- .../TinkerGraphNoStrategyComputerProvider.java | 2 + .../structure/TinkerGraphPlayTest.java | 98 ++++++++-- 37 files changed, 1134 insertions(+), 97 deletions(-) ----------------------------------------------------------------------
