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/09/10 01:31:06 UTC
[2/4] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/d10ef866
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/d10ef866
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/d10ef866
Branch: refs/heads/master
Commit: d10ef866de431f679ce2f6a28bdf49ac71e3e99d
Parents: ef4f25d 31ec85a
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Sep 9 17:06:00 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Sep 9 17:06:00 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
giraph-gremlin/pom.xml | 199 ++++++++++++
giraph-gremlin/src/assembly/hadoop-job.xml | 41 +++
giraph-gremlin/src/assembly/standalone.xml | 50 +++
.../groovy/plugin/GiraphGremlinPlugin.java | 72 +++++
.../giraph/process/computer/EmptyOutEdges.java | 80 +++++
.../process/computer/GiraphComputeVertex.java | 50 +++
.../process/computer/GiraphGraphComputer.java | 222 +++++++++++++
.../giraph/process/computer/GiraphMemory.java | 218 +++++++++++++
.../process/computer/GiraphMessageCombiner.java | 62 ++++
.../process/computer/GiraphMessenger.java | 79 +++++
.../process/computer/GiraphWorkerContext.java | 77 +++++
.../process/computer/MemoryAggregator.java | 94 ++++++
.../computer/io/GiraphVertexInputFormat.java | 65 ++++
.../computer/io/GiraphVertexOutputFormat.java | 65 ++++
.../process/computer/io/GiraphVertexReader.java | 67 ++++
.../process/computer/io/GiraphVertexWriter.java | 57 ++++
...inkerpop.gremlin.groovy.plugin.GremlinPlugin | 1 +
.../groovy/plugin/HadoopGremlinPluginTest.java | 162 ++++++++++
.../giraph/groovy/plugin/HadoopPluginSuite.java | 36 +++
...GiraphGraphComputerProcessIntegrateTest.java | 32 ++
.../computer/HadoopGiraphGraphProvider.java | 168 ++++++++++
...GraphComputerGroovyProcessIntegrateTest.java | 33 ++
.../GiraphHadoopGremlinPluginIntegrateTest.java | 33 ++
.../traverser/B_O_S_SE_SL_Traverser.java | 2 +-
.../traversal/step/filter/GroovyHasTest.groovy | 4 +-
.../traversal/step/map/GroovyAddEdgeTest.groovy | 4 +-
.../process/traversal/step/filter/HasTest.java | 3 +
hadoop-gremlin/pom.xml | 147 +--------
.../groovy/plugin/HadoopGremlinPlugin.java | 6 -
.../process/computer/giraph/EmptyOutEdges.java | 81 -----
.../computer/giraph/GiraphComputeVertex.java | 50 ---
.../computer/giraph/GiraphGraphComputer.java | 222 -------------
.../process/computer/giraph/GiraphMemory.java | 218 -------------
.../computer/giraph/GiraphMessageCombiner.java | 62 ----
.../computer/giraph/GiraphMessenger.java | 79 -----
.../computer/giraph/GiraphWorkerContext.java | 77 -----
.../computer/giraph/MemoryAggregator.java | 94 ------
.../giraph/io/GiraphVertexInputFormat.java | 65 ----
.../giraph/io/GiraphVertexOutputFormat.java | 65 ----
.../computer/giraph/io/GiraphVertexReader.java | 67 ----
.../computer/giraph/io/GiraphVertexWriter.java | 57 ----
.../process/computer/spark/RuleAccumulator.java | 55 ----
.../process/computer/spark/SparkExecutor.java | 222 -------------
.../computer/spark/SparkGraphComputer.java | 216 -------------
.../process/computer/spark/SparkMapEmitter.java | 45 ---
.../process/computer/spark/SparkMemory.java | 181 -----------
.../process/computer/spark/SparkMessenger.java | 83 -----
.../computer/spark/SparkReduceEmitter.java | 45 ---
.../computer/spark/io/InputFormatRDD.java | 46 ---
.../process/computer/spark/io/InputRDD.java | 41 ---
.../computer/spark/io/OutputFormatRDD.java | 48 ---
.../process/computer/spark/io/OutputRDD.java | 31 --
.../computer/spark/payload/MessagePayload.java | 35 --
.../process/computer/spark/payload/Payload.java | 27 --
.../spark/payload/ViewIncomingPayload.java | 95 ------
.../spark/payload/ViewOutgoingPayload.java | 46 ---
.../computer/spark/payload/ViewPayload.java | 39 ---
.../gremlin/hadoop/structure/HadoopGraph.java | 54 ++--
.../gremlin/hadoop/HadoopGraphProvider.java | 21 --
...GiraphGraphComputerProcessIntegrateTest.java | 32 --
.../giraph/HadoopGiraphGraphProvider.java | 36 ---
...GraphComputerGroovyProcessIntegrateTest.java | 33 --
.../GiraphHadoopGremlinPluginIntegrateTest.java | 33 --
.../spark/HadoopSparkGraphProvider.java | 37 ---
.../SparkGraphComputerProcessIntegrateTest.java | 32 --
...GraphComputerGroovyProcessIntegrateTest.java | 33 --
.../groovy/SparkHadoopGremlinPluginTest.java | 33 --
.../computer/spark/io/ExampleInputRDD.java | 47 ---
.../computer/spark/io/ExampleOutputRDD.java | 45 ---
.../computer/spark/io/InputOutputRDDTest.java | 59 ----
.../process/computer/spark/io/InputRDDTest.java | 54 ----
.../computer/spark/io/OutputRDDTest.java | 62 ----
pom.xml | 2 +
spark-gremlin/pom.xml | 324 +++++++++++++++++++
spark-gremlin/src/assembly/hadoop-job.xml | 39 +++
spark-gremlin/src/assembly/standalone.xml | 48 +++
.../spark/groovy/plugin/SparkGremlinPlugin.java | 72 +++++
.../spark/process/computer/RuleAccumulator.java | 55 ++++
.../spark/process/computer/SparkExecutor.java | 220 +++++++++++++
.../process/computer/SparkGraphComputer.java | 217 +++++++++++++
.../spark/process/computer/SparkMapEmitter.java | 45 +++
.../spark/process/computer/SparkMemory.java | 181 +++++++++++
.../spark/process/computer/SparkMessenger.java | 83 +++++
.../process/computer/SparkReduceEmitter.java | 45 +++
.../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 ++
.../computer/payload/MessagePayload.java | 35 ++
.../spark/process/computer/payload/Payload.java | 27 ++
.../computer/payload/ViewIncomingPayload.java | 95 ++++++
.../computer/payload/ViewOutgoingPayload.java | 46 +++
.../process/computer/payload/ViewPayload.java | 39 +++
...inkerpop.gremlin.groovy.plugin.GremlinPlugin | 1 +
.../groovy/plugin/HadoopGremlinPluginTest.java | 162 ++++++++++
.../spark/groovy/plugin/HadoopPluginSuite.java | 36 +++
.../computer/HadoopSparkGraphProvider.java | 158 +++++++++
.../SparkGraphComputerProcessIntegrateTest.java | 32 ++
...GraphComputerGroovyProcessIntegrateTest.java | 33 ++
.../groovy/SparkHadoopGremlinPluginTest.java | 33 ++
.../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 ++++
106 files changed, 4455 insertions(+), 3142 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/d10ef866/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
index 5e4d8ad,ed4a5e8..10e708e
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/HasTest.java
@@@ -156,24 -158,15 +158,25 @@@ public abstract class HasTest extends A
@Test
@LoadGraphWith(MODERN)
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
public void g_VX1X_hasXage_gt_30X() {
- Arrays.asList(get_g_VX1X_hasXage_gt_30X(convertToVertexId("marko")), get_g_VXv1X_hasXage_gt_30X(convertToVertexId("marko"))).forEach(traversal -> {
- printTraversalForm(traversal);
- assertFalse(traversal.hasNext());
- traversal = get_g_VX1X_hasXage_gt_30X(convertToVertexId("josh"));
- printTraversalForm(traversal);
- assertTrue(traversal.hasNext());
- });
+ final Traversal<Vertex,Vertex> traversalMarko = get_g_VX1X_hasXage_gt_30X(convertToVertexId("marko"));
+ printTraversalForm(traversalMarko);
+ assertFalse(traversalMarko.hasNext());
+ final Traversal<Vertex,Vertex> traversalJosh = get_g_VX1X_hasXage_gt_30X(convertToVertexId("josh"));
+ printTraversalForm(traversalJosh);
+ assertTrue(traversalJosh.hasNext());
+ }
+
+ @Test
+ @LoadGraphWith(MODERN)
+ public void g_VXv1X_hasXage_gt_30X() {
+ final Traversal<Vertex,Vertex> traversalMarko = get_g_VXv1X_hasXage_gt_30X(convertToVertexId("marko"));
+ printTraversalForm(traversalMarko);
+ assertFalse(traversalMarko.hasNext());
+ final Traversal<Vertex,Vertex> traversalJosh = get_g_VX1X_hasXage_gt_30X(convertToVertexId("josh"));
+ printTraversalForm(traversalJosh);
+ assertTrue(traversalJosh.hasNext());
}
@Test