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/e1f82c42 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e1f82c42 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e1f82c42 Branch: refs/heads/master Commit: e1f82c422024f58349eab3458f51f42e384c5883 Parents: cad9cd2 997e94f Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Wed Nov 16 06:36:49 2016 -0700 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Wed Nov 16 06:36:49 2016 -0700 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 5 + .../upgrade/release-3.2.x-incubating.asciidoc | 28 +++- .../traversal/dsl/graph/GraphTraversal.java | 130 +++++++++++++------ .../gremlin/process/traversal/dsl/graph/__.java | 43 ++++-- .../traversal/step/util/HasContainer.java | 26 ++-- .../optimization/FilterRankingStrategy.java | 43 ++++-- .../optimization/InlineFilterStrategy.java | 20 ++- .../process/traversal/util/TraversalHelper.java | 17 +++ .../traversal/step/filter/HasStepTest.java | 12 +- .../optimization/FilterRankingStrategyTest.java | 27 ++-- .../optimization/InlineFilterStrategyTest.java | 12 +- .../step/filter/GroovyWhereTest.groovy | 5 + .../traversal/step/filter/WhereTest.java | 16 +++ .../step/sideEffect/Neo4jGraphStep.java | 11 +- .../Neo4jGraphStepStrategyTest.java | 12 +- .../step/sideEffect/TinkerGraphStep.java | 9 +- .../TinkerGraphStepStrategyTest.java | 10 +- 17 files changed, 316 insertions(+), 110 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e1f82c42/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e1f82c42/docs/src/upgrade/release-3.2.x-incubating.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e1f82c42/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/e1f82c42/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java ----------------------------------------------------------------------
