You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2016/01/13 13:28:43 UTC
[2/6] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master' into TINKERPOP-320
Merge remote-tracking branch 'origin/master' into TINKERPOP-320
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/43eaf8dd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/43eaf8dd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/43eaf8dd
Branch: refs/heads/master
Commit: 43eaf8dda431f5deedf0f2725d9c87f0bf58aa47
Parents: bdfd490 114609d
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Fri Jan 8 20:19:39 2016 +0100
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Fri Jan 8 20:19:39 2016 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 7 +
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 +-
.../tinkerpop/gremlin/driver/Cluster.java | 3 +
.../tinkerpop/gremlin/driver/Settings.java | 2 +
.../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 +++++++
pom.xml | 2 +-
spark-gremlin/pom.xml | 2 +-
.../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 +
.../tinkergraph/structure/TinkerIoRegistry.java | 1 +
.../tinkergraph/structure/TinkerGraphTest.java | 129 +++++++++-
71 files changed, 1939 insertions(+), 1205 deletions(-)
----------------------------------------------------------------------