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 2015/05/05 18:28:42 UTC

[3/4] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/master'

Merge remote-tracking branch 'origin/master'


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/7315e279
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7315e279
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7315e279

Branch: refs/heads/master
Commit: 7315e2791473ce0e7bd710c8adff47140b54eee1
Parents: 9dff2d9 80bfd8d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue May 5 12:12:46 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue May 5 12:12:46 2015 -0400

----------------------------------------------------------------------
 .../process/traversal/TraversalEngine.java      |  54 ++++++++-
 .../process/traversal/TraversalStrategies.java  |  62 +++++-----
 .../process/traversal/TraversalStrategy.java    | 105 +++++++++++++++--
 .../dsl/graph/GraphTraversalSource.java         |  26 ++---
 .../engine/ComputerTraversalEngine.java         |  44 +++++--
 .../engine/StandardTraversalEngine.java         |   5 -
 .../traversal/lambda/HasNextTraversal.java      |   9 +-
 .../traversal/step/branch/BranchStep.java       |   2 +-
 .../traversal/step/map/OrderGlobalStep.java     |  25 +++-
 .../step/util/TraversalComparator.java          |   4 +
 .../strategy/AbstractTraversalStrategy.java     |   2 +-
 .../decoration/ConjunctionStrategy.java         |  83 +++++++++++++
 .../strategy/decoration/ElementIdStrategy.java  |  12 +-
 .../strategy/decoration/EventStrategy.java      |   3 +-
 .../decoration/LabeledEndStepStrategy.java      |  51 ++++++++
 .../strategy/decoration/PartitionStrategy.java  |   3 +-
 .../strategy/decoration/SubgraphStrategy.java   |   3 +-
 .../finalization/EngineDependentStrategy.java   |  46 ++++++++
 .../strategy/finalization/ProfileStrategy.java  |  91 +++++++++++++++
 .../ComparatorHolderRemovalStrategy.java        |  55 +++++++++
 .../optimization/ConjunctionStrategy.java       |  83 -------------
 .../optimization/DedupBijectionStrategy.java    |  76 ++++++++++++
 .../optimization/DedupOptimizerStrategy.java    |  75 ------------
 .../optimization/IdentityRemovalStrategy.java   |   3 +-
 .../optimization/MatchWhereStrategy.java        |   6 +-
 .../strategy/optimization/ProfileStrategy.java  | 115 -------------------
 .../optimization/RangeByIsCountStrategy.java    |   4 +-
 .../ComparatorHolderRemovalStrategy.java        |  54 ---------
 .../ComputerVerificationStrategy.java           |  75 ++++++++++++
 .../verification/EngineDependentStrategy.java   |  46 --------
 .../verification/LabeledEndStepStrategy.java    |  50 --------
 .../verification/LambdaRestrictionStrategy.java |   3 +-
 .../strategy/verification/ReadOnlyStrategy.java |   3 +-
 .../TraversalVerificationStrategy.java          |  72 ------------
 .../traversal/util/DefaultTraversal.java        |   6 +-
 .../util/DefaultTraversalStrategies.java        |  12 +-
 .../util/EmptyTraversalStrategies.java          |   4 +-
 .../process/TraversalStrategiesTest.java        | 111 +++++++++++++++---
 .../optimization/TinkerGraphStepStrategy.java   |  20 +++-
 39 files changed, 880 insertions(+), 623 deletions(-)
----------------------------------------------------------------------