You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2016/01/08 15:20:42 UTC

[17/17] incubator-tinkerpop git commit: Merge branch 'TINKERPOP-1033'

Merge branch 'TINKERPOP-1033'


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

Branch: refs/heads/master
Commit: 114609df01b79f2e7d9dbd11d9bcf8c74aa70d24
Parents: 8749d3d 11b154e
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Fri Jan 8 07:20:11 2016 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Fri Jan 8 07:20:11 2016 -0700

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |   5 +
 docs/src/reference/implementations.asciidoc     | 104 ++++----
 .../upgrade/release-3.1.x-incubating.asciidoc   |  26 ++
 .../process/computer/GiraphGraphComputer.java   |  43 ++--
 .../GiraphHadoopGremlinIntegrateTest.java       |  33 +++
 .../computer/GiraphHadoopGraphProvider.java     |   6 +-
 .../GiraphHadoopGremlinPluginIntegrateTest.java |  33 ---
 .../peerpressure/ClusterCountMapReduce.java     |   7 +-
 .../tinkerpop/gremlin/structure/io/Storage.java | 139 +++++++++++
 .../gremlin/structure/util/StringFactory.java   |  18 +-
 .../process/computer/GraphComputerTest.java     |  54 ++--
 .../conf/hadoop-grateful-gryo.properties        |   6 +-
 .../hadoop/groovy/plugin/HadoopLoader.groovy    | 138 -----------
 .../tinkerpop/gremlin/hadoop/Constants.java     |  20 ++
 .../groovy/plugin/HadoopGremlinPlugin.java      |  11 +-
 .../process/computer/util/MapReduceHelper.java  |   8 +-
 .../hadoop/structure/HadoopConfiguration.java   |   5 +
 .../gremlin/hadoop/structure/HadoopGraph.java   |   4 +-
 .../hadoop/structure/hdfs/HDFSTools.java        | 113 ---------
 .../structure/hdfs/HadoopEdgeIterator.java      |  83 -------
 .../structure/hdfs/HadoopElementIterator.java   |  74 ------
 .../structure/hdfs/HadoopVertexIterator.java    |  82 -------
 .../hadoop/structure/hdfs/HiddenFileFilter.java |  44 ----
 .../hadoop/structure/hdfs/TextIterator.java     |  91 -------
 .../hadoop/structure/io/FileSystemStorage.java  | 246 +++++++++++++++++++
 .../hadoop/structure/io/HadoopEdgeIterator.java |  79 ++++++
 .../structure/io/HadoopElementIterator.java     |  75 ++++++
 .../structure/io/HadoopVertexIterator.java      |  78 ++++++
 .../hadoop/structure/io/HiddenFileFilter.java   |  44 ++++
 .../hadoop/structure/io/InputOutputHelper.java  |   2 +-
 .../structure/io/ObjectWritableIterator.java    |  12 +-
 .../hadoop/structure/io/TextIterator.java       |  91 +++++++
 .../structure/io/VertexWritableIterator.java    |  10 +-
 .../gremlin/hadoop/HadoopGremlinSuite.java      |  36 +++
 .../groovy/plugin/HadoopGremlinPluginCheck.java |  71 +-----
 .../hadoop/groovy/plugin/HadoopPluginSuite.java |  34 ---
 .../structure/io/AbstractStorageCheck.java      | 145 +++++++++++
 .../structure/io/FileSystemStorageCheck.java    |  88 +++++++
 .../spark/groovy/plugin/SparkLoader.groovy      |  68 -----
 .../spark/groovy/plugin/SparkGremlinPlugin.java |   5 +-
 .../spark/process/computer/SparkExecutor.java   |  28 ---
 .../process/computer/SparkGraphComputer.java    |  18 +-
 .../gremlin/spark/structure/Spark.java          |   2 +
 .../spark/structure/io/InputFormatRDD.java      |  15 ++
 .../spark/structure/io/InputOutputHelper.java   |   3 -
 .../gremlin/spark/structure/io/InputRDD.java    |  17 +-
 .../spark/structure/io/OutputFormatRDD.java     |  30 ++-
 .../gremlin/spark/structure/io/OutputRDD.java   |  21 ++
 .../spark/structure/io/PersistedInputRDD.java   |  14 +-
 .../spark/structure/io/PersistedOutputRDD.java  |  25 +-
 .../spark/structure/io/SparkContextStorage.java | 164 +++++++++++++
 .../gremlin/spark/AbstractSparkTest.java        |  30 +++
 .../gremlin/spark/SparkGremlinSuite.java        |  35 +++
 .../gremlin/spark/SparkGremlinTest.java         |  33 +++
 .../gremlin/spark/SparkHadoopGremlinTest.java   |  33 +++
 .../process/computer/LocalPropertyTest.java     |   2 +-
 .../computer/SparkHadoopGraphProvider.java      |  12 +-
 .../groovy/plugin/SparkGremlinPluginTest.java   | 126 ----------
 .../plugin/SparkHadoopGremlinPluginTest.java    |  33 ---
 .../gremlin/spark/structure/SparkTest.java      |  10 +-
 .../spark/structure/io/ExampleInputRDD.java     |   5 +
 .../spark/structure/io/ExampleOutputRDD.java    |   6 +
 .../io/PersistedInputOutputRDDTest.java         |  29 +--
 .../structure/io/SparkContextStorageCheck.java  |  74 ++++++
 .../spark/structure/io/ToyGraphInputRDD.java    |   7 +
 65 files changed, 1801 insertions(+), 1202 deletions(-)
----------------------------------------------------------------------