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 2017/04/21 13:35:26 UTC
[1/2] tinkerpop git commit: Removed some unnecessary test setup from
spark
Repository: tinkerpop
Updated Branches:
refs/heads/master feae45da6 -> 55b72aaea
Removed some unnecessary test setup from spark
Should have probably been removed back on TINKERPOP-1271 CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/db035d57
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/db035d57
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/db035d57
Branch: refs/heads/master
Commit: db035d5784275e0ebef2ce5f4830ef846fefcbf7
Parents: 25e367b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 20 19:13:48 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 20 19:13:48 2017 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/spark/AbstractSparkTest.java | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/db035d57/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/AbstractSparkTest.java
----------------------------------------------------------------------
diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/AbstractSparkTest.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/AbstractSparkTest.java
index 6d2231f..1e24d0d 100644
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/AbstractSparkTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/AbstractSparkTest.java
@@ -21,9 +21,6 @@ package org.apache.tinkerpop.gremlin.spark;
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
-import org.apache.spark.SparkConf;
-import org.apache.spark.SparkContext;
-import org.apache.spark.api.java.JavaSparkContext;
import org.apache.tinkerpop.gremlin.hadoop.Constants;
import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph;
import org.apache.tinkerpop.gremlin.spark.structure.Spark;
@@ -43,12 +40,6 @@ public abstract class AbstractSparkTest {
@After
@Before
public void setupTest() {
- SparkConf sparkConfiguration = new SparkConf();
- sparkConfiguration.setAppName(this.getClass().getCanonicalName() + "-setupTest");
- sparkConfiguration.set("spark.master", "local[4]");
- JavaSparkContext sparkContext = new JavaSparkContext(SparkContext.getOrCreate(sparkConfiguration));
- sparkContext.close();
- Spark.create(sparkContext.sc());
Spark.close();
logger.info("SparkContext has been closed for " + this.getClass().getCanonicalName() + "-setupTest");
}
[2/2] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Conflicts:
spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/AbstractSparkTest.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/55b72aae
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/55b72aae
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/55b72aae
Branch: refs/heads/master
Commit: 55b72aaeae4ffc73cae9b4cd2b14e43a8d6e308a
Parents: feae45d db035d5
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Apr 20 19:18:22 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Apr 20 19:18:22 2017 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/spark/AbstractSparkTest.java | 9 ---------
1 file changed, 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/55b72aae/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/AbstractSparkTest.java
----------------------------------------------------------------------
diff --cc spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/AbstractSparkTest.java
index ec9bf89,1e24d0d..2f3eb6f
--- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/AbstractSparkTest.java
+++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/AbstractSparkTest.java
@@@ -21,13 -21,8 +21,10 @@@ package org.apache.tinkerpop.gremlin.sp
import org.apache.commons.configuration.BaseConfiguration;
import org.apache.commons.configuration.Configuration;
- import org.apache.spark.SparkConf;
- import org.apache.spark.SparkContext;
- import org.apache.spark.api.java.JavaSparkContext;
+import org.apache.spark.launcher.SparkLauncher;
import org.apache.tinkerpop.gremlin.hadoop.Constants;
import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph;
+import org.apache.tinkerpop.gremlin.hadoop.structure.io.HadoopPools;
import org.apache.tinkerpop.gremlin.spark.structure.Spark;
import org.apache.tinkerpop.gremlin.spark.structure.io.gryo.GryoSerializer;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@@ -46,15 -40,7 +43,9 @@@ public abstract class AbstractSparkTes
@After
@Before
public void setupTest() {
- SparkConf sparkConfiguration = new SparkConf();
- sparkConfiguration.setAppName(this.getClass().getCanonicalName() + "-setupTest");
- sparkConfiguration.set(SparkLauncher.SPARK_MASTER, "local[4]");
- JavaSparkContext sparkContext = new JavaSparkContext(SparkContext.getOrCreate(sparkConfiguration));
- sparkContext.close();
- Spark.create(sparkContext.sc());
Spark.close();
+ HadoopPools.close();
+ KryoShimServiceLoader.close();
logger.info("SparkContext has been closed for " + this.getClass().getCanonicalName() + "-setupTest");
}