Repository: incubator-tinkerpop Updated Branches: refs/heads/master 2c7b1f92b -> 3aa0e374c
renamed the global System property from tinkerpop.kryo.shim to gremlin.io.kryoShimService to be consistent with our property naming convention -- cc @dalaro. CTR. Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/3aa0e374 Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/3aa0e374 Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/3aa0e374 Branch: refs/heads/master Commit: 3aa0e374c1a69ace2001743745fdfb47364d10e1 Parents: 2c7b1f9 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Tue Jun 7 07:17:50 2016 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Tue Jun 7 07:17:50 2016 -0600 ---------------------------------------------------------------------- .../structure/io/gryo/kryoshim/KryoShimService.java | 2 +- .../io/gryo/kryoshim/KryoShimServiceLoader.java | 14 +++++++------- .../tinkerpop/gremlin/hadoop/HadoopGraphProvider.java | 5 ++--- .../tinkerpop/gremlin/spark/AbstractSparkTest.java | 3 --- .../SparkHadoopGraphGryoRegistratorProvider.java | 6 +++--- .../process/computer/SparkHadoopGraphProvider.java | 7 ------- 6 files changed, 13 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3aa0e374/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/KryoShimService.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/KryoShimService.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/KryoShimService.java index ee0c8b3..b8880a4 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/KryoShimService.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/KryoShimService.java @@ -64,7 +64,7 @@ public interface KryoShimService { /** * Returns this service's relative priority number. Unless explicitly overridden through a - * system property ({@link KryoShimServiceLoader#SHIM_CLASS_SYSTEM_PROPERTY}), + * system property ({@link KryoShimServiceLoader#KRYO_SHIM_SERVICE}), * the service implementation with the numerically highest priority will be used * and all others ignored. In other words, the highest priority wins (in the absence of a * system property override). http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3aa0e374/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/KryoShimServiceLoader.java ---------------------------------------------------------------------- diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/KryoShimServiceLoader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/KryoShimServiceLoader.java index d16b1a5..4227edc 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/KryoShimServiceLoader.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/kryoshim/KryoShimServiceLoader.java @@ -47,7 +47,7 @@ public class KryoShimServiceLoader { * package-and-classname to force it into service. Setting this property causes the * priority-selection mechanism ({@link KryoShimService#getPriority()}) to be ignored. */ - public static final String SHIM_CLASS_SYSTEM_PROPERTY = "tinkerpop.kryo.shim"; + public static final String KRYO_SHIM_SERVICE = "gremlin.io.kryoShimService"; public static void applyConfiguration(final Configuration conf) { KryoShimServiceLoader.conf = conf; @@ -86,14 +86,14 @@ public class KryoShimServiceLoader { } } - String shimClass = System.getProperty(SHIM_CLASS_SYSTEM_PROPERTY); + String shimClass = System.getProperty(KRYO_SHIM_SERVICE); if (null != shimClass) { for (KryoShimService kss : services) { if (kss.getClass().getCanonicalName().equals(shimClass)) { log.info("Set {} provider to {} ({}) from system property {}={}", KryoShimService.class.getSimpleName(), kss, kss.getClass(), - SHIM_CLASS_SYSTEM_PROPERTY, shimClass); + KRYO_SHIM_SERVICE, shimClass); result = kss; } } @@ -160,19 +160,19 @@ public class KryoShimServiceLoader { * where the {@code input} parameter is {@code source}. Returns the deserialized object. * * @param source an input stream containing data for a serialized object class and instance - * @param <T> the type to which the deserialized object is cast as it is returned + * @param <T> the type to which the deserialized object is cast as it is returned * @return the deserialized object */ public static <T> T readClassAndObject(final InputStream source) { final KryoShimService shimService = load(); - return (T)shimService.readClassAndObject(source); + return (T) shimService.readClassAndObject(source); } /** * Selects the service with greatest {@link KryoShimService#getPriority()} * (not absolute value). - * + * <p> * Breaks ties with lexicographical comparison of classnames where the * name that sorts last is considered to have highest priority. Ideally * nothing should rely on that tiebreaking behavior, but it beats random @@ -205,7 +205,7 @@ public class KryoShimServiceLoader { log.warn("{} implementations {} and {} are tied with priority value {}. " + "Preferring {} to the other because it has a lexicographically greater classname. " + "Consider setting the system property \"{}\" instead of relying on priority tie-breaking.", - KryoShimService.class.getSimpleName(), a, b, ap, winner, SHIM_CLASS_SYSTEM_PROPERTY); + KryoShimService.class.getSimpleName(), a, b, ap, winner, KRYO_SHIM_SERVICE); } return result; http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3aa0e374/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java ---------------------------------------------------------------------- diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java index e36c08d..9c6a352 100644 --- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java +++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/HadoopGraphProvider.java @@ -28,7 +28,6 @@ import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph; import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopProperty; import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopVertex; import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopVertexProperty; -import org.apache.tinkerpop.gremlin.hadoop.structure.io.HadoopPoolShimService; import org.apache.tinkerpop.gremlin.hadoop.structure.io.graphson.GraphSONInputFormat; import org.apache.tinkerpop.gremlin.hadoop.structure.io.gryo.GryoInputFormat; import org.apache.tinkerpop.gremlin.hadoop.structure.io.gryo.GryoOutputFormat; @@ -46,7 +45,7 @@ import java.util.Map; import java.util.Random; import java.util.Set; -import static org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShimServiceLoader.SHIM_CLASS_SYSTEM_PROPERTY; +import static org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShimServiceLoader.KRYO_SHIM_SERVICE; /** * @author Marko A. Rodriguez (http://markorodriguez.com) @@ -112,7 +111,7 @@ public class HadoopGraphProvider extends AbstractGraphProvider { @Override public Map<String, Object> getBaseConfiguration(final String graphName, final Class<?> test, final String testMethodName, final LoadGraphWith.GraphData loadGraphWith) { - System.clearProperty(SHIM_CLASS_SYSTEM_PROPERTY); + System.clearProperty(KRYO_SHIM_SERVICE); this.graphSONInput = RANDOM.nextBoolean(); return new HashMap<String, Object>() {{ put(Graph.GRAPH, HadoopGraph.class.getName()); http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3aa0e374/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 473976b..6d2231f 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 @@ -26,7 +26,6 @@ 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.hadoop.structure.io.HadoopPoolShimService; 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; @@ -35,8 +34,6 @@ import org.junit.Before; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShimServiceLoader.SHIM_CLASS_SYSTEM_PROPERTY; - /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3aa0e374/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 c1832cc..fcebbd0 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 @@ -29,7 +29,7 @@ import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShimServiceLo import java.util.Map; -import static org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShimServiceLoader.SHIM_CLASS_SYSTEM_PROPERTY; +import static org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShimServiceLoader.KRYO_SHIM_SERVICE; /** * @author Marko A. Rodriguez (http://markorodriguez.com) @@ -44,9 +44,9 @@ public final class SparkHadoopGraphGryoRegistratorProvider extends SparkHadoopGr config.put(Constants.GREMLIN_SPARK_PERSIST_CONTEXT, false); config.put("spark.serializer", KryoSerializer.class.getCanonicalName()); config.put("spark.kryo.registrator", GryoRegistrator.class.getCanonicalName()); - System.setProperty(SHIM_CLASS_SYSTEM_PROPERTY, UnshadedKryoShimService.class.getCanonicalName()); + System.setProperty(KRYO_SHIM_SERVICE, UnshadedKryoShimService.class.getCanonicalName()); KryoShimServiceLoader.load(true); - System.clearProperty(SHIM_CLASS_SYSTEM_PROPERTY); + System.clearProperty(KRYO_SHIM_SERVICE); return config; } } http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/3aa0e374/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 06119fc..d4201b5 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 @@ -18,7 +18,6 @@ */ package org.apache.tinkerpop.gremlin.spark.process.computer; -import org.apache.spark.serializer.KryoSerializer; import org.apache.tinkerpop.gremlin.GraphProvider; import org.apache.tinkerpop.gremlin.LoadGraphWith; import org.apache.tinkerpop.gremlin.groovy.util.SugarTestHelper; @@ -26,7 +25,6 @@ import org.apache.tinkerpop.gremlin.hadoop.Constants; import org.apache.tinkerpop.gremlin.hadoop.HadoopGraphProvider; import org.apache.tinkerpop.gremlin.hadoop.groovy.plugin.HadoopGremlinPluginCheck; import org.apache.tinkerpop.gremlin.hadoop.structure.io.FileSystemStorageCheck; -import org.apache.tinkerpop.gremlin.hadoop.structure.io.HadoopPoolShimService; import org.apache.tinkerpop.gremlin.process.computer.Computer; import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; @@ -41,16 +39,11 @@ import org.apache.tinkerpop.gremlin.spark.structure.Spark; import org.apache.tinkerpop.gremlin.spark.structure.io.PersistedOutputRDD; import org.apache.tinkerpop.gremlin.spark.structure.io.SparkContextStorageCheck; import org.apache.tinkerpop.gremlin.spark.structure.io.ToyGraphInputRDD; -import org.apache.tinkerpop.gremlin.spark.structure.io.gryo.GryoRegistrator; import org.apache.tinkerpop.gremlin.spark.structure.io.gryo.GryoSerializer; -import org.apache.tinkerpop.gremlin.spark.structure.io.gryo.kryoshim.unshaded.UnshadedKryoShimService; import org.apache.tinkerpop.gremlin.structure.Graph; -import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShimServiceLoader; import java.util.Map; -import static org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShimServiceLoader.SHIM_CLASS_SYSTEM_PROPERTY; - /** * @author Marko A. Rodriguez (http://markorodriguez.com) */