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/08/25 14:34:42 UTC
[23/50] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp30'
Merge remote-tracking branch 'origin/tp30'
Conflicts:
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/optimization/DedupBijectionStrategy.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/a13706ff
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/a13706ff
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/a13706ff
Branch: refs/heads/tp30
Commit: a13706ffb2a442a81b64e29a92cc495b3412100e
Parents: ca2d112 197036c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Aug 14 15:52:52 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Aug 14 15:52:52 2015 -0400
----------------------------------------------------------------------
.../gremlin/process/traversal/Compare.java | 88 ++++++++++++++++---
.../gremlin/process/traversal/Contains.java | 12 ++-
.../decoration/ConjunctionStrategy.java | 3 +-
.../strategy/decoration/ElementIdStrategy.java | 2 +-
.../finalization/EngineDependentStrategy.java | 13 ++-
.../AdjacentToIncidentStrategy.java | 6 +-
.../optimization/DedupBijectionStrategy.java | 90 ++++++++++++++++++++
.../optimization/IdentityRemovalStrategy.java | 2 +-
.../IncidentToAdjacentStrategy.java | 6 +-
.../optimization/MatchPredicateStrategy.java | 5 +-
.../optimization/RangeByIsCountStrategy.java | 2 +-
.../verification/LambdaRestrictionStrategy.java | 7 +-
.../traverser/TraverserRequirement.java | 8 +-
.../tinkerpop/gremlin/structure/Direction.java | 19 ++++-
.../gremlin/process/traversal/ContainsTest.java | 68 +++++++++++++++
.../apache/tinkerpop/gremlin/driver/Result.java | 64 +++++++++++++-
.../tinkerpop/gremlin/driver/ResultSet.java | 12 ++-
17 files changed, 366 insertions(+), 41 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/a13706ff/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/traverser/TraverserRequirement.java
----------------------------------------------------------------------