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/02/17 17:06:19 UTC
incubator-tinkerpop git commit: toString() for TraversalEngine. Fixed
up docs with new model.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 6c3375163 -> 2ba09b48b
toString() for TraversalEngine. Fixed up docs with new model.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2ba09b48
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2ba09b48
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2ba09b48
Branch: refs/heads/master
Commit: 2ba09b48bcc8c0eb6cb56cdbd2f462adbf7e0446
Parents: 6c33751
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Feb 17 09:06:21 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Feb 17 09:06:21 2015 -0700
----------------------------------------------------------------------
docs/src/the-graphcomputer.asciidoc | 4 ++--
.../process/traversal/engine/ComputerTraversalEngine.java | 6 ++++++
.../process/traversal/engine/StandardTraversalEngine.java | 6 ++++++
.../apache/tinkerpop/gremlin/structure/util/StringFactory.java | 5 +++++
4 files changed, 19 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2ba09b48/docs/src/the-graphcomputer.asciidoc
----------------------------------------------------------------------
diff --git a/docs/src/the-graphcomputer.asciidoc b/docs/src/the-graphcomputer.asciidoc
index abecfe9..9dcd70c 100644
--- a/docs/src/the-graphcomputer.asciidoc
+++ b/docs/src/the-graphcomputer.asciidoc
@@ -306,7 +306,7 @@ NOTE: This model of graph traversal in a BSP system was first implemented by the
----
g = TinkerFactory.createModern()
g.V().both().hasLabel('person').values('age').groupCount().next() // OLTP
-g.engine(ComputerTraversalEngine.instance())
+g.engine(computer)
g.V().both().hasLabel('person').values('age').groupCount().next() // OLAP
----
@@ -327,7 +327,7 @@ The same OLAP traversal can be executed using the standard `g.compute()` model,
[gremlin-groovy,modern]
----
-//g.engine(ComputerTraversalEngine.instance())
+//g.engine(computer)
//result = g.compute().program(TraversalVertexProgram.build().traversal(g.V().both().hasLabel('person').values('age').groupCount('a')).create()).submit().get()
//result.memory().a
//result.memory().iteration
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2ba09b48/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 5ed89f1..eb76f20 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
@@ -23,6 +23,7 @@ import org.apache.tinkerpop.gremlin.process.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.computer.traversal.step.map.ComputerResultStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.EmptyStep;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
/**
@@ -53,4 +54,9 @@ public final class ComputerTraversalEngine implements TraversalEngine {
public ComputerTraversalEngine create(final Graph graph) {
return new ComputerTraversalEngine(graph);
}
+
+ @Override
+ public String toString() {
+ return StringFactory.traversalEngineString(this);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2ba09b48/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 0f9d968..9727f96 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
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.engine;
import org.apache.tinkerpop.gremlin.process.Traversal;
import org.apache.tinkerpop.gremlin.process.TraversalEngine;
import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.util.StringFactory;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -47,4 +48,9 @@ public final class StandardTraversalEngine implements TraversalEngine {
public StandardTraversalEngine create(final Graph graph) {
return standard;
}
+
+ @Override
+ public String toString() {
+ return StringFactory.traversalEngineString(this);
+ }
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/2ba09b48/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 3c15eb8..ac9993c 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.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.TraversalSideEffects;
import org.apache.tinkerpop.gremlin.process.TraversalStrategies;
import org.apache.tinkerpop.gremlin.process.TraversalStrategy;
@@ -157,6 +158,10 @@ public final class StringFactory {
return graphComputer.getClass().getSimpleName().toLowerCase();
}
+ public static String traversalEngineString(final TraversalEngine traversalEngine) {
+ return traversalEngine.getClass().getSimpleName().toLowerCase();
+ }
+
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);