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 2015/03/11 19:26:51 UTC
[35/50] [abbrv] incubator-tinkerpop git commit: Modify GraphProvider
to construct a GraphTraversalContext from a Graph.
Modify GraphProvider to construct a GraphTraversalContext from a Graph.
This will enable vendors to create different types of GraphProvider instances depending on the different GraphTraversalContexts they want to test.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4dbce802
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4dbce802
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4dbce802
Branch: refs/heads/master
Commit: 4dbce802d9a7f9ab934a0e1b1503392fe8f5fcc8
Parents: c25b5a5
Author: Stephen Mallette <sp...@apache.org>
Authored: Tue Mar 10 11:28:41 2015 -0400
Committer: Stephen Mallette <sp...@apache.org>
Committed: Tue Mar 10 11:28:41 2015 -0400
----------------------------------------------------------------------
.../java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java | 2 +-
.../main/java/org/apache/tinkerpop/gremlin/GraphProvider.java | 6 ++++++
2 files changed, 7 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4dbce802/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
index da117a3..fcf61d0 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
@@ -81,7 +81,7 @@ public abstract class AbstractGremlinTest {
// not sure how the strategy can ever be null, but it seems to happen in the performance tests
graph = graphProvider.openTestGraph(config, strategiesToTest);
- g = graph.traversal();
+ g = graphProvider.traversal(graph);
final Method testMethod = this.getClass().getMethod(cleanMethodName(name.getMethodName()));
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/4dbce802/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 15e28c5..3a5982e 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
@@ -23,8 +23,10 @@ import org.apache.tinkerpop.gremlin.process.Traversal;
import org.apache.tinkerpop.gremlin.process.Traverser;
import org.apache.tinkerpop.gremlin.process.graph.traversal.DefaultGraphTraversal;
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;
import org.apache.tinkerpop.gremlin.process.traverser.B_O_Traverser;
@@ -73,6 +75,10 @@ public interface GraphProvider {
add(O_Traverser.class);
}};
+ public default GraphTraversalContext traversal(final Graph graph) {
+ return GraphTraversalContext.of().engine(StandardTraversalEngine.builder()).create(graph);
+ }
+
/**
* Creates a new {@link org.apache.tinkerpop.gremlin.structure.Graph} instance using the default
* {@link org.apache.commons.configuration.Configuration} from {@link #standardGraphConfiguration(Class, String)}.