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/20 16:58:28 UTC

[1/2] incubator-tinkerpop git commit: The standard test was incorrectly registered to the computer process test suite.

Repository: incubator-tinkerpop
Updated Branches:
  refs/heads/master 08d3d7fb1 -> 9d5f3e98e


The standard test was incorrectly registered to the computer process test suite.

Committed in relation to https://github.com/apache/incubator-tinkerpop/commit/1d3fed256bd125ca67facdde604a9ac5dd7dc8ec @okram.


Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/32209210
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/32209210
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/32209210

Branch: refs/heads/master
Commit: 3220921032127a524c620511563216bf83dbbce9
Parents: 101ace9
Author: Stephen Mallette <sp...@apache.org>
Authored: Fri Feb 20 10:57:25 2015 -0500
Committer: Stephen Mallette <sp...@apache.org>
Committed: Fri Feb 20 10:57:25 2015 -0500

----------------------------------------------------------------------
 .../apache/tinkerpop/gremlin/process/ProcessStandardSuite.java    | 2 +-
 .../traversal/strategy/TraversalVerificationStrategyTest.java     | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/32209210/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 0e11ecd..bd43a40 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
@@ -134,7 +134,7 @@ public class ProcessStandardSuite extends AbstractGremlinSuite {
             PathTest.class,
 
             // strategy
-            TraversalVerificationStrategyTest.StandardTraversals.class
+            TraversalVerificationStrategyTest.ComputerTraversals.class
 
             // algorithms
             // PageRankVertexProgramTest.class

http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/32209210/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 ef85430..4268ba6 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
@@ -76,7 +76,6 @@ public abstract class TraversalVerificationStrategyTest extends AbstractGremlinP
         @Test
         @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);
@@ -88,7 +87,6 @@ public abstract class TraversalVerificationStrategyTest extends AbstractGremlinP
         @Test
         @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);
@@ -107,7 +105,6 @@ public abstract class TraversalVerificationStrategyTest extends AbstractGremlinP
         @Test
         @LoadGraphWith(MODERN)
         public void shouldNotAllowLocalTraversalsToLeaveTheStarGraphOnComputer() {
-            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);


[2/2] 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/9d5f3e98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9d5f3e98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9d5f3e98

Branch: refs/heads/master
Commit: 9d5f3e98ee02bbb5b78700b5fbed663df2f20462
Parents: 3220921 08d3d7f
Author: Stephen Mallette <sp...@apache.org>
Authored: Fri Feb 20 10:58:22 2015 -0500
Committer: Stephen Mallette <sp...@apache.org>
Committed: Fri Feb 20 10:58:22 2015 -0500

----------------------------------------------------------------------
 docs/src/implementations.asciidoc               | 34 +++++++-----
 .../traversal/step/map/CountGlobalStep.java     | 10 ++--
 .../traversal/step/map/GroupCountStep.java      | 18 ++++--
 .../graph/traversal/step/map/GroupStep.java     | 58 ++++++++++++--------
 .../graph/traversal/step/map/MaxGlobalStep.java | 20 +++----
 .../traversal/step/map/MeanGlobalStep.java      | 20 +++----
 .../graph/traversal/step/map/MinGlobalStep.java | 20 +++----
 .../graph/traversal/step/map/SumGlobalStep.java | 20 +++----
 .../step/util/ReducingBarrierStep.java          |  1 -
 .../process/traversal/util/TraversalUtil.java   |  8 +++
 hadoop-gremlin/conf/hadoop-kryo.properties      |  2 +-
 11 files changed, 121 insertions(+), 90 deletions(-)
----------------------------------------------------------------------