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 2016/06/13 22:52:30 UTC
tinkerpop git commit: some tests now work and some don't. Have
VariantGraphProvider working nicely with full test suite passing. The choice
now is -- CreationStrategy, ScriptGraphTraversal,
or Traversal.setTranslator() models.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 f6e9b63bc -> 2d1b087a1
some tests now work and some don't. Have VariantGraphProvider working nicely with full test suite passing. The choice now is -- CreationStrategy, ScriptGraphTraversal, or Traversal.setTranslator() models.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2d1b087a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2d1b087a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2d1b087a
Branch: refs/heads/TINKERPOP-1278
Commit: 2d1b087a1a707aa6e9f08d24ed589833a1c8c61b
Parents: f6e9b63
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Mon Jun 13 16:52:25 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Mon Jun 13 16:52:25 2016 -0600
----------------------------------------------------------------------
.../process/traversal/dsl/graph/GraphTraversalSource.java | 2 +-
.../tinkerpop/gremlin/process/traversal/dsl/graph/__.java | 2 +-
.../traversal/dsl/graph/script/ScriptGraphTraversal.java | 2 +-
.../dsl/graph/script/ScriptGraphTraversalSource.java | 2 +-
.../traversal/strategy/creation/TranslationStrategy.java | 7 +------
.../src/main/jython/gremlin_python/gremlin_python.py | 2 --
.../org/apache/tinkerpop/gremlin/VariantGraphProvider.java | 6 +++---
7 files changed, 8 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d1b087a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
index 58e97e2..0628aa9 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/GraphTraversalSource.java
@@ -28,7 +28,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEn
import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.AddVertexStartStep;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.GraphStep;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.creation.TranslationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.RequirementsStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.traverser.TraverserRequirement;
import org.apache.tinkerpop.gremlin.process.traversal.util.Translator;
@@ -58,6 +57,7 @@ public class GraphTraversalSource implements TraversalSource {
protected TraversalStrategies strategies;
public GraphTraversalSource(final Graph graph, final TraversalStrategies traversalStrategies) {
+ __.setAnonymousTraversalSupplier(null);
this.graph = graph;
this.strategies = traversalStrategies;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d1b087a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
index b3c6241..abc3ecb 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/__.java
@@ -58,7 +58,7 @@ public class __ {
//////////////////////////////////////////////////////////////////////
- public static void setAnonymousGraphTraversalSupplier(final Supplier<GraphTraversal> anonymousGraphTraversalSupplier) {
+ public static void setAnonymousTraversalSupplier(final Supplier<GraphTraversal> anonymousGraphTraversalSupplier) {
if (null == ANONYMOUS_GRAPH_TRAVERSAL) {
if (null == anonymousGraphTraversalSupplier)
return;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d1b087a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/script/ScriptGraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/script/ScriptGraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/script/ScriptGraphTraversal.java
index 3b890e5..645bf98 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/script/ScriptGraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/script/ScriptGraphTraversal.java
@@ -81,7 +81,7 @@ public class ScriptGraphTraversal<S, E> extends DefaultGraphTraversal<S, E> {
}
try {
final String traversalScriptString = this.getTraversalScript();
- __.setAnonymousGraphTraversalSupplier(null);
+ __.setAnonymousTraversalSupplier(null);
ScriptEngine engine = ScriptEngineCache.get(this.translator.getScriptEngine());
final Bindings bindings = new SimpleBindings();
bindings.put(this.translator.getAlias(), new GraphTraversalSource(this.getGraph().get(), this.getStrategies()));
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d1b087a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/script/ScriptGraphTraversalSource.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/script/ScriptGraphTraversalSource.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/script/ScriptGraphTraversalSource.java
index 16b3eed..5abe3cb 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/script/ScriptGraphTraversalSource.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/graph/script/ScriptGraphTraversalSource.java
@@ -218,7 +218,7 @@ public class ScriptGraphTraversalSource extends GraphTraversalSource {
}
private GraphTraversal generateTraversal(final String stepName, final Object... arguments) {
- __.setAnonymousGraphTraversalSupplier(this.translator::__);
+ __.setAnonymousTraversalSupplier(this.translator::__);
final Translator clone = this.translator.clone();
clone.addStep(stepName, arguments);
final GraphTraversal traversal = new ScriptGraphTraversal(this.graph, clone);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d1b087a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/creation/TranslationStrategy.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/creation/TranslationStrategy.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/creation/TranslationStrategy.java
index ad1fcf3..9b1811a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/creation/TranslationStrategy.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/strategy/creation/TranslationStrategy.java
@@ -29,8 +29,6 @@ import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSo
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.util.EmptyStep;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.AbstractTraversalStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SackStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.SideEffectStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.util.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyGraph;
@@ -50,7 +48,7 @@ public class TranslationStrategy extends AbstractTraversalStrategy<TraversalStra
public TranslationStrategy(final Translator<?> translator) {
this.translator = translator;
if (!this.translator.getAlias().equals("__"))
- __.setAnonymousGraphTraversalSupplier(() -> (GraphTraversal) translator.__());
+ __.setAnonymousTraversalSupplier(() -> (GraphTraversal) translator.__());
}
@Override
@@ -59,9 +57,6 @@ public class TranslationStrategy extends AbstractTraversalStrategy<TraversalStra
return;
try {
final String traversalScriptString = this.translator.getTraversalScript();
- // System.out.println(traversal.getStrategies().toList() + "!!!");
- // System.out.println(traversalScriptString + "!!!");
- __.setAnonymousGraphTraversalSupplier(null);
ScriptEngine engine = ScriptEngineCache.get(this.translator.getScriptEngine());
TraversalStrategies strategies = traversal.getStrategies().clone().removeStrategies(TranslationStrategy.class);
final Bindings bindings = new SimpleBindings();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d1b087a/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
----------------------------------------------------------------------
diff --git a/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py b/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
index a122a70..bd993c6 100644
--- a/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
+++ b/gremlin-variant/src/main/jython/gremlin_python/gremlin_python.py
@@ -83,8 +83,6 @@ class PythonGraphTraversalSource(object):
return PythonGraphTraversal(self.traversal_source_string + ".V(" + Helper.stringify(*args) + ")", self.remote_connection)
def addV(self, *args):
return PythonGraphTraversal(self.traversal_source_string + ".addV(" + Helper.stringify(*args) + ")", self.remote_connection)
- def clone(self, *args):
- return PythonGraphTraversalSource(self.traversal_source_string + ".clone(" + Helper.stringify(*args) + ")", self.remote_connection)
def inject(self, *args):
return PythonGraphTraversal(self.traversal_source_string + ".inject(" + Helper.stringify(*args) + ")", self.remote_connection)
def withBulk(self, *args):
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2d1b087a/gremlin-variant/src/test/java/org/apache/tinkerpop/gremlin/VariantGraphProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-variant/src/test/java/org/apache/tinkerpop/gremlin/VariantGraphProvider.java b/gremlin-variant/src/test/java/org/apache/tinkerpop/gremlin/VariantGraphProvider.java
index 1774d1a..7f05aea 100644
--- a/gremlin-variant/src/test/java/org/apache/tinkerpop/gremlin/VariantGraphProvider.java
+++ b/gremlin-variant/src/test/java/org/apache/tinkerpop/gremlin/VariantGraphProvider.java
@@ -22,6 +22,7 @@ package org.apache.tinkerpop.gremlin;
import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.AbstractGraphProvider;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
+import org.apache.tinkerpop.gremlin.process.computer.GraphComputerTest;
import org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionComputerTest;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionTest;
@@ -57,10 +58,9 @@ public abstract class VariantGraphProvider extends AbstractGraphProvider {
private static Set<String> SKIP_TESTS = new HashSet<>(Arrays.asList(
"testProfileStrategyCallback",
"testProfileStrategyCallbackSideEffect",
- "g_withSideEffectXa_g_VX2XX_VX1X_out_whereXneqXaXX",
- "g_withSackXBigInteger_TEN_powX1000X_assignX_V_localXoutXknowsX_barrierXnormSackXX_inXknowsX_barrier_sack",
"g_withSideEffectXa_setX_V_both_name_storeXaX_capXaX",
- "shouldSupportJobChaining",
+ "g_V_both_hasLabelXpersonX_order_byXage_decrX_name",
+ "shouldSupportGraphFilter",
InjectTest.Traversals.class.getCanonicalName(),
ProgramTest.Traversals.class.getCanonicalName(),
CoreTraversalTest.class.getCanonicalName(),