You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by dk...@apache.org on 2015/05/12 04:14:23 UTC
[05/12] incubator-tinkerpop git commit: Merge branch 'master' into
TINKERPOP3-666
Merge branch 'master' into TINKERPOP3-666
Resolved Conflicts:
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/SelectTest.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/b8ac0b08
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/b8ac0b08
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/b8ac0b08
Branch: refs/heads/TINKERPOP3-666
Commit: b8ac0b0863fcc04c83785602a5bc1fe2e9fe09c8
Parents: b9ea999 6a846ab
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Tue May 12 00:37:49 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Tue May 12 00:37:49 2015 +0200
----------------------------------------------------------------------
.../gremlin/process/computer/GraphComputer.java | 12 +-
.../computer/traversal/TraverserExecutor.java | 13 +-
.../process/computer/util/ComputerGraph.java | 231 ++++++++++++++-----
.../traverser/B_O_P_S_SE_SL_Traverser.java | 3 +-
.../gremlin/structure/util/Attachable.java | 14 +-
.../util/detached/DetachedElement.java | 8 +-
.../structure/util/reference/ReferenceEdge.java | 33 ++-
.../util/reference/ReferenceVertexProperty.java | 6 +-
.../gremlin/structure/util/star/StarGraph.java | 19 +-
.../gremlin/groovy/util/MetaRegistryUtil.groovy | 4 +-
.../process/computer/GraphComputerTest.java | 145 +++++++++++-
.../computer/util/ComputerGraphTest.java | 20 +-
.../traversal/step/branch/LocalTest.java | 2 +-
.../traversal/step/filter/ExceptTest.java | 1 +
.../decoration/SubgraphStrategyProcessTest.java | 3 +
.../util/reference/ReferenceEdgeTest.java | 2 +-
.../structure/ExceptionCoverageTest.java | 3 -
.../hadoop/process/computer/HadoopMap.java | 4 +-
.../computer/giraph/GiraphComputeVertex.java | 3 +-
.../process/computer/spark/SparkExecutor.java | 4 +-
.../process/computer/TinkerGraphComputer.java | 17 +-
21 files changed, 424 insertions(+), 123 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b8ac0b08/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java
index 1c10806,35ef08c..79da3c6
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/branch/LocalTest.java
@@@ -20,16 -20,15 +20,16 @@@ package org.apache.tinkerpop.gremlin.pr
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.GremlinProcessRunner;
import org.apache.tinkerpop.gremlin.process.UseEngine;
--import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Order;
++import org.apache.tinkerpop.gremlin.structure.T;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
+import org.junit.runner.RunWith;
import java.util.Arrays;
import java.util.Map;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/b8ac0b08/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/filter/ExceptTest.java
----------------------------------------------------------------------