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/11/09 14:01:25 UTC

[2/8] incubator-tinkerpop git commit: Merge remote-tracking branch 'origin/master' into TINKERPOP3-923

Merge remote-tracking branch 'origin/master' into TINKERPOP3-923


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

Branch: refs/heads/master
Commit: 2b7dc773bd6a8df837b6d4da36c27b5c2d9c04c7
Parents: 3326fcc 151f64b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Nov 4 18:08:57 2015 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Nov 4 18:08:57 2015 -0500

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  11 +
 docs/src/developer-contributing.asciidoc        |  60 ++++--
 docs/src/developer-meetings.asciidoc            |  64 ++++++
 docs/src/developer-release.asciidoc             |  13 +-
 docs/src/developer.asciidoc                     |   4 +-
 docs/src/gremlin-applications.asciidoc          |   7 +
 docs/src/implementations.asciidoc               |  45 ++--
 docs/src/the-graphcomputer.asciidoc             |   4 +
 docs/src/the-traversal.asciidoc                 |  36 +++-
 .../upgrade-release-3.1.x-incubating.asciidoc   |  25 ++-
 docs/static/images/gremlin-standing-strong.png  | Bin 0 -> 30985 bytes
 .../process/computer/GiraphGraphComputer.java   |  16 +-
 .../computer/io/GiraphVertexInputFormat.java    |  70 ------
 .../computer/io/GiraphVertexOutputFormat.java   |  65 ------
 .../process/computer/io/GiraphVertexReader.java |  67 ------
 .../process/computer/io/GiraphVertexWriter.java |  57 -----
 .../structure/io/GiraphVertexInputFormat.java   |  70 ++++++
 .../structure/io/GiraphVertexOutputFormat.java  |  65 ++++++
 .../giraph/structure/io/GiraphVertexReader.java |  67 ++++++
 .../giraph/structure/io/GiraphVertexWriter.java |  57 +++++
 .../GephiTraversalVisualizationStrategy.groovy  |   2 +-
 .../gremlin/process/computer/GraphComputer.java |  19 +-
 .../computer/bulkloading/BulkLoader.java        |  31 +++
 .../bulkloading/BulkLoaderVertexProgram.java    | 115 ++++++++--
 .../bulkloading/IncrementalBulkLoader.java      |  14 +-
 .../traversal/TraversalVertexProgram.java       |   4 +-
 .../gremlin/process/traversal/NumberHelper.java |  12 +-
 .../traversal/dsl/graph/GraphTraversal.java     |  23 +-
 .../dsl/graph/GraphTraversalSource.java         |  10 +-
 .../gremlin/process/traversal/dsl/graph/__.java |   9 +-
 .../process/traversal/step/map/GraphStep.java   | 149 +++++++++++++
 .../process/traversal/step/map/MatchStep.java   |  46 ++--
 .../traversal/step/map/MaxGlobalStep.java       |  14 +-
 .../traversal/step/map/MaxLocalStep.java        |   5 +-
 .../traversal/step/map/MeanGlobalStep.java      |  61 +++---
 .../traversal/step/map/MeanLocalStep.java       |  11 +-
 .../traversal/step/map/MinGlobalStep.java       |  14 +-
 .../traversal/step/map/MinLocalStep.java        |   5 +-
 .../traversal/step/map/SumGlobalStep.java       |  25 ++-
 .../traversal/step/map/SumLocalStep.java        |   5 +-
 .../traversal/step/sideEffect/GraphStep.java    | 101 ---------
 .../step/util/TraversalComparator.java          |   5 +-
 .../strategy/decoration/ConnectiveStrategy.java |   3 +-
 .../strategy/decoration/ElementIdStrategy.java  |   2 +-
 .../strategy/decoration/PartitionStrategy.java  |   2 +-
 .../strategy/decoration/SubgraphStrategy.java   |   2 +-
 .../finalization/LazyBarrierStrategy.java       |   2 +-
 .../ComputerVerificationStrategy.java           |  39 +++-
 .../process/traversal/util/TraversalHelper.java |   3 +
 .../traversal/step/map/GraphStepTest.java       |  41 ++++
 .../traversal/step/map/MatchStepTest.java       |  82 ++++++-
 .../traversal/step/map/MeanGlobalStepTest.java  |  14 ++
 .../traversal/step/map/MeanLocalStepTest.java   |  14 ++
 .../ElementIdStrategyTraverseTest.java          |   4 +-
 .../PartitionStrategyTraverseTest.java          |   4 +-
 .../SubgraphStrategyTraverseTest.java           |   5 +-
 .../traversal/step/map/GroovyGraphTest.groovy   |  50 +++++
 .../traversal/step/map/GroovyOrderTest.groovy   |  10 +
 .../step/sideEffect/GroovyGroupTest.groovy      |   2 +-
 .../process/GroovyProcessComputerSuite.java     |   2 +
 .../process/GroovyProcessStandardSuite.java     |   2 +
 .../gremlin/process/ProcessComputerSuite.java   |   2 +
 .../gremlin/process/ProcessStandardSuite.java   |   2 +
 .../process/computer/GraphComputerTest.java     |  34 +--
 .../traversal/step/map/AddVertexTest.java       |   2 +-
 .../process/traversal/step/map/GraphTest.java   | 109 ++++++++++
 .../process/traversal/step/map/OrderTest.java   |  58 ++++-
 .../process/traversal/step/map/SumTest.java     |   2 +-
 .../traversal/step/sideEffect/GroupTest.java    |  22 +-
 ...ComputerVerificationStrategyProcessTest.java |   3 +-
 .../tinkerpop/gremlin/hadoop/Constants.java     |   1 -
 .../structure/hdfs/HadoopElementIterator.java   |   4 +-
 .../hadoop/structure/io/InputOutputHelper.java  |  22 ++
 .../hadoop/structure/util/HadoopHelper.java     |  50 -----
 .../groovy/plugin/HadoopGremlinPluginTest.java  |   2 +-
 neo4j-gremlin/pom.xml                           |  28 ++-
 .../step/sideEffect/Neo4jGraphStep.java         |  10 +-
 .../optimization/Neo4jGraphStepStrategy.java    |  13 +-
 .../gremlin/neo4j/structure/Neo4jGraph.java     |   1 +
 .../gremlin/neo4j/structure/Neo4jHelper.java    |  16 +-
 .../traversal/strategy/Neo4jStrategySuite.java  |  44 ++++
 .../traversal/strategy/Neo4jStrategyTest.java   |  32 +++
 .../Neo4jGraphStepStrategyTest.java             |  76 +++++++
 .../process/computer/SparkGraphComputer.java    | 102 +++++++--
 .../process/computer/io/InputFormatRDD.java     |  47 ----
 .../spark/process/computer/io/InputRDD.java     |  41 ----
 .../process/computer/io/OutputFormatRDD.java    |  49 -----
 .../spark/process/computer/io/OutputRDD.java    |  31 ---
 .../spark/structure/io/InputFormatRDD.java      |  47 ++++
 .../spark/structure/io/InputOutputHelper.java   |  81 +++++++
 .../gremlin/spark/structure/io/InputRDD.java    |  41 ++++
 .../spark/structure/io/OutputFormatRDD.java     |  49 +++++
 .../gremlin/spark/structure/io/OutputRDD.java   |  31 +++
 .../spark/structure/io/PersistedInputRDD.java   |  60 ++++++
 .../spark/structure/io/PersistedOutputRDD.java  |  41 ++++
 .../process/computer/LocalPropertyTest.java     | 100 +++++++++
 .../process/computer/io/ExampleInputRDD.java    |  47 ----
 .../process/computer/io/ExampleOutputRDD.java   |  45 ----
 .../process/computer/io/InputOutputRDDTest.java |  59 -----
 .../spark/process/computer/io/InputRDDTest.java |  54 -----
 .../process/computer/io/OutputRDDTest.java      |  62 ------
 .../spark/structure/io/ExampleInputRDD.java     |  51 +++++
 .../spark/structure/io/ExampleOutputRDD.java    |  50 +++++
 .../spark/structure/io/InputOutputRDDTest.java  |  60 ++++++
 .../spark/structure/io/InputRDDTest.java        |  55 +++++
 .../spark/structure/io/OutputRDDTest.java       |  63 ++++++
 .../io/PersistedInputOutputRDDTest.java         | 216 +++++++++++++++++++
 .../step/sideEffect/TinkerGraphStep.java        |  10 +-
 .../optimization/TinkerGraphStepStrategy.java   |  13 +-
 .../tinkergraph/structure/TinkerGraph.java      |   1 +
 .../strategy/TinkerGraphStrategySuite.java      |  44 ++++
 .../strategy/TinkerGraphStrategyTest.java       |  32 +++
 .../TinkerGraphStepStrategyTest.java            |  33 ++-
 .../structure/TinkerGraphPlayTest.java          |  41 ++--
 114 files changed, 2814 insertions(+), 1141 deletions(-)
----------------------------------------------------------------------