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/19 23:30:42 UTC
incubator-tinkerpop git commit: HadoopIntegrationTests ran and found
a few tests that should be IgnoreEngine. Fixed up.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 863438f7b -> ea277fef2
HadoopIntegrationTests ran and found a few tests that should be IgnoreEngine. Fixed up.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ea277fef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ea277fef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ea277fef
Branch: refs/heads/master
Commit: ea277fef26b1d5f6e8cb752b4cd5469027cf1c99
Parents: 863438f
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Feb 19 15:30:38 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Feb 19 15:30:38 2015 -0700
----------------------------------------------------------------------
.../graph/traversal/ElementTraversal.java | 4 ---
.../process/graph/traversal/GraphTraversal.java | 4 ---
.../gremlin/process/graph/traversal/__.java | 4 ---
.../graph/traversal/step/map/GroupStep.java | 31 +++++++++++++++-----
.../step/sideEffect/GroupSideEffectStep.java | 12 ++++----
.../traversal/step/sideEffect/SubgraphStep.java | 22 +++++++-------
.../process/traversal/TraversalMatrix.java | 3 ++
.../process/traversal/util/TraversalHelper.java | 9 ++++--
.../process/TraversalPerformanceTest.java | 4 +--
.../graph/traversal/step/map/CoalesceTest.java | 2 ++
.../graph/traversal/step/map/PathTest.java | 3 ++
.../traversal/step/sideEffect/TreeTest.java | 3 ++
12 files changed, 61 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea277fef/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java
index d7f2b7d..64d1dfa 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/ElementTraversal.java
@@ -395,10 +395,6 @@ public abstract interface ElementTraversal<A extends Element> {
return this.start().subgraph(sideEffectKey);
}
- public default GraphTraversal<A, Edge> subgraph() {
- return this.start().subgraph();
- }
-
public default GraphTraversal<A, A> aggregate(final String sideEffectKey) {
return this.start().aggregate(sideEffectKey);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea277fef/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java
index 8faec59..aa113f6 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/GraphTraversal.java
@@ -548,10 +548,6 @@ public interface GraphTraversal<S, E> extends Traversal<S, E> {
return this.asAdmin().addStep(new SubgraphStep(this.asAdmin(), sideEffectKey));
}
- public default GraphTraversal<S, Edge> subgraph() {
- return this.subgraph(null);
- }
-
public default GraphTraversal<S, E> aggregate(final String sideEffectKey) {
return this.asAdmin().addStep(new AggregateStep<>(this.asAdmin(), sideEffectKey));
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea277fef/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/__.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/__.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/__.java
index 18e0009..332e636 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/__.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/__.java
@@ -430,10 +430,6 @@ public class __ {
return __.<A>start().subgraph(sideEffectKey);
}
- public static <A> GraphTraversal<A, Edge> subgraph() {
- return __.<A>start().subgraph();
- }
-
public static <A> GraphTraversal<A, A> aggregate(final String sideEffectKey) {
return __.<A>start().aggregate(sideEffectKey);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea277fef/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroupStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroupStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroupStep.java
index 6df4828..3fd15fa 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroupStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/GroupStep.java
@@ -25,7 +25,6 @@ import org.apache.tinkerpop.gremlin.process.Traverser;
import org.apache.tinkerpop.gremlin.process.computer.KeyValue;
import org.apache.tinkerpop.gremlin.process.computer.MapReduce;
import org.apache.tinkerpop.gremlin.process.computer.traversal.TraversalVertexProgram;
-import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.GroupSideEffectStep;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.ReducingBarrierStep;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalMatrix;
import org.apache.tinkerpop.gremlin.process.traversal.lambda.IdentityTraversal;
@@ -48,6 +47,7 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.BiFunction;
+import java.util.function.Supplier;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
@@ -58,11 +58,11 @@ public final class GroupStep<S, K, V, R> extends ReducingBarrierStep<S, Map<K, R
private Traversal.Admin<S, K> keyTraversal = new IdentityTraversal<>();
private Traversal.Admin<S, V> valueTraversal = new IdentityTraversal<>();
- private Traversal.Admin<Collection<V>, R> reduceTraversal = new IdentityTraversal<>();
+ private Traversal.Admin<Collection<V>, R> reduceTraversal = null;
public GroupStep(final Traversal.Admin traversal) {
super(traversal);
- this.setSeedSupplier(() -> (Map) new GroupMap());
+ this.setSeedSupplier((Supplier) new GroupMapSupplier());
this.setBiFunction((BiFunction) new GroupReducingBiFunction());
}
@@ -154,9 +154,24 @@ public final class GroupStep<S, K, V, R> extends ReducingBarrierStep<S, Map<K, R
@Override
public Map<K, R> getFinal() {
- final Map<K, R> reduceMap = new HashMap<>();
- this.forEach((k, vv) -> reduceMap.put(k, TraversalUtil.apply(vv, reduceTraversal)));
- return reduceMap;
+ if (null == reduceTraversal)
+ return (Map<K, R>) this;
+ else {
+ final Map<K, R> reduceMap = new HashMap<>();
+ this.forEach((k, vv) -> reduceMap.put(k, TraversalUtil.apply(vv, reduceTraversal)));
+ return reduceMap;
+ }
+ }
+ }
+
+ private class GroupMapSupplier implements Supplier<GroupMap>, Serializable {
+
+ private GroupMapSupplier() {
+ }
+
+ @Override
+ public GroupMap get() {
+ return new GroupMap();
}
}
@@ -190,8 +205,8 @@ public final class GroupStep<S, K, V, R> extends ReducingBarrierStep<S, Map<K, R
final Traversal.Admin<?, ?> traversal = TraversalVertexProgram.getTraversalSupplier(configuration).get();
if (!traversal.isLocked())
traversal.applyStrategies(); // TODO: this is a scary error prone requirement, but only a problem for GroupStep
- final GroupSideEffectStep groupSideEffectStep = new TraversalMatrix<>(traversal).getStepById(this.groupStepId);
- this.reduceTraversal = groupSideEffectStep.getReduceTraversal();
+ final GroupStep groupStep = new TraversalMatrix<>(traversal).getStepById(this.groupStepId);
+ this.reduceTraversal = groupStep.getReduceTraversal();
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea277fef/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupSideEffectStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupSideEffectStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupSideEffectStep.java
index d9b9a26..93d9ed3 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupSideEffectStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/GroupSideEffectStep.java
@@ -161,8 +161,8 @@ public final class GroupSideEffectStep<S, K, V, R> extends SideEffectStep<S> imp
public static final class GroupSideEffectMapReduce<K, V, R> implements MapReduce<K, Collection<V>, K, R, Map<K, R>> {
- public static final String GROUP_BY_STEP_SIDE_EFFECT_KEY = "gremlin.groupStep.sideEffectKey";
- public static final String GROUP_BY_STEP_STEP_ID = "gremlin.groupStep.stepId";
+ public static final String GROUP_SIDE_EFFECT_STEP_SIDE_EFFECT_KEY = "gremlin.groupSideEffectStep.sideEffectKey";
+ public static final String GROUP_SIDE_EFFECT_STEP_STEP_ID = "gremlin.groupSideEffectStep.stepId";
private String sideEffectKey;
private String groupStepId;
@@ -183,14 +183,14 @@ public final class GroupSideEffectStep<S, K, V, R> extends SideEffectStep<S> imp
@Override
public void storeState(final Configuration configuration) {
MapReduce.super.storeState(configuration);
- configuration.setProperty(GROUP_BY_STEP_SIDE_EFFECT_KEY, this.sideEffectKey);
- configuration.setProperty(GROUP_BY_STEP_STEP_ID, this.groupStepId);
+ configuration.setProperty(GROUP_SIDE_EFFECT_STEP_SIDE_EFFECT_KEY, this.sideEffectKey);
+ configuration.setProperty(GROUP_SIDE_EFFECT_STEP_STEP_ID, this.groupStepId);
}
@Override
public void loadState(final Configuration configuration) {
- this.sideEffectKey = configuration.getString(GROUP_BY_STEP_SIDE_EFFECT_KEY);
- this.groupStepId = configuration.getString(GROUP_BY_STEP_STEP_ID);
+ this.sideEffectKey = configuration.getString(GROUP_SIDE_EFFECT_STEP_SIDE_EFFECT_KEY);
+ this.groupStepId = configuration.getString(GROUP_SIDE_EFFECT_STEP_STEP_ID);
final Traversal.Admin<?, ?> traversal = TraversalVertexProgram.getTraversalSupplier(configuration).get();
if (!traversal.isLocked())
traversal.applyStrategies(); // TODO: this is a scary error prone requirement, but only a problem for GroupStep
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea277fef/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java
index 435c3d8..3650a1c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/SubgraphStep.java
@@ -23,13 +23,20 @@ import org.apache.tinkerpop.gremlin.process.Traversal;
import org.apache.tinkerpop.gremlin.process.Traverser;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.SideEffectCapable;
import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible;
-import org.apache.tinkerpop.gremlin.process.traversal.step.SideEffectRegistrar;
import org.apache.tinkerpop.gremlin.process.traversal.util.TraversalHelper;
import org.apache.tinkerpop.gremlin.process.traverser.TraverserRequirement;
-import org.apache.tinkerpop.gremlin.structure.*;
+import org.apache.tinkerpop.gremlin.structure.Direction;
+import org.apache.tinkerpop.gremlin.structure.Edge;
+import org.apache.tinkerpop.gremlin.structure.Graph;
+import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.GraphFactory;
-import java.util.*;
+import java.util.EnumSet;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Set;
/**
* A side-effect step that produces an edge induced subgraph.
@@ -37,7 +44,7 @@ import java.util.*;
* @author Stephen Mallette (http://stephen.genoprime.com)
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
-public final class SubgraphStep extends SideEffectStep<Edge> implements SideEffectCapable, SideEffectRegistrar, Reversible {
+public final class SubgraphStep extends SideEffectStep<Edge> implements SideEffectCapable, Reversible {
private static final Set<TraverserRequirement> REQUIREMENTS = EnumSet.of(
TraverserRequirement.OBJECT,
@@ -56,6 +63,7 @@ public final class SubgraphStep extends SideEffectStep<Edge> implements SideEffe
public SubgraphStep(final Traversal.Admin traversal, final String sideEffectKey) {
super(traversal);
this.sideEffectKey = sideEffectKey;
+ this.getTraversal().asAdmin().getSideEffects().registerSupplierIfAbsent(this.sideEffectKey, () -> GraphFactory.open(DEFAULT_CONFIGURATION));
}
@Override
@@ -69,12 +77,6 @@ public final class SubgraphStep extends SideEffectStep<Edge> implements SideEffe
}
@Override
- public void registerSideEffects() {
- if (null == this.sideEffectKey) this.sideEffectKey = this.getId();
- this.getTraversal().asAdmin().getSideEffects().registerSupplierIfAbsent(this.sideEffectKey, () -> GraphFactory.open(DEFAULT_CONFIGURATION));
- }
-
- @Override
public String getSideEffectKey() {
return this.sideEffectKey;
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea277fef/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalMatrix.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalMatrix.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalMatrix.java
index ed68cd2..2765469 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalMatrix.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/TraversalMatrix.java
@@ -56,6 +56,9 @@ public final class TraversalMatrix<S, E> {
for (final Traversal.Admin<?, ?> globalChild : ((TraversalParent) step).getGlobalChildren()) {
this.harvestSteps(globalChild);
}
+ for (final Traversal.Admin<?, ?> localChild : ((TraversalParent) step).getLocalChildren()) {
+ this.harvestSteps(localChild);
+ }
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea277fef/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
index 12e1c99..f25d85c 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/TraversalHelper.java
@@ -20,13 +20,13 @@ package org.apache.tinkerpop.gremlin.process.traversal.util;
import org.apache.tinkerpop.gremlin.process.Step;
import org.apache.tinkerpop.gremlin.process.Traversal;
-import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible;
-import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.EdgeVertexStep;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.PropertiesStep;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.map.VertexStep;
import org.apache.tinkerpop.gremlin.process.traversal.StepPosition;
import org.apache.tinkerpop.gremlin.process.traversal.step.EmptyStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.Reversible;
+import org.apache.tinkerpop.gremlin.process.traversal.step.TraversalParent;
import org.apache.tinkerpop.gremlin.process.util.BulkSet;
import org.apache.tinkerpop.gremlin.structure.Vertex;
@@ -279,6 +279,11 @@ public final class TraversalHelper {
stepPosition.z = i;
}
}
+ for (int i = 0; i < parent.getLocalChildren().size(); i++) {
+ if (parent.getLocalChildren().get(i) == current) {
+ stepPosition.z = i + parent.getGlobalChildren().size();
+ }
+ }
}
current = parent.asStep().getTraversal();
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea277fef/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalPerformanceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalPerformanceTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalPerformanceTest.java
index a26e165..2f6d457 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalPerformanceTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/TraversalPerformanceTest.java
@@ -124,7 +124,7 @@ public class TraversalPerformanceTest extends AbstractGremlinTest {
@BenchmarkOptions(benchmarkRounds = DEFAULT_BENCHMARK_ROUNDS, warmupRounds = DEFAULT_WARMUP_ROUNDS, concurrency = BenchmarkOptions.CONCURRENCY_SEQUENTIAL)
@LoadGraphWith(LoadGraphWith.GraphData.GRATEFUL)
@Test
- public void g_E_hasLabelXwrittenByX_hasNotXinV_inEXsungByXX_subgraph() throws Exception {
- g.E().hasLabel("writtenBy").hasNot(__.inV().inE("sungBy")).subgraph().iterate();
+ public void g_E_hasLabelXwrittenByX_hasNotXinV_inEXsungByXX_subgraphXsgX() throws Exception {
+ g.E().hasLabel("writtenBy").hasNot(__.inV().inE("sungBy")).subgraph("sg").iterate();
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea277fef/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceTest.java
index 21a534b..eaccc1b 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/CoalesceTest.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.map;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
import org.apache.tinkerpop.gremlin.process.Path;
import org.apache.tinkerpop.gremlin.process.T;
import org.apache.tinkerpop.gremlin.process.Traversal;
@@ -95,6 +96,7 @@ public abstract class CoalesceTest extends AbstractGremlinProcessTest {
}
@Test
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
@LoadGraphWith(MODERN)
public void g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX() {
Traversal<Vertex, Path> traversal = get_g_V_coalesceXoutEXknowsX_outEXcreatedXX_otherV_path_byXnameX_byXlabelX();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea277fef/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PathTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PathTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PathTest.java
index 445256a..3637689 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PathTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/map/PathTest.java
@@ -65,6 +65,7 @@ public abstract class PathTest extends AbstractGremlinProcessTest {
}
@Test
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
@LoadGraphWith(MODERN)
public void g_VX1X_out_path_byXageX_byXnameX() {
final Traversal<Vertex, Path> traversal = get_g_VX1X_out_path_byXageX_byXnameX(convertToVertexId("marko"));
@@ -83,6 +84,7 @@ public abstract class PathTest extends AbstractGremlinProcessTest {
}
@Test
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
@LoadGraphWith(MODERN)
public void g_V_repeatXoutX_timesX2X_path_byXitX_byXnameX_byXlangX() {
final Traversal<Vertex, Path> traversal = get_g_V_repeatXoutX_timesX2X_path_by_byXnameX_byXlangX();
@@ -100,6 +102,7 @@ public abstract class PathTest extends AbstractGremlinProcessTest {
}
@Test
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
@LoadGraphWith(MODERN)
public void g_V_out_out_path_byXnameX_byXageX() {
final Traversal<Vertex, Path> traversal = get_g_V_out_out_path_byXnameX_byXageX();
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ea277fef/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java
index 37c835c..d87e772 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/sideEffect/TreeTest.java
@@ -20,12 +20,14 @@ package org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect;
import org.apache.tinkerpop.gremlin.LoadGraphWith;
import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
+import org.apache.tinkerpop.gremlin.process.IgnoreEngine;
import org.apache.tinkerpop.gremlin.process.T;
import org.apache.tinkerpop.gremlin.process.Traversal;
import org.apache.tinkerpop.gremlin.process.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.process.graph.util.Tree;
import org.apache.tinkerpop.gremlin.structure.Vertex;
+import org.junit.Ignore;
import org.junit.Test;
import java.util.Arrays;
@@ -52,6 +54,7 @@ public abstract class TreeTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Tree> get_g_VX1X_out_out_treeXaX_byXnameX_both_both_capXaX(final Object v1Id);
@Test
+ @IgnoreEngine(TraversalEngine.Type.COMPUTER)
@LoadGraphWith(MODERN)
public void g_VX1X_out_out_tree_byXnameX() {
List<Traversal<Vertex, Tree>> traversals = Arrays.asList(