You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by pi...@apache.org on 2016/03/25 18:18:26 UTC

[2/3] incubator-tinkerpop git commit: Merge branch 'master' into TINKERPOP-968

Merge branch 'master' into TINKERPOP-968


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

Branch: refs/heads/TINKERPOP-968
Commit: 2652bc2516b5408015c8daf30ac69964e3dc0dd2
Parents: 427c332 4c97dd7
Author: pieter <pi...@gmail.com>
Authored: Fri Mar 25 17:58:00 2016 +0200
Committer: pieter <pi...@gmail.com>
Committed: Fri Mar 25 17:58:00 2016 +0200

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  13 +-
 .../src/reference/gremlin-applications.asciidoc |  12 +-
 docs/src/reference/the-traversal.asciidoc       |   2 +-
 .../upgrade/release-3.2.x-incubating.asciidoc   |  35 ++-
 gremlin-console/conf/remote-graph.properties    |   6 +-
 gremlin-console/src/main/bin/gremlin.sh         |  23 +-
 .../tinkerpop/gremlin/console/Console.groovy    |   7 +-
 .../tinkerpop/gremlin/console/ConsoleFs.groovy  |  30 +++
 .../tinkerpop/gremlin/console/Mediator.groovy   |  11 +-
 .../console/commands/InstallCommand.groovy      |   4 +-
 gremlin-console/src/main/static/NOTICE          |   3 +-
 .../gremlin/process/computer/Computer.java      | 111 +++++++++
 .../process/computer/MemoryComputeKey.java      |   2 +-
 .../traversal/TraversalVertexProgram.java       |  26 +-
 .../step/map/TraversalVertexProgramStep.java    |  10 +
 .../traversal/step/map/VertexProgramStep.java   |   3 +-
 .../process/remote/RemoteConnection.java        |   4 +-
 .../gremlin/process/remote/RemoteGraph.java     |  77 +++---
 .../remote/traversal/step/map/RemoteStep.java   |  33 +--
 .../traversal/strategy/RemoteStrategy.java      |  38 +--
 .../gremlin/process/traversal/Traversal.java    |  19 +-
 .../process/traversal/TraversalSource.java      |  11 +-
 .../process/traversal/TraversalStrategies.java  |   3 +-
 .../dsl/graph/GraphTraversalSource.java         |   6 +-
 .../engine/ComputerTraversalEngine.java         |  19 +-
 .../process/traversal/step/LambdaHolder.java    |   4 +
 .../process/traversal/step/TraversalParent.java |   1 +
 .../traversal/step/filter/DedupGlobalStep.java  |   7 +-
 .../traversal/step/filter/RangeGlobalStep.java  |   6 +-
 .../traversal/step/filter/TailGlobalStep.java   |   2 +-
 .../step/filter/WhereTraversalStep.java         |   5 +-
 .../process/traversal/step/map/MatchStep.java   |  29 +--
 .../traversal/step/map/OrderGlobalStep.java     |  14 +-
 .../traversal/step/map/ProfileMarkerStep.java   |  42 ----
 .../step/sideEffect/ProfileSideEffectStep.java  | 145 ++---------
 .../step/util/CollectingBarrierStep.java        |   3 +-
 .../process/traversal/step/util/EmptyStep.java  |  10 +
 .../traversal/step/util/ProfileStep.java        | 126 ++++++++++
 .../step/util/SupplyingBarrierStep.java         |   3 +-
 .../decoration/VertexProgramStrategy.java       |  23 +-
 .../strategy/finalization/ProfileStrategy.java  |  41 +--
 .../ComputerVerificationStrategy.java           |  50 ++--
 .../strategy/verification/ReadOnlyStrategy.java |   8 +
 .../StandardVerificationStrategy.java           |  12 +-
 .../traversal/util/DefaultTraversal.java        |   9 +-
 .../traversal/util/DefaultTraversalMetrics.java | 248 +++++++++++++++++++
 .../util/DefaultTraversalStrategies.java        |  13 +-
 .../traversal/util/DependantMutableMetrics.java |  62 -----
 .../process/traversal/util/MutableMetrics.java  |   6 +-
 .../util/StandardTraversalMetrics.java          | 226 -----------------
 .../process/traversal/util/TraversalHelper.java |  12 +
 .../structure/io/graphson/GraphSONModule.java   |   4 +-
 .../io/graphson/GraphSONSerializers.java        |  38 +++
 .../gremlin/structure/io/gryo/GryoMapper.java   |  12 +-
 .../gremlin/structure/util/StringFactory.java   |   3 +-
 .../DefaultTraversalMetricsSupplier.java        |  45 ++++
 .../util/function/MutableMetricsSupplier.java   |  50 ++++
 .../StandardTraversalMetricsSupplier.java       |  45 ----
 .../traversal/step/TraversalParentTest.java     |  79 ++++++
 .../decoration/VertexProgramStrategyTest.java   |   4 +-
 .../tinkerpop/gremlin/driver/Connection.java    |   5 +-
 .../driver/remote/DriverRemoteConnection.java   |  40 +--
 ...raphSONMessageSerializerGremlinV1d0Test.java |  36 ++-
 .../ser/GraphSONMessageSerializerV1d0Test.java  |  42 ++++
 .../traversal/step/map/GroovyProfileTest.groovy |  35 +--
 .../traversal/step/map/GroovySelectTest.groovy  |   5 +
 .../AbstractImportCustomizerProvider.java       |   2 +
 gremlin-server/pom.xml                          |   6 +
 .../op/traversal/TraversalOpProcessor.java      |  38 ++-
 gremlin-server/src/main/static/NOTICE           |   2 +-
 .../remote/RemoteGraphComputerProvider.java     |  54 ++++
 .../driver/remote/RemoteGraphProvider.java      |   6 +-
 .../process/RemoteGraphProcessComputerTest.java |  34 +++
 .../server/GremlinDriverIntegrateTest.java      |  21 ++
 .../src/test/resources/log4j-test.properties    |   4 +-
 gremlin-shaded/pom.xml                          |   2 +-
 .../gremlin/process/GremlinProcessRunner.java   |   3 +
 .../process/traversal/step/filter/HasTest.java  |   3 +-
 .../traversal/step/filter/RangeTest.java        |  20 +-
 .../process/traversal/step/map/MatchTest.java   |   9 +-
 .../process/traversal/step/map/ProfileTest.java | 243 +++++++++---------
 .../process/traversal/step/map/SelectTest.java  |  23 ++
 .../gremlin/structure/SerializationTest.java    |  76 +++++-
 .../groovy/plugin/HadoopRemoteAcceptor.java     |   2 +-
 .../computer/AbstractHadoopGraphComputer.java   |   2 +-
 .../gremlin/hadoop/structure/HadoopGraph.java   |   8 +-
 pom.xml                                         |   2 +-
 .../spark/structure/io/PersistedOutputRDD.java  |   9 +-
 .../process/computer/LocalPropertyTest.java     |   5 +-
 .../computer/SparkHadoopGraphProvider.java      |   3 +-
 .../spark/structure/io/InputOutputRDDTest.java  |   2 +-
 .../spark/structure/io/InputRDDTest.java        |   2 +-
 .../spark/structure/io/OutputRDDTest.java       |   3 +-
 .../io/PersistedInputOutputRDDTest.java         |   5 +-
 .../process/TinkerGraphComputerProvider.java    |   2 +-
 .../structure/TinkerGraphPlayTest.java          |  25 +-
 96 files changed, 1651 insertions(+), 1023 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2652bc25/docs/src/reference/the-traversal.asciidoc
----------------------------------------------------------------------