Merge branch 'TINKERPOP-1930'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0cfda44a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0cfda44a Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0cfda44a Branch: refs/heads/tp33 Commit: 0cfda44a08d0293a72aeeacb0520e0ca2378866f Parents: 986588b 33bfe54 Author: Stephen Mallette <sp...@genoprime.com> Authored: Tue Apr 3 08:07:03 2018 -0400 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Tue Apr 3 08:07:03 2018 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + docs/preprocessor/install-plugins.sh | 2 +- docs/preprocessor/preprocess-file.sh | 7 +- docs/site/home/gremlin.html | 3 +- docs/site/home/index.html | 1 - docs/site/home/providers.html | 12 +- docs/src/dev/provider/index.asciidoc | 4 +- .../src/reference/gremlin-applications.asciidoc | 9 - .../reference/implementations-giraph.asciidoc | 145 --------- .../implementations-hadoop-end.asciidoc | 144 +-------- .../implementations-hadoop-start.asciidoc | 42 +-- docs/src/reference/index.asciidoc | 1 - .../tutorials/getting-started/index.asciidoc | 14 +- docs/src/upgrade/release-3.4.x.asciidoc | 8 + giraph-gremlin/pom.xml | 258 ---------------- giraph-gremlin/src/assembly/hadoop-job.xml | 41 --- giraph-gremlin/src/assembly/standalone.xml | 50 --- .../giraph/jsr223/GiraphGremlinPlugin.java | 58 ---- .../giraph/process/computer/EmptyOutEdges.java | 80 ----- .../process/computer/GiraphComputation.java | 47 --- .../process/computer/GiraphGraphComputer.java | 303 ------------------- .../giraph/process/computer/GiraphMemory.java | 198 ------------ .../process/computer/GiraphMessageCombiner.java | 61 ---- .../process/computer/GiraphMessenger.java | 90 ------ .../giraph/process/computer/GiraphVertex.java | 39 --- .../process/computer/GiraphWorkerContext.java | 78 ----- .../process/computer/MemoryAggregator.java | 68 ----- .../process/computer/PassThroughMemory.java | 99 ------ .../structure/io/GiraphVertexInputFormat.java | 58 ---- .../structure/io/GiraphVertexOutputFormat.java | 55 ---- .../giraph/structure/io/GiraphVertexReader.java | 68 ----- .../giraph/structure/io/GiraphVertexWriter.java | 71 ----- ...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 1 - .../giraph/GiraphGremlinIntegrateTest.java | 33 -- .../gremlin/giraph/GiraphGremlinSuite.java | 35 --- .../GiraphHadoopGremlinIntegrateTest.java | 33 -- ...GiraphGraphComputerProcessIntegrateTest.java | 32 -- .../computer/GiraphHadoopGraphProvider.java | 68 ----- .../structure/io/GiraphIoRegistryCheck.java | 64 ---- .../src/test/resources/giraph-site.xml | 12 - .../src/test/resources/log4j-silent.properties | 23 -- .../src/test/resources/log4j-test.properties | 23 -- .../tinkerpop/gremlin/jsr223/GremlinPlugin.java | 4 +- hadoop-gremlin/conf/hadoop-graphson.properties | 6 - .../conf/hadoop-grateful-gryo.properties | 12 - hadoop-gremlin/conf/hadoop-gryo.properties | 16 - hadoop-gremlin/conf/hadoop-script.properties | 16 - .../tinkerpop/gremlin/hadoop/Constants.java | 1 - .../gremlin/hadoop/structure/HadoopGraph.java | 17 +- pom.xml | 12 +- 50 files changed, 40 insertions(+), 2483 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0cfda44a/CHANGELOG.asciidoc ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0cfda44a/docs/site/home/index.html ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0cfda44a/pom.xml ----------------------------------------------------------------------