You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/02/19 19:51:41 UTC
[1/5] incubator-tinkerpop git commit: Better support the future in
process testing where additional TraversalEngine.Types will exist.
Repository: incubator-tinkerpop
Updated Branches:
refs/heads/master 37f9256da -> 1d3a8af93
Better support the future in process testing where additional TraversalEngine.Types will exist.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/083b7a5e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/083b7a5e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/083b7a5e
Branch: refs/heads/master
Commit: 083b7a5e61a0cbe4e454d3b9d342158e42a484cf
Parents: 2286ce4
Author: Stephen Mallette <sp...@apache.org>
Authored: Thu Feb 19 12:09:33 2015 -0500
Committer: Stephen Mallette <sp...@apache.org>
Committed: Thu Feb 19 12:09:33 2015 -0500
----------------------------------------------------------------------
.../tinkerpop/gremlin/process/AbstractGremlinProcessTest.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/083b7a5e/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
index bcc6821..9e91b9f 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
@@ -50,7 +50,8 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
}
private boolean hasGraphComputerRequirement() {
- return GraphManager.getTraversalEngineType().equals(TraversalEngine.Type.COMPUTER);
+ // do the negation of STANDARD as we expect a type of REASONING that would infer computer support
+ return !GraphManager.getTraversalEngineType().equals(TraversalEngine.Type.STANDARD);
}
@Before
[4/5] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/2e11ac85
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/2e11ac85
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/2e11ac85
Branch: refs/heads/master
Commit: 2e11ac85ac281a39a6cac77f039194783c61f2f1
Parents: d46ec9e 37f9256
Author: Stephen Mallette <sp...@apache.org>
Authored: Thu Feb 19 13:30:58 2015 -0500
Committer: Stephen Mallette <sp...@apache.org>
Committed: Thu Feb 19 13:30:58 2015 -0500
----------------------------------------------------------------------
.../graph/traversal/ElementTraversal.java | 4 +-
.../process/graph/traversal/GraphTraversal.java | 124 +++++++++++--
.../gremlin/process/graph/traversal/__.java | 4 +-
.../traversal/step/map/GroupCountStep.java | 164 ++++++++++++++++++
.../sideEffect/GroupCountSideEffectStep.java | 172 +++++++++++++++++++
.../step/sideEffect/GroupCountStep.java | 104 -----------
.../mapreduce/GroupCountMapReduce.java | 101 -----------
.../step/util/ReducingBarrierStep.java | 2 +-
.../step/map/GroovyCoalesceTest.groovy | 4 +-
.../traversal/step/map/GroovySelectTest.groovy | 16 +-
.../graph/traversal/step/map/CoalesceTest.java | 2 +-
.../graph/traversal/step/map/SelectTest.java | 20 +--
.../process/traversal/CoreTraversalTest.java | 2 +-
.../groovy/plugin/HadoopGremlinPlugin.java | 10 +-
14 files changed, 479 insertions(+), 250 deletions(-)
----------------------------------------------------------------------
[5/5] incubator-tinkerpop git commit: Made it so that the
TraversalEngine itself is supplied by the suite rather than just the type.
Posted by sp...@apache.org.
Made it so that the TraversalEngine itself is supplied by the suite rather than just the type.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/1d3a8af9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/1d3a8af9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/1d3a8af9
Branch: refs/heads/master
Commit: 1d3a8af93714dd1a7616b34cf9271df2172213ad
Parents: 2e11ac8
Author: Stephen Mallette <sp...@apache.org>
Authored: Thu Feb 19 13:45:09 2015 -0500
Committer: Stephen Mallette <sp...@apache.org>
Committed: Thu Feb 19 13:45:09 2015 -0500
----------------------------------------------------------------------
.../tinkerpop/gremlin/AbstractGremlinSuite.java | 7 ++++---
.../org/apache/tinkerpop/gremlin/GraphManager.java | 12 ++++++------
.../gremlin/process/AbstractGremlinProcessTest.java | 16 +++-------------
.../gremlin/process/ProcessComputerSuite.java | 7 ++++---
.../gremlin/process/ProcessStandardSuite.java | 3 ++-
5 files changed, 19 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1d3a8af9/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
index 013b6f7..235e3f9 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinSuite.java
@@ -19,6 +19,7 @@
package org.apache.tinkerpop.gremlin;
import org.apache.tinkerpop.gremlin.process.TraversalEngine;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Element;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@ -109,11 +110,11 @@ public abstract class AbstractGremlinSuite extends Suite {
public AbstractGremlinSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce,
final boolean gremlinFlavorSuite) throws InitializationError {
- this(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, TraversalEngine.Type.STANDARD);
+ this(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, StandardTraversalEngine.standard);
}
public AbstractGremlinSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce,
- final boolean gremlinFlavorSuite, TraversalEngine.Type traversalEngineType) throws InitializationError {
+ final boolean gremlinFlavorSuite, TraversalEngine traversalEngine) throws InitializationError {
super(builder, klass, enforce(testsToExecute, testsToEnforce));
this.gremlinFlavorSuite = gremlinFlavorSuite;
@@ -134,7 +135,7 @@ public abstract class AbstractGremlinSuite extends Suite {
validateHelpersNotImplemented(graphProvider);
GraphManager.setGraphProvider(graphProvider);
- GraphManager.setTraversalEngineType(traversalEngineType);
+ GraphManager.setTraversalEngine(traversalEngine);
} catch (Exception ex) {
throw new InitializationError(ex);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1d3a8af9/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java
index 3b03f04..4090336 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphManager.java
@@ -27,7 +27,7 @@ import org.apache.tinkerpop.gremlin.process.TraversalEngine;
*/
public class GraphManager {
private static GraphProvider graphProvider;
- private static TraversalEngine.Type traversalEngineType;
+ private static TraversalEngine traversalEngine;
public static GraphProvider setGraphProvider(final GraphProvider graphProvider) {
final GraphProvider old = GraphManager.graphProvider;
@@ -39,13 +39,13 @@ public class GraphManager {
return graphProvider;
}
- public static TraversalEngine.Type setTraversalEngineType(final TraversalEngine.Type traversalEngineType) {
- final TraversalEngine.Type old = GraphManager.traversalEngineType;
- GraphManager.traversalEngineType = traversalEngineType;
+ public static TraversalEngine setTraversalEngine(final TraversalEngine traversalEngine) {
+ final TraversalEngine old = GraphManager.traversalEngine;
+ GraphManager.traversalEngine = traversalEngine;
return old;
}
- public static TraversalEngine.Type getTraversalEngineType() {
- return traversalEngineType;
+ public static TraversalEngine getTraversalEngine() {
+ return traversalEngine;
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1d3a8af9/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
index 517db7a..3f87259 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
@@ -52,7 +52,7 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
private boolean hasGraphComputerRequirement() {
// do the negation of STANDARD as we expect a type of REASONING that would infer computer support
- return !GraphManager.getTraversalEngineType().equals(TraversalEngine.Type.STANDARD);
+ return !GraphManager.getTraversalEngine().getType().equals(TraversalEngine.Type.STANDARD);
}
@Before
@@ -63,22 +63,12 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
// ignore tests that aren't supported by a specific TraversalEngine
final IgnoreEngine ignoreEngine = this.getClass().getMethod(name.getMethodName()).getAnnotation(IgnoreEngine.class);
if (ignoreEngine != null)
- assumeTrue(String.format("This test is ignored for %s", ignoreEngine.value()), !ignoreEngine.value().equals(GraphManager.getTraversalEngineType()));
+ assumeTrue(String.format("This test is ignored for %s", ignoreEngine.value()), !ignoreEngine.value().equals(GraphManager.getTraversalEngine().getType()));
} catch (NoSuchMethodException nsme) {
throw new RuntimeException(String.format("Could not find test method %s in test case %s", name.getMethodName(), this.getClass().getName()));
}
- switch (GraphManager.getTraversalEngineType()) {
- case STANDARD:
- g.engine(StandardTraversalEngine.standard);
- break;
- case COMPUTER:
- g.engine(ComputerTraversalEngine.computer);
- break;
- default:
- throw new RuntimeException(String.format("%s is not supported as an engine - check %s [%s]",
- GraphManager.getTraversalEngineType(), this.getClass().getName(), this.name.getMethodName()));
- }
+ g.engine(GraphManager.getTraversalEngine());
}
public <T> void checkResults(final List<T> expectedResults, final Traversal<?, T> traversal) {
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1d3a8af9/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
index 25485eb..a6ce57a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
@@ -69,6 +69,7 @@ import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.Side
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.StoreTest;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.TreeTest;
import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.TraversalVerificationStrategyTest;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
import org.junit.runners.model.InitializationError;
import org.junit.runners.model.RunnerBuilder;
@@ -200,15 +201,15 @@ public class ProcessComputerSuite extends AbstractGremlinSuite {
}
public ProcessComputerSuite(final Class<?> klass, final RunnerBuilder builder) throws InitializationError {
- super(klass, builder, testsToExecute, testsToExecute, false, TraversalEngine.Type.COMPUTER);
+ super(klass, builder, testsToExecute, testsToExecute, false, ComputerTraversalEngine.computer);
}
public ProcessComputerSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce) throws InitializationError {
- super(klass, builder, testsToExecute, testsToEnforce, false, TraversalEngine.Type.COMPUTER);
+ super(klass, builder, testsToExecute, testsToEnforce, false, ComputerTraversalEngine.computer);
}
public ProcessComputerSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce, final boolean gremlinFlavorSuite) throws InitializationError {
- super(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, TraversalEngine.Type.COMPUTER);
+ super(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, ComputerTraversalEngine.computer);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/1d3a8af9/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
index eccafbf..163e467 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessStandardSuite.java
@@ -27,6 +27,7 @@ import org.apache.tinkerpop.gremlin.process.graph.traversal.step.sideEffect.*;
import org.apache.tinkerpop.gremlin.process.graph.traversal.step.util.TraversalSideEffectsTest;
import org.apache.tinkerpop.gremlin.process.graph.traversal.strategy.TraversalVerificationStrategyTest;
import org.apache.tinkerpop.gremlin.process.traversal.CoreTraversalTest;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
import org.apache.tinkerpop.gremlin.process.util.PathTest;
import org.junit.runners.model.InitializationError;
import org.junit.runners.model.RunnerBuilder;
@@ -167,7 +168,7 @@ public class ProcessStandardSuite extends AbstractGremlinSuite {
}
public ProcessStandardSuite(final Class<?> klass, final RunnerBuilder builder, final Class<?>[] testsToExecute, final Class<?>[] testsToEnforce, final boolean gremlinFlavorSuite) throws InitializationError {
- super(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, TraversalEngine.Type.STANDARD);
+ super(klass, builder, testsToExecute, testsToEnforce, gremlinFlavorSuite, StandardTraversalEngine.standard);
}
@Override
[3/5] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/master'
Posted by sp...@apache.org.
Merge remote-tracking branch 'origin/master'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/d46ec9e4
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/d46ec9e4
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/d46ec9e4
Branch: refs/heads/master
Commit: d46ec9e4d776f74ce24446ea80ece957f60af455
Parents: b4689e4 1f13054
Author: Stephen Mallette <sp...@apache.org>
Authored: Thu Feb 19 12:29:25 2015 -0500
Committer: Stephen Mallette <sp...@apache.org>
Committed: Thu Feb 19 12:29:25 2015 -0500
----------------------------------------------------------------------
.../process/graph/traversal/step/map/MeanGlobalStep.java | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/5] incubator-tinkerpop git commit: Better setup for multiple
TraversalEngine types in the process test suite.
Posted by sp...@apache.org.
Better setup for multiple TraversalEngine types in the process test suite.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b4689e4b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b4689e4b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b4689e4b
Branch: refs/heads/master
Commit: b4689e4bc419a57b2d70c347f53e0f68e3805e91
Parents: 083b7a5
Author: Stephen Mallette <sp...@apache.org>
Authored: Thu Feb 19 12:19:37 2015 -0500
Committer: Stephen Mallette <sp...@apache.org>
Committed: Thu Feb 19 12:19:37 2015 -0500
----------------------------------------------------------------------
.../gremlin/process/AbstractGremlinProcessTest.java | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b4689e4b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
----------------------------------------------------------------------
diff --git a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
index 9e91b9f..517db7a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/AbstractGremlinProcessTest.java
@@ -21,6 +21,7 @@ package org.apache.tinkerpop.gremlin.process;
import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.GraphManager;
import org.apache.tinkerpop.gremlin.process.traversal.engine.ComputerTraversalEngine;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
import org.apache.tinkerpop.gremlin.process.util.MapHelper;
import org.junit.Before;
@@ -67,7 +68,17 @@ public abstract class AbstractGremlinProcessTest extends AbstractGremlinTest {
throw new RuntimeException(String.format("Could not find test method %s in test case %s", name.getMethodName(), this.getClass().getName()));
}
- if (hasGraphComputerRequirement()) g.engine(ComputerTraversalEngine.computer);
+ switch (GraphManager.getTraversalEngineType()) {
+ case STANDARD:
+ g.engine(StandardTraversalEngine.standard);
+ break;
+ case COMPUTER:
+ g.engine(ComputerTraversalEngine.computer);
+ break;
+ default:
+ throw new RuntimeException(String.format("%s is not supported as an engine - check %s [%s]",
+ GraphManager.getTraversalEngineType(), this.getClass().getName(), this.name.getMethodName()));
+ }
}
public <T> void checkResults(final List<T> expectedResults, final Traversal<?, T> traversal) {