You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/03/11 16:11:08 UTC
incubator-tinkerpop git commit: added easy public static final
helpers for GraphTraversalContet -- standard, computer.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/newapi d0bba77d4 -> 66e66c17a
added easy public static final helpers for GraphTraversalContet -- standard, computer.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/66e66c17
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/66e66c17
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/66e66c17
Branch: refs/heads/newapi
Commit: 66e66c17aca4c548a77b4c95563d414f2405c6cc
Parents: d0bba77
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Wed Mar 11 09:11:06 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Wed Mar 11 09:11:06 2015 -0600
----------------------------------------------------------------------
.../gremlin/process/TraversalContext.java | 2 +-
.../gremlin/process/TraversalEngine.java | 2 ++
.../graph/traversal/GraphTraversalContext.java | 29 ++++++++++++++------
.../engine/ComputerTraversalEngine.java | 6 ++--
.../engine/StandardTraversalEngine.java | 2 +-
.../tinkerpop/gremlin/structure/Graph.java | 2 +-
.../gremlin/structure/util/StringFactory.java | 8 ++++++
.../AbstractImportCustomizerProvider.java | 5 ++--
.../apache/tinkerpop/gremlin/GraphProvider.java | 3 +-
.../groovy/plugin/HadoopRemoteAcceptor.java | 2 +-
.../giraph/HadoopGiraphGraphProvider.java | 12 +-------
.../spark/HadoopSparkGraphProvider.java | 11 +-------
.../process/TinkerGraphComputerProvider.java | 2 +-
.../tinkergraph/structure/TinkerGraphTest.java | 2 +-
14 files changed, 45 insertions(+), 43 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66e66c17/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalContext.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalContext.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalContext.java
index a4adb9f..d5855e3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalContext.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalContext.java
@@ -35,7 +35,7 @@ public interface TraversalContext {
public Optional<Graph> getGraph();
- /////////////
+ ////////////////
public interface Builder<C extends TraversalContext> extends Serializable {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66e66c17/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalEngine.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalEngine.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalEngine.java
index 129e773..d93c08d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalEngine.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalEngine.java
@@ -19,6 +19,8 @@
package org.apache.tinkerpop.gremlin.process;
import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
import org.apache.tinkerpop.gremlin.structure.Graph;
import java.io.Serializable;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66e66c17/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversalContext.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversalContext.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversalContext.java
index ead8ee3..bb62078 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversalContext.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversalContext.java
@@ -24,11 +24,13 @@ import org.apache.tinkerpop.gremlin.process.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.TraversalStrategy;
import org.apache.tinkerpop.gremlin.process.computer.GraphComputer;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GraphStep;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Transaction;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import java.util.ArrayList;
import java.util.List;
@@ -39,6 +41,15 @@ import java.util.Optional;
*/
public class GraphTraversalContext implements TraversalContext {
+ public static final Builder standard = GraphTraversalContext.build().engine(StandardTraversalEngine.build());
+ public static final Builder computer = GraphTraversalContext.build().engine(ComputerTraversalEngine.build());
+
+ public static Builder computer(final Class<? extends GraphComputer> graphComputerClass) {
+ return GraphTraversalContext.build().engine(ComputerTraversalEngine.build().computer(graphComputerClass));
+ }
+
+ ////
+
private final transient Graph graph;
private final TraversalEngine.Builder engine;
private final TraversalStrategies strategies;
@@ -67,10 +78,11 @@ public class GraphTraversalContext implements TraversalContext {
return this.graph.tx();
}
- public static Builder of() {
+ public static Builder build() {
return new Builder();
}
+
@Override
public Optional<GraphComputer> getGraphComputer() {
return this.engine.create(this.graph).getGraphComputer();
@@ -83,14 +95,19 @@ public class GraphTraversalContext implements TraversalContext {
@Override
public GraphTraversalContext.Builder asBuilder() {
- return GraphTraversalContext.of().engine(this.engine); // TODO: add strategies
+ return GraphTraversalContext.build().engine(this.engine); // TODO: add strategies
+ }
+
+ @Override
+ public String toString() {
+ return StringFactory.traversalContextString(this);
}
//////
public static class Builder implements TraversalContext.Builder<GraphTraversalContext> {
- private TraversalEngine.Builder engineBuilder = StandardTraversalEngine.builder();
+ private TraversalEngine.Builder engineBuilder = StandardTraversalEngine.build();
private List<TraversalStrategy> strategies = new ArrayList<>();
public Builder engine(final TraversalEngine.Builder engineBuilder) {
@@ -106,11 +123,5 @@ public class GraphTraversalContext implements TraversalContext {
public GraphTraversalContext create(final Graph graph) {
return new GraphTraversalContext(graph, this.engineBuilder, this.strategies.toArray(new TraversalStrategy[this.strategies.size()]));
}
-
- public TraversalEngine.Builder getTraversalEngineBuilder() {
- return this.engineBuilder;
- }
-
-
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66e66c17/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/ComputerTraversalEngine.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/ComputerTraversalEngine.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/ComputerTraversalEngine.java
index b1184b5..1116311 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/ComputerTraversalEngine.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/ComputerTraversalEngine.java
@@ -65,7 +65,7 @@ public final class ComputerTraversalEngine implements TraversalEngine {
return new Builder();
}
- public static class Builder implements TraversalEngine.Builder, Serializable {
+ public static class Builder implements TraversalEngine.Builder {
private Class<? extends GraphComputer> graphComputerClass;
private GraphComputer.Isolation isolation = GraphComputer.Isolation.BSP;
@@ -81,7 +81,9 @@ public final class ComputerTraversalEngine implements TraversalEngine {
}
public ComputerTraversalEngine create(final Graph graph) {
- return new ComputerTraversalEngine(graph.compute(this.graphComputerClass).isolation(this.isolation));
+ return null == this.graphComputerClass ?
+ new ComputerTraversalEngine(graph.compute().isolation(this.isolation)) :
+ new ComputerTraversalEngine(graph.compute(this.graphComputerClass).isolation(this.isolation));
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66e66c17/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/StandardTraversalEngine.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/StandardTraversalEngine.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/StandardTraversalEngine.java
index ce79b3c..342bb60 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/StandardTraversalEngine.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/engine/StandardTraversalEngine.java
@@ -52,7 +52,7 @@ public final class StandardTraversalEngine implements TraversalEngine {
return Optional.empty();
}
- public static Builder builder() {
+ public static Builder build() {
return Builder.INSTANCE;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66e66c17/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
index ded4081..a9d7533 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
@@ -156,7 +156,7 @@ public interface Graph extends AutoCloseable {
}
public default GraphTraversalContext traversal() {
- return this.traversal(GraphTraversalContext.of().engine(StandardTraversalEngine.builder()));
+ return this.traversal(GraphTraversalContext.build().engine(StandardTraversalEngine.build()));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66e66c17/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java
index e8e1f81..da76df5 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/util/StringFactory.java
@@ -18,6 +18,7 @@
*/
package org.apache.tinkerpop.gremlin.structure.util;
+import org.apache.tinkerpop.gremlin.process.TraversalContext;
import org.apache.tinkerpop.gremlin.process.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.TraversalSideEffects;
import org.apache.tinkerpop.gremlin.process.TraversalStrategies;
@@ -36,6 +37,7 @@ import org.apache.tinkerpop.gremlin.structure.strategy.GraphStrategy;
import org.apache.tinkerpop.gremlin.structure.strategy.StrategyElement;
import org.apache.tinkerpop.gremlin.structure.strategy.StrategyProperty;
import org.apache.tinkerpop.gremlin.structure.strategy.StrategyVariables;
+import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
import org.apache.tinkerpop.gremlin.util.function.FunctionUtils;
import org.javatuples.Pair;
@@ -159,6 +161,12 @@ public final class StringFactory {
return traversalEngine.getClass().getSimpleName().toLowerCase();
}
+ public static String traversalContextString(final TraversalContext traversalContext) {
+ final String graphString = traversalContext.getGraph().orElse(EmptyGraph.instance()).toString();
+ final String graphComputerString = traversalContext.getGraphComputer().isPresent() ? traversalContext.getGraphComputer().get().toString() : "standard";
+ return traversalContext.getClass().getSimpleName().toLowerCase() + L_BRACKET + graphString + COMMA_SPACE + graphComputerString + R_BRACKET;
+ }
+
public static String featureString(final Graph.Features features) {
final StringBuilder sb = new StringBuilder("FEATURES");
final Predicate<Method> supportMethods = (m) -> m.getModifiers() == Modifier.PUBLIC && m.getName().startsWith(featuresStartWith) && !m.getName().equals(featuresStartWith);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66e66c17/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
index ab983e9..2908e33 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
@@ -33,10 +33,10 @@ import org.apache.tinkerpop.gremlin.process.computer.lambda.LambdaVertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.ranking.pagerank.PageRankVertexProgram;
import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversalContext;
import org.apache.tinkerpop.gremlin.process.graph.traversal.__;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.TraversalOptionParent;
import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
-import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
import org.apache.tinkerpop.gremlin.process.util.metric.TraversalMetrics;
import org.apache.tinkerpop.gremlin.structure.Compare;
import org.apache.tinkerpop.gremlin.structure.Contains;
@@ -91,8 +91,7 @@ public abstract class AbstractImportCustomizerProvider implements ImportCustomiz
imports.add(ComputerTraversalEngine.class.getPackage().getName() + DOT_STAR);
staticImports.add(__.class.getCanonicalName() + DOT_STAR);
staticImports.add(TraversalOptionParent.Pick.class.getCanonicalName() + DOT_STAR);
- staticImports.add(StandardTraversalEngine.class.getCanonicalName() + DOT_STAR);
- staticImports.add(ComputerTraversalEngine.class.getCanonicalName() + DOT_STAR);
+ staticImports.add(GraphTraversalContext.class.getCanonicalName() + DOT_STAR);
// utils
imports.add(Gremlin.class.getPackage().getName() + DOT_STAR);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66e66c17/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
index 465ebc1..486a907 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
@@ -25,7 +25,6 @@ import org.apache.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversa
import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal;
import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversalContext;
import org.apache.tinkerpop.gremlin.process.graph.traversal.__;
-import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
import org.apache.tinkerpop.gremlin.process.traverser.B_O_PA_S_SE_SL_Traverser;
import org.apache.tinkerpop.gremlin.process.traverser.B_O_P_PA_S_SE_SL_Traverser;
@@ -77,7 +76,7 @@ public interface GraphProvider {
}};
public default GraphTraversalContext traversal(final Graph graph) {
- return GraphTraversalContext.of().engine(StandardTraversalEngine.builder()).create(graph);
+ return GraphTraversalContext.build().engine(StandardTraversalEngine.build()).create(graph);
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66e66c17/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java
index ae28e5d..c79dddc 100644
--- a/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java
+++ b/hadoop-gremlin/src/main/java/org/apache/tinkerpop/gremlin/hadoop/groovy/plugin/HadoopRemoteAcceptor.java
@@ -102,7 +102,7 @@ public class HadoopRemoteAcceptor implements RemoteAcceptor {
String script = RemoteAcceptor.getScript(String.join(SPACE, args), this.shell);
if (this.useSugarPlugin)
script = SugarLoader.class.getPackage() + ".SugarLoader.load()\n" + script;
- final TraversalVertexProgram program = TraversalVertexProgram.build().traversal(this.hadoopGraph.getClass(), GraphTraversalContext.of().engine(ComputerTraversalEngine.build()), "gremlin-groovy", script).create();
+ final TraversalVertexProgram program = TraversalVertexProgram.build().traversal(this.hadoopGraph.getClass(), GraphTraversalContext.build().engine(ComputerTraversalEngine.build()), "gremlin-groovy", script).create();
final ComputerResult computerResult = this.hadoopGraph.compute().program(program).submit().get();
this.shell.getInterp().getContext().setProperty(RESULT, computerResult);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66e66c17/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/HadoopGiraphGraphProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/HadoopGiraphGraphProvider.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/HadoopGiraphGraphProvider.java
index 28ac113..29cf6b1 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/HadoopGiraphGraphProvider.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/giraph/HadoopGiraphGraphProvider.java
@@ -18,20 +18,10 @@
*/
package org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph;
-import org.apache.giraph.conf.GiraphConstants;
-import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat;
-import org.apache.tinkerpop.gremlin.hadoop.Constants;
import org.apache.tinkerpop.gremlin.hadoop.HadoopGraphProvider;
-import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.gryo.GryoInputFormat;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.gryo.GryoOutputFormat;
import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversalContext;
import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
import org.apache.tinkerpop.gremlin.structure.Graph;
-import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComputer;
-
-import java.util.HashMap;
-import java.util.Map;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -39,6 +29,6 @@ import java.util.Map;
public final class HadoopGiraphGraphProvider extends HadoopGraphProvider {
public GraphTraversalContext traversal(final Graph graph) {
- return GraphTraversalContext.of().engine(ComputerTraversalEngine.build().computer(GiraphGraphComputer.class)).create(graph);
+ return GraphTraversalContext.build().engine(ComputerTraversalEngine.build().computer(GiraphGraphComputer.class)).create(graph);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66e66c17/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/HadoopSparkGraphProvider.java
----------------------------------------------------------------------
diff --git a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/HadoopSparkGraphProvider.java b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/HadoopSparkGraphProvider.java
index e33a9fb..985402f 100644
--- a/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/HadoopSparkGraphProvider.java
+++ b/hadoop-gremlin/src/test/java/org/apache/tinkerpop/gremlin/hadoop/process/computer/spark/HadoopSparkGraphProvider.java
@@ -18,26 +18,17 @@
*/
package org.apache.tinkerpop.gremlin.hadoop.process.computer.spark;
-import org.apache.hadoop.mapreduce.lib.output.SequenceFileOutputFormat;
-import org.apache.tinkerpop.gremlin.hadoop.Constants;
import org.apache.tinkerpop.gremlin.hadoop.HadoopGraphProvider;
-import org.apache.tinkerpop.gremlin.hadoop.process.computer.giraph.GiraphGraphComputer;
-import org.apache.tinkerpop.gremlin.hadoop.structure.HadoopGraph;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.gryo.GryoInputFormat;
-import org.apache.tinkerpop.gremlin.hadoop.structure.io.gryo.GryoOutputFormat;
import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversalContext;
import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
import org.apache.tinkerpop.gremlin.structure.Graph;
-import java.util.HashMap;
-import java.util.Map;
-
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public final class HadoopSparkGraphProvider extends HadoopGraphProvider {
public GraphTraversalContext traversal(final Graph graph) {
- return GraphTraversalContext.of().engine(ComputerTraversalEngine.build().computer(SparkGraphComputer.class)).create(graph);
+ return GraphTraversalContext.build().engine(ComputerTraversalEngine.build().computer(SparkGraphComputer.class)).create(graph);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66e66c17/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 670be7c..a990705 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
@@ -30,6 +30,6 @@ import org.apache.tinkerpop.gremlin.tinkergraph.process.computer.TinkerGraphComp
public class TinkerGraphComputerProvider extends TinkerGraphProvider {
public GraphTraversalContext traversal(final Graph graph) {
- return GraphTraversalContext.of().engine(ComputerTraversalEngine.build().computer(TinkerGraphComputer.class)).create(graph);
+ return GraphTraversalContext.build().engine(ComputerTraversalEngine.build().computer(TinkerGraphComputer.class)).create(graph);
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/66e66c17/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index 7e28640..9030381 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@ -146,7 +146,7 @@ public class TinkerGraphTest {
@Ignore
public void testPlay3() throws Exception {
Graph graph = TinkerFactory.createModern();
- GraphTraversalContext g = graph.traversal(GraphTraversalContext.of().engine(StandardTraversalEngine.builder()));
+ GraphTraversalContext g = graph.traversal(GraphTraversalContext.build().engine(StandardTraversalEngine.builder()));
g.V().out().out().values("name").forEachRemaining(System.out::println);
}