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/08/09 16:42:36 UTC
tinkerpop git commit: went through and exposed tests that no longer
fail in the various translation providers. Added JavaDoc here and there.
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1278 b4c2686a1 -> d6f6e29bc
went through and exposed tests that no longer fail in the various translation providers. Added JavaDoc here and there.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d6f6e29b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d6f6e29b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d6f6e29b
Branch: refs/heads/TINKERPOP-1278
Commit: d6f6e29bcaea09566cd2f9cb3130b3169db997d7
Parents: b4c2686
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Aug 9 10:42:31 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Aug 9 10:42:31 2016 -0600
----------------------------------------------------------------------
.../gremlin/process/traversal/Translator.java | 4 ++++
.../gremlin/python/jsr223/PythonProvider.java | 6 +-----
.../jsr223/TinkerGraphGroovyTranslatorProvider.java | 6 +-----
.../jsr223/TinkerGraphJavaTranslatorProvider.java | 16 +---------------
.../structure/io/graphson/GraphSONTranslator.java | 5 ++---
.../TinkerGraphGraphSONTranslatorProvider.java | 10 ++--------
6 files changed, 11 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d6f6e29b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Translator.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Translator.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Translator.java
index 9b8ead8..7203db8 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Translator.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/Translator.java
@@ -20,6 +20,10 @@
package org.apache.tinkerpop.gremlin.process.traversal;
/**
+ * A Translator will translate {@link Bytecode} into another representation. That representation may be a
+ * Java instance via {@link StepTranslator} or a String script in some language via {@link ScriptTranslator}.
+ * The parameterization of Translator is S (traversal source), A (anonymous traversal), and T (full translation).
+ *
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public interface Translator<S, A, T> {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d6f6e29b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
----------------------------------------------------------------------
diff --git a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
index 1318da0..c018a52 100644
--- a/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
+++ b/gremlin-python/src/test/java/org/apache/tinkerpop/gremlin/python/jsr223/PythonProvider.java
@@ -68,12 +68,9 @@ public class PythonProvider extends AbstractGraphProvider {
"testProfileStrategyCallback",
"testProfileStrategyCallbackSideEffect",
"g_withSideEffectXa_setX_V_both_name_storeXaX_capXaX",
- "g_V_both_hasLabelXpersonX_order_byXage_decrX_name",
"g_VX1X_out_injectXv2X_name",
"shouldNeverPropagateANoBulkTraverser",
"shouldNeverPropagateANullValuedTraverser",
- "shouldTraversalResetProperly",
- "shouldHidePartitionKeyForValues",
//
"g_VXlistXv1_v2_v3XX_name",
"g_V_hasLabelXpersonX_asXpX_VXsoftwareX_addInEXuses_pX",
@@ -86,7 +83,6 @@ public class PythonProvider extends AbstractGraphProvider {
TraversalInterruptionTest.class.getCanonicalName(),
TraversalInterruptionComputerTest.class.getCanonicalName(),
EventStrategyProcessTest.class.getCanonicalName(),
- CoreTraversalTest.class.getCanonicalName(),
PartitionStrategyProcessTest.class.getCanonicalName(),
ElementIdStrategyProcessTest.class.getCanonicalName()));
@@ -163,7 +159,7 @@ public class PythonProvider extends AbstractGraphProvider {
throw new IllegalStateException(e.getMessage(), e);
}
final GraphTraversalSource g = graph.traversal();
- return g.withStrategies(new TranslationStrategy(g, new PythonGraphSONJavaTranslator<>(new PythonTranslator("g", "__", IMPORT_STATICS), new JavaTranslator<>(graph.traversal(), __.class))));
+ return g.withStrategies(new TranslationStrategy(g, new PythonGraphSONJavaTranslator<>(new PythonTranslator("g", "__", IMPORT_STATICS), new JavaTranslator<>(g, __.class))));
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d6f6e29b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
index 9f1cf52..5292e7e 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/groovy/jsr223/TinkerGraphGroovyTranslatorProvider.java
@@ -25,8 +25,8 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionCompu
import org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionTest;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProgramTest;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategyProcessTest;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphProvider;
@@ -44,13 +44,9 @@ public class TinkerGraphGroovyTranslatorProvider extends TinkerGraphProvider {
"testProfileStrategyCallback",
"testProfileStrategyCallbackSideEffect",
"g_withSideEffectXa_setX_V_both_name_storeXaX_capXaX",
- "g_V_both_hasLabelXpersonX_order_byXage_decrX_name",
"g_VX1X_out_injectXv2X_name",
- "shouldSupportGraphFilter",
"shouldNeverPropagateANoBulkTraverser",
"shouldNeverPropagateANullValuedTraverser",
- "shouldTraversalResetProperly",
- "shouldHidePartitionKeyForValues",
ProgramTest.Traversals.class.getCanonicalName(),
TraversalInterruptionTest.class.getCanonicalName(),
TraversalInterruptionComputerTest.class.getCanonicalName(),
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d6f6e29b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
index 7bdcaf5..70dc2f8 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/process/jsr223/TinkerGraphJavaTranslatorProvider.java
@@ -21,13 +21,10 @@ package org.apache.tinkerpop.gremlin.tinkergraph.process.jsr223;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionComputerTest;
-import org.apache.tinkerpop.gremlin.process.traversal.TraversalInterruptionTest;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.__;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProgramTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategyProcessTest;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphProvider;
@@ -44,18 +41,7 @@ public class TinkerGraphJavaTranslatorProvider extends TinkerGraphProvider {
private static Set<String> SKIP_TESTS = new HashSet<>(Arrays.asList(
"testProfileStrategyCallback",
"testProfileStrategyCallbackSideEffect",
- "g_withSideEffectXa_setX_V_both_name_storeXaX_capXaX",
- "g_V_both_hasLabelXpersonX_order_byXage_decrX_name",
- "g_VX1X_out_injectXv2X_name",
- "shouldSupportGraphFilter",
- "shouldNeverPropagateANoBulkTraverser",
- "shouldNeverPropagateANullValuedTraverser",
- "shouldTraversalResetProperly",
- "shouldHidePartitionKeyForValues",
- ProgramTest.Traversals.class.getCanonicalName(),
- TraversalInterruptionTest.class.getCanonicalName(),
- TraversalInterruptionComputerTest.class.getCanonicalName(),
- ElementIdStrategyProcessTest.class.getCanonicalName()));
+ ProgramTest.Traversals.class.getCanonicalName()));
@Override
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d6f6e29b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/GraphSONTranslator.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/GraphSONTranslator.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/GraphSONTranslator.java
index 51d6395..422abba 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/GraphSONTranslator.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/GraphSONTranslator.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin.tinkergraph.structure.io.graphson;
+import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
import org.apache.tinkerpop.gremlin.process.traversal.Bytecode;
import org.apache.tinkerpop.gremlin.process.traversal.Translator;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
@@ -26,13 +27,11 @@ import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.verification.VerificationException;
import org.apache.tinkerpop.gremlin.process.traversal.util.BytecodeHelper;
import org.apache.tinkerpop.gremlin.process.traversal.util.EmptyTraversal;
-import org.apache.tinkerpop.gremlin.jsr223.JavaTranslator;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONReader;
import org.apache.tinkerpop.gremlin.structure.io.graphson.GraphSONWriter;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
-import java.util.Arrays;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -68,7 +67,7 @@ final class GraphSONTranslator<S extends TraversalSource, T extends Traversal.Ad
}
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
this.writer.writeObject(outputStream, BytecodeHelper.filterInstructions(bytecode,
- instruction -> !Arrays.asList("withTranslator", "withStrategies").contains(instruction.getOperator())));
+ instruction -> !instruction.getOperator().equals(TraversalSource.Symbols.withStrategies)));
// System.out.println(new String(outputStream.toByteArray()));
return this.wrappedTranslator.translate(this.reader.readObject(new ByteArrayInputStream(outputStream.toByteArray()), Bytecode.class));
} catch (final Exception e) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d6f6e29b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONTranslatorProvider.java
----------------------------------------------------------------------
diff --git a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONTranslatorProvider.java b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONTranslatorProvider.java
index 3248efd..4b19804 100644
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONTranslatorProvider.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/io/graphson/TinkerGraphGraphSONTranslatorProvider.java
@@ -28,10 +28,10 @@ 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.map.PageRankTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.map.ProgramTest;
-import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.ElementIdStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest;
import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategyProcessTest;
+import org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.TranslationStrategy;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.tinkergraph.TinkerGraphProvider;
@@ -48,14 +48,8 @@ public class TinkerGraphGraphSONTranslatorProvider extends TinkerGraphProvider {
private static Set<String> SKIP_TESTS = new HashSet<>(Arrays.asList(
"testProfileStrategyCallback",
"testProfileStrategyCallbackSideEffect",
- "g_withSideEffectXa_setX_V_both_name_storeXaX_capXaX",
- "g_V_both_hasLabelXpersonX_order_byXage_decrX_name",
- "g_VX1X_out_injectXv2X_name",
- "shouldNeverPropagateANoBulkTraverser",
- "shouldNeverPropagateANullValuedTraverser",
- "shouldTraversalResetProperly",
- "shouldHidePartitionKeyForValues",
//
+ "g_VX1X_out_injectXv2X_name",
"g_VXlistXv1_v2_v3XX_name",
"g_V_hasLabelXpersonX_asXpX_VXsoftwareX_addInEXuses_pX",
"g_VXv1X_hasXage_gt_30X",