Repository: tinkerpop Updated Branches: refs/heads/TINKERPOP-1171 c795b098d -> 11fd0d29d
removed extra TraversalSource.Builder methods in Spark and TinkerGraph. Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/11fd0d29 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/11fd0d29 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/11fd0d29 Branch: refs/heads/TINKERPOP-1171 Commit: 11fd0d29d7ae6e1380d00301d51ad45b8e221d3c Parents: c795b09 Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Fri Jun 30 15:27:08 2017 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Fri Jun 30 15:27:08 2017 -0600 ---------------------------------------------------------------------- .../process/computer/SparkHadoopGraphProvider.java | 10 ++-------- .../process/TinkerGraphComputerProvider.java | 15 ++++++--------- 2 files changed, 8 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd0d29/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 bed2ace..14cfcc5 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 @@ -29,7 +29,6 @@ import org.apache.tinkerpop.gremlin.hadoop.structure.io.HadoopPools; 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; -import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine; import org.apache.tinkerpop.gremlin.process.traversal.step.map.PageRankTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.PeerPressureTest; import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProgramTest; @@ -38,7 +37,6 @@ 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.util.SugarTestHelper; import org.apache.tinkerpop.gremlin.structure.Graph; import org.apache.tinkerpop.gremlin.structure.io.gryo.kryoshim.KryoShimServiceLoader; @@ -92,12 +90,8 @@ public class SparkHadoopGraphProvider extends HadoopGraphProvider { @Override public GraphTraversalSource traversal(final Graph graph) { return RANDOM.nextBoolean() ? - RANDOM.nextBoolean() ? - graph.traversal(GraphTraversalSource.build().engine(ComputerTraversalEngine.build().computer(SparkGraphComputer.class).workers(RANDOM.nextInt(3) + 1))) : - graph.traversal().withComputer(Computer.compute(SparkGraphComputer.class).workers(RANDOM.nextInt(3) + 1)) : - RANDOM.nextBoolean() ? - graph.traversal(GraphTraversalSource.computer(SparkGraphComputer.class)) : - graph.traversal().withComputer(); + graph.traversal().withComputer(Computer.compute(SparkGraphComputer.class).workers(RANDOM.nextInt(3) + 1)) : + graph.traversal().withComputer(); } @Override http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11fd0d29/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java ---------------------------------------------------------------------- diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java index 8902b1f..d1a7898 100644 --- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java +++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/TinkerGraphComputerProvider.java @@ -20,7 +20,6 @@ package org.apache.tinkerpop.gremlin.tinkergraph.process; import org.apache.commons.configuration.MapConfiguration; import org.apache.tinkerpop.gremlin.GraphProvider; -import org.apache.tinkerpop.gremlin.process.computer.Computer; import org.apache.tinkerpop.gremlin.process.computer.GraphComputer; import org.apache.tinkerpop.gremlin.process.computer.traversal.strategy.decoration.VertexProgramStrategy; import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource; @@ -41,13 +40,11 @@ public class TinkerGraphComputerProvider extends TinkerGraphProvider { @Override public GraphTraversalSource traversal(final Graph graph) { - return RANDOM.nextBoolean() ? - graph.traversal().withStrategies(VertexProgramStrategy.create(new MapConfiguration(new HashMap<String, Object>() {{ - put(VertexProgramStrategy.WORKERS, RANDOM.nextInt(Runtime.getRuntime().availableProcessors()) + 1); - put(VertexProgramStrategy.GRAPH_COMPUTER, RANDOM.nextBoolean() ? - GraphComputer.class.getCanonicalName() : - TinkerGraphComputer.class.getCanonicalName()); - }}))) : - graph.traversal(GraphTraversalSource.computer()); + return graph.traversal().withStrategies(VertexProgramStrategy.create(new MapConfiguration(new HashMap<String, Object>() {{ + put(VertexProgramStrategy.WORKERS, RANDOM.nextInt(Runtime.getRuntime().availableProcessors()) + 1); + put(VertexProgramStrategy.GRAPH_COMPUTER, RANDOM.nextBoolean() ? + GraphComputer.class.getCanonicalName() : + TinkerGraphComputer.class.getCanonicalName()); + }}))); } }