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/20 00:06:53 UTC
incubator-tinkerpop git commit: TravaersalVerificationStrategy
requires a hardcoded g.engine(Computer) ... @spmallette.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master ea277fef2 -> 1d3fed256
TravaersalVerificationStrategy requires a hardcoded g.engine(Computer) ... @spmallette.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/1d3fed25
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/1d3fed25
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/1d3fed25
Branch: refs/heads/master
Commit: 1d3fed256bd125ca67facdde604a9ac5dd7dc8ec
Parents: ea277fe
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Feb 19 16:06:50 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Feb 19 16:06:50 2015 -0700
----------------------------------------------------------------------
.../process/traversal/TraversalMatrix.java | 4 +--
.../process/traversal/util/TraversalHelper.java | 4 +--
.../graph/traversal/step/filter/DedupTest.java | 2 +-
.../TraversalVerificationStrategyTest.java | 33 ++++++++++----------
4 files changed, 22 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1d3fed25/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 2765469..46f6c70 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,9 +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()) {
+ /*for (final Traversal.Admin<?, ?> localChild : ((TraversalParent) step).getLocalChildren()) {
this.harvestSteps(localChild);
- }
+ }*/
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1d3fed25/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 f25d85c..98bada2 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
@@ -279,11 +279,11 @@ public final class TraversalHelper {
stepPosition.z = i;
}
}
- for (int i = 0; i < parent.getLocalChildren().size(); 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/1d3fed25/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java
index 2477c31..748028b 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/step/filter/DedupTest.java
@@ -101,7 +101,7 @@ public abstract class DedupTest extends AbstractGremlinProcessTest {
@Test
@LoadGraphWith(MODERN)
- public void g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXdedupXlocalXX_cap() {
+ public void g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXdedupXlocalXX() {
final Traversal<Vertex, Map<String, Set<Double>>> traversal =
get_g_V_group_byXlabelX_byXbothE_valuesXweightX_foldX_byXdedupXlocalXX();
printTraversalForm(traversal);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1d3fed25/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategyTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategyTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategyTest.java
index 0f1a40a..ef85430 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategyTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/graph/traversal/strategy/TraversalVerificationStrategyTest.java
@@ -23,11 +23,13 @@ import org.apache.tinkerpop.gremlin.process.AbstractGremlinProcessTest;
import org.apache.tinkerpop.gremlin.process.TraversalEngine;
import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.process.graph.traversal.GraphTraversal;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
import org.junit.Ignore;
import org.junit.Test;
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.apache.tinkerpop.gremlin.process.graph.traversal.__.*;
+import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
/**
@@ -72,61 +74,60 @@ public abstract class TraversalVerificationStrategyTest extends AbstractGremlinP
public static class ComputerTraversals extends TraversalVerificationStrategyTest {
@Test
- @Ignore("Something is eating the exception...")
@LoadGraphWith(MODERN)
public void shouldNotAllowNestedGlobalTraversalToHaveBarriers() {
+ g.engine(ComputerTraversalEngine.computer);
try {
final GraphTraversal t = g.V().values("age").union(max(), min(), sum()).iterate();
fail("Nested global traversals should not be allowed to contain barriers (COMPUTER): " + t);
} catch (IllegalStateException e) {
-
+ assertTrue(true);
}
}
@Test
- @Ignore("Something is eating the exception...")
@LoadGraphWith(MODERN)
public void shouldNotAllowMidTraversalBarriersOnComputer() {
+ g.engine(ComputerTraversalEngine.computer);
try {
final GraphTraversal t = g.V().count().sum().iterate();
fail("Mid-traversal barrier steps are not allowed (COMPUTER): " + t);
} catch (IllegalStateException e) {
-
+ assertTrue(true);
}
try {
final GraphTraversal t = g.V().count().sum().map(x -> x.get() * 19).iterate();
fail("Mid-traversal barrier steps are not allowed (COMPUTER): " + t);
} catch (IllegalStateException e) {
-
+ assertTrue(true);
}
}
@Test
- @Ignore("Something is eating the exception...")
@LoadGraphWith(MODERN)
public void shouldNotAllowLocalTraversalsToLeaveTheStarGraphOnComputer() {
- try {
- g.V().local(outE().values("weight")).iterate();
- g.V().local(out().id()).iterate();
- g.V().local(outE().inV()).iterate();
- g.V().local(inE().as("a").values("weight").back("a").outV()).iterate();
- } catch (IllegalStateException e) {
- fail("Local traversals on the star-graph are OK on COMPUTER: " + e.getMessage());
- }
-
+ g.engine(ComputerTraversalEngine.computer);
try {
final GraphTraversal t = g.V().local(out().out()).iterate();
fail("Local traversals should not be allowed to leave the star-graph (COMPUTER): " + t);
} catch (IllegalStateException e) {
-
+ assertTrue(true);
}
try {
final GraphTraversal t = g.V().local(out().values("name")).iterate();
fail("Local traversals should not be allowed to leave the star-graph (COMPUTER): " + t);
} catch (IllegalStateException e) {
+ assertTrue(true);
+ }
+ try {
+ g.V().local(outE().values("weight")).iterate();
+ g.V().local(out().id()).iterate();
+ g.V().local(outE().inV()).iterate();
+ } catch (IllegalStateException e) {
+ fail("Local traversals on the star-graph are OK on COMPUTER: " + e.getMessage());
}
}
}