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/03/17 19:42:39 UTC

[2/6] 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/ef103b72
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ef103b72
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ef103b72

Branch: refs/heads/master
Commit: ef103b72ead8942975d74efc0dc974d1e9e62f7a
Parents: f4c1e07 96d3cbf
Author: Stephen Mallette <sp...@apache.org>
Authored: Mon Mar 16 16:12:47 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Mon Mar 16 16:12:47 2015 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   2 +-
 .../tinkerpop/gremlin/process/Traversal.java    |  12 --
 .../gremlin/process/computer/MessageScope.java  |   3 +-
 .../peerpressure/PeerPressureVertexProgram.java |   1 -
 .../ranking/pagerank/PageRankVertexProgram.java |  10 +-
 .../computer/util/VertexProgramHelper.java      |  15 +-
 .../process/graph/traversal/GraphTraversal.java |  40 +++---
 .../gremlin/process/graph/traversal/__.java     |  36 ++---
 .../graph/traversal/step/filter/CoinStep.java   |   5 +-
 .../traversal/step/filter/CyclicPathStep.java   |   3 +-
 .../traversal/step/filter/DedupGlobalStep.java  |   3 +-
 .../graph/traversal/step/filter/ExceptStep.java |   3 +-
 .../graph/traversal/step/filter/HasStep.java    |   3 +-
 .../graph/traversal/step/filter/IsStep.java     |   7 +-
 .../graph/traversal/step/filter/RetainStep.java |   3 +-
 .../traversal/step/filter/SampleGlobalStep.java |   3 +-
 .../traversal/step/filter/SimplePathStep.java   |   3 +-
 .../traversal/step/filter/TimeLimitStep.java    |   3 +-
 .../graph/traversal/step/map/AddEdgeStep.java   |  78 +++++++++++
 .../graph/traversal/step/map/AddVertexStep.java |  45 ++++++
 .../traversal/step/map/EdgeVertexStep.java      |  12 +-
 .../traversal/step/map/OrderGlobalStep.java     |   3 +-
 .../traversal/step/map/OrderLocalStep.java      |   3 +-
 .../traversal/step/map/PropertiesStep.java      |   9 +-
 .../graph/traversal/step/map/VertexStep.java    |  12 +-
 .../traversal/step/sideEffect/AddEdgeStep.java  |  78 -----------
 .../step/sideEffect/AddPropertyStep.java        |  43 ++++++
 .../step/sideEffect/AggregateStep.java          |   3 +-
 .../sideEffect/GroupCountSideEffectStep.java    |   3 +-
 .../step/sideEffect/GroupSideEffectStep.java    |   3 +-
 .../traversal/step/sideEffect/ProfileStep.java  |   7 +-
 .../step/sideEffect/SideEffectStep.java         |   3 +-
 .../traversal/step/sideEffect/StartStep.java    |   3 +-
 .../traversal/step/sideEffect/StoreStep.java    |   3 +-
 .../traversal/step/sideEffect/SubgraphStep.java |   3 +-
 .../step/sideEffect/TreeSideEffectStep.java     |   3 +-
 .../process/traversal/step/Reversible.java      |  28 ----
 .../strategy/decoration/ReadOnlyStrategy.java   |   2 +-
 .../process/traversal/util/TraversalHelper.java |  11 +-
 .../decoration/ReadOnlyStrategyTest.java        |   6 +-
 .../process/util/TraversalHelperTest.java       |  11 --
 .../traversal/step/map/GroovyAddEdgeTest.groovy |  46 +++++++
 .../step/map/GroovyAddVertexTest.groovy         |  41 ++++++
 .../step/sideEffect/GroovyAddEdgeTest.groovy    |  52 -------
 .../process/GroovyProcessStandardSuite.java     |   6 +-
 .../gremlin/process/ProcessStandardSuite.java   |  57 +++++++-
 .../ranking/PageRankVertexProgramTest.java      |  34 +----
 .../graph/traversal/step/map/AddEdgeTest.java   | 100 ++++++++++++++
 .../graph/traversal/step/map/AddVertexTest.java |  69 ++++++++++
 .../traversal/step/sideEffect/AddEdgeTest.java  | 137 -------------------
 .../decoration/ReadOnlyStrategyTest.java        |  18 ---
 .../computer/giraph/GiraphGraphComputer.java    |   7 +-
 .../process/computer/TinkerMessenger.java       |   3 +-
 53 files changed, 598 insertions(+), 499 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ef103b72/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
----------------------------------------------------------------------