removed GraphFilter from GryoMapper. It was added as another way of solving a problem, but that solution wasn't used so removing it. Also, realized a cleaner way of doing the KryoShim tests in Spark -- minor configuration changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2c7b1f92 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2c7b1f92 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2c7b1f92 Branch: refs/heads/tp31 Commit: 2c7b1f92ba0a591ef3f25f75447b37a0edb60fd9 Parents: 4bb9f36 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Tue Jun 7 07:14:40 2016 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Tue Jun 7 07:14:40 2016 -0600 ---------------------------------------------------------------------- .../gremlin/structure/io/gryo/GryoMapper.java | 4 +--- .../gremlin/spark/AbstractSparkTest.java | 1 - .../SparkHadoopGraphGryoRegistratorProvider.java | 18 +++++++----------- .../computer/SparkHadoopGraphProvider.java | 1 - 4 files changed, 8 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2c7b1f92/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java index 577c1ce..5b4a3a8 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java @@ -330,8 +330,6 @@ public final class GryoMapper implements Mapper<Kryo> { add(GryoTypeReg.of(AtomicLong.class, 79)); add(GryoTypeReg.of(Pair.class, 88, new PairSerializer())); add(GryoTypeReg.of(TraversalExplanation.class, 106, new JavaSerializer())); - add(GryoTypeReg.of(GraphFilter.class, 120, new JavaSerializer())); // ***LAST ID*** - //add(GryoTypeReg.of(PureTraversal.class, 121, new JavaSerializer())); add(GryoTypeReg.of(Duration.class, 93, new JavaTimeSerializers.DurationSerializer())); add(GryoTypeReg.of(Instant.class, 94, new JavaTimeSerializers.InstantSerializer())); @@ -357,7 +355,7 @@ public final class GryoMapper implements Mapper<Kryo> { add(GryoTypeReg.of(GroupStepV3d0.GroupBiOperatorV3d0.class, 113)); add(GryoTypeReg.of(RangeGlobalStep.RangeBiOperator.class, 114)); add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118, new JavaSerializer())); // because they contain traversals - add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119)); + add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119)); // ***LAST ID*** }}; private final List<IoRegistry> registries = new ArrayList<>(); http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2c7b1f92/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 4d584ff..473976b 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 @@ -46,7 +46,6 @@ public abstract class AbstractSparkTest { @After @Before public void setupTest() { - System.clearProperty(SHIM_CLASS_SYSTEM_PROPERTY); SparkConf sparkConfiguration = new SparkConf(); sparkConfiguration.setAppName(this.getClass().getCanonicalName() + "-setupTest"); sparkConfiguration.set("spark.master", "local[4]"); http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2c7b1f92/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphGryoRegistratorProvider.java ---------------------------------------------------------------------- diff --git a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphGryoRegistratorProvider.java b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphGryoRegistratorProvider.java index df36a13..c1832cc 100644 --- a/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphGryoRegistratorProvider.java +++ b/spark-gremlin/src/test/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkHadoopGraphGryoRegistratorProvider.java @@ -36,21 +36,17 @@ import static org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShimSe */ public final class SparkHadoopGraphGryoRegistratorProvider extends SparkHadoopGraphProvider { - private static boolean firstTest = true; - public Map<String, Object> getBaseConfiguration(final String graphName, final Class<?> test, final String testMethodName, final LoadGraphWith.GraphData loadGraphWith) { + Spark.close(); final Map<String, Object> config = super.getBaseConfiguration(graphName, test, testMethodName, loadGraphWith); - config.put(Constants.GREMLIN_SPARK_PERSIST_CONTEXT, false); // ensure the context doesn't stay open for the GryoSerializer tests + // ensure the context doesn't stay open for the GryoSerializer tests to follow + // this is primarily to ensure that the KryoShimService loaded specifically in these tests don't leak to the other tests + config.put(Constants.GREMLIN_SPARK_PERSIST_CONTEXT, false); config.put("spark.serializer", KryoSerializer.class.getCanonicalName()); config.put("spark.kryo.registrator", GryoRegistrator.class.getCanonicalName()); - // - if (firstTest) { - firstTest = false; - Spark.close(); - System.setProperty(SHIM_CLASS_SYSTEM_PROPERTY, UnshadedKryoShimService.class.getCanonicalName()); - KryoShimServiceLoader.load(true); - } - // + System.setProperty(SHIM_CLASS_SYSTEM_PROPERTY, UnshadedKryoShimService.class.getCanonicalName()); + KryoShimServiceLoader.load(true); + System.clearProperty(SHIM_CLASS_SYSTEM_PROPERTY); return config; } } http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2c7b1f92/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 1fc29cf..06119fc 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 @@ -88,7 +88,6 @@ public class SparkHadoopGraphProvider extends HadoopGraphProvider { SugarTestHelper.clearRegistry(this); } - System.clearProperty(SHIM_CLASS_SYSTEM_PROPERTY); config.put(Constants.GREMLIN_HADOOP_DEFAULT_GRAPH_COMPUTER, SparkGraphComputer.class.getCanonicalName()); config.put("spark.master", "local[4]"); config.put("spark.serializer", GryoSerializer.class.getCanonicalName());