tinkerpop-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ok...@apache.org
Subject [11/14] incubator-tinkerpop git commit: BVLP problem with InputRDD was not a real problem. It had to do with workers=1 and local[4]. This is ticket TINKERPOP-1025. Will merge with this work given that its so simple and all related.
Date Wed, 09 Dec 2015 13:51:32 GMT
BVLP problem with InputRDD was not a real problem. It had to do with workers=1 and local[4].
This is ticket TINKERPOP-1025. Will merge with this work given that its so simple and all
related.


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

Branch: refs/heads/master
Commit: 10d9b16d3aec1c66c4e4974a48053b4e832154d2
Parents: 7514782
Author: Marko A. Rodriguez <okrammarko@gmail.com>
Authored: Tue Dec 8 17:00:03 2015 -0700
Committer: Marko A. Rodriguez <okrammarko@gmail.com>
Committed: Tue Dec 8 17:00:03 2015 -0700

----------------------------------------------------------------------
 .../spark/process/computer/SparkHadoopGraphProvider.java    | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/10d9b16d/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java
b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java
index f0ba08f..878b38a 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphProvider.java
@@ -25,6 +25,7 @@ import org.apache.tinkerpop.gremlin.hadoop.HadoopGraphProvider;
 import org.apache.tinkerpop.gremlin.process.computer.bulkloading.BulkLoaderVertexProgramTest;
 import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
 import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
+import org.apache.tinkerpop.gremlin.spark.structure.Spark;
 import org.apache.tinkerpop.gremlin.spark.structure.io.ToyGraphInputRDD;
 import org.apache.tinkerpop.gremlin.spark.structure.io.gryo.GryoSerializer;
 import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -44,11 +45,11 @@ public final class SparkHadoopGraphProvider extends HadoopGraphProvider
{
     public Map<String, Object> getBaseConfiguration(final String graphName, final Class<?>
test, final String testMethodName, final LoadGraphWith.GraphData loadGraphWith) {
         final Map<String, Object> config = super.getBaseConfiguration(graphName, test,
testMethodName, loadGraphWith);
         config.put(Constants.GREMLIN_SPARK_PERSIST_CONTEXT, true);  // this makes the test
suite go really fast
-        if (null != loadGraphWith &&
-                !test.equals(BulkLoaderVertexProgramTest.class) &&
-                RANDOM.nextBoolean()) {
-            // config.put(Constants.GREMLIN_HADOOP_GRAPH_INPUT_FORMAT, InputRDDFormat.class.getCanonicalName());
+        if (null != loadGraphWith && RANDOM.nextBoolean()) {
+            if (test.equals(BulkLoaderVertexProgramTest.class))
+                Spark.close(); // this forces workers to be 1 which is required for BulkLoaderVertexProgramTest
             config.put(Constants.GREMLIN_SPARK_GRAPH_INPUT_RDD, ToyGraphInputRDD.class.getCanonicalName());
+            // config.put(Constants.GREMLIN_HADOOP_GRAPH_INPUT_FORMAT, InputRDDFormat.class.getCanonicalName());
         }
         /// spark configuration
         config.put("spark.master", "local[4]");


Mime
View raw message