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/11 13:44:21 UTC
[50/50] [abbrv] 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/map/AddEdgeTest.java
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java
gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.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/c20a9190
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/c20a9190
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/c20a9190
Branch: refs/heads/TINKERPOP3-666
Commit: c20a91906dda8e63320260c6fe82c1efeffde15d
Parents: bbb6345 dbd2750
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon May 11 13:43:03 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon May 11 13:43:03 2015 +0200
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +
README.asciidoc | 1 +
docs/src/the-traversal.asciidoc | 17 +
.../gremlin/process/computer/MapReduce.java | 9 +-
.../gremlin/process/computer/VertexProgram.java | 15 +-
.../peerpressure/ClusterCountMapReduce.java | 3 +-
.../ClusterPopulationMapReduce.java | 3 +-
.../peerpressure/PeerPressureVertexProgram.java | 37 +-
.../ranking/pagerank/PageRankMapReduce.java | 3 +-
.../ranking/pagerank/PageRankVertexProgram.java | 41 +-
.../traversal/TraversalScriptSupplier.java | 67 -
.../computer/traversal/TraversalSupplier.java | 43 -
.../traversal/TraversalVertexProgram.java | 51 +-
.../traversal/step/map/ComputerResultStep.java | 2 +-
.../mapreduce/TraverserMapReduce.java | 5 +-
.../util/AbstractVertexProgramBuilder.java | 5 +-
.../computer/util/ConfigurationTraversal.java | 80 +
.../process/computer/util/LambdaHolder.java | 114 -
.../computer/util/ScriptEngineCache.java | 47 -
.../computer/util/ScriptEngineLambda.java | 111 -
.../process/computer/util/ShellGraph.java | 283 --
.../process/traversal/TraversalStrategies.java | 5 -
.../traversal/dsl/graph/GraphTraversal.java | 15 +-
.../dsl/graph/GraphTraversalSource.java | 2 +-
.../process/traversal/step/filter/HasStep.java | 2 +-
.../traversal/step/filter/WhereStep.java | 53 +-
.../process/traversal/step/map/GroupStep.java | 25 +-
.../traversal/step/map/OrderGlobalStep.java | 2 +-
.../traversal/step/map/OrderLocalStep.java | 4 +-
.../step/sideEffect/AggregateStep.java | 5 +-
.../sideEffect/GroupCountSideEffectStep.java | 5 +-
.../step/sideEffect/GroupSideEffectStep.java | 7 +-
.../traversal/step/sideEffect/StoreStep.java | 5 +-
.../step/sideEffect/TreeSideEffectStep.java | 3 +-
.../process/traversal/step/util/BulkSet.java | 2 +-
.../traversal/step/util/ComputerAwareStep.java | 2 +-
.../traversal/step/util/HasContainer.java | 6 +-
.../step/util/ReducingBarrierStep.java | 3 +-
.../traversal/util/DefaultTraversal.java | 5 +-
.../traversal/util/TraversalObjectFunction.java | 47 +
.../traversal/util/TraversalScriptFunction.java | 66 +
.../traversal/util/TraversalScriptHelper.java | 59 +
.../tinkerpop/gremlin/structure/Graph.java | 1 +
.../apache/tinkerpop/gremlin/structure/P.java | 11 +
.../apache/tinkerpop/gremlin/util/Gremlin.java | 3 +
.../gremlin/util/ScriptEngineCache.java | 47 +
.../tinkerpop/gremlin/util/Serializer.java | 5 +-
.../apache/tinkerpop/gremlin/util/TimeUtil.java | 4 +
.../util/function/ScriptEngineLambda.java | 111 +
.../gremlin/util/tools/MultiMapTest.java | 136 +
.../tinkerpop/gremlin/driver/Cluster.java | 2 +-
.../tinkerpop/gremlin/driver/Connection.java | 2 +-
.../gremlin/driver/ConnectionPool.java | 2 +-
.../driver/util/ConfigurationEvaluator.java | 76 +-
.../driver/util/ProfilingApplication.java | 182 +-
.../process/computer/ComputerTestHelper.groovy | 47 -
.../GroovyTraversalSideEffectsTest.groovy | 10 +-
.../step/branch/GroovyBranchTest.groovy | 41 +-
.../step/branch/GroovyChooseTest.groovy | 20 +-
.../step/branch/GroovyLocalTest.groovy | 85 +-
.../step/branch/GroovyRepeatTest.groovy | 78 +-
.../step/branch/GroovyUnionTest.groovy | 59 +-
.../traversal/step/filter/GroovyAndTest.groovy | 30 +-
.../traversal/step/filter/GroovyCoinTest.groovy | 26 +-
.../step/filter/GroovyCyclicPathTest.groovy | 25 +-
.../step/filter/GroovyDedupTest.groovy | 60 +-
.../traversal/step/filter/GroovyDropTest.groovy | 12 +-
.../step/filter/GroovyExceptTest.groovy | 70 +-
.../step/filter/GroovyFilterTest.groovy | 126 +-
.../step/filter/GroovyHasNotTest.groovy | 32 +-
.../traversal/step/filter/GroovyHasTest.groovy | 138 +-
.../traversal/step/filter/GroovyIsTest.groovy | 49 +-
.../traversal/step/filter/GroovyOrTest.groovy | 31 +-
.../step/filter/GroovyRangeTest.groovy | 111 +-
.../step/filter/GroovyRetainTest.groovy | 31 +-
.../step/filter/GroovySampleTest.groovy | 69 +-
.../step/filter/GroovySimplePathTest.groovy | 26 +-
.../step/filter/GroovyWhereTest.groovy | 73 +-
.../traversal/step/map/GroovyAddEdgeTest.groovy | 12 +-
.../step/map/GroovyAddVertexTest.groovy | 11 +-
.../step/map/GroovyCoalesceTest.groovy | 58 +-
.../traversal/step/map/GroovyCountTest.groovy | 69 +-
.../traversal/step/map/GroovyFoldTest.groovy | 40 +-
.../traversal/step/map/GroovyMapTest.groovy | 86 +-
.../traversal/step/map/GroovyMatchTest.groovy | 3 +-
.../traversal/step/map/GroovyMaxTest.groovy | 37 +-
.../traversal/step/map/GroovyMeanTest.groovy | 29 +-
.../traversal/step/map/GroovyMinTest.groovy | 37 +-
.../traversal/step/map/GroovyOrderTest.groovy | 127 +-
.../traversal/step/map/GroovyPathTest.groovy | 69 +-
.../step/map/GroovyPropertiesTest.groovy | 33 +-
.../traversal/step/map/GroovySelectTest.groovy | 246 +-
.../traversal/step/map/GroovySumTest.groovy | 29 +-
.../traversal/step/map/GroovyUnfoldTest.groovy | 26 +-
.../step/map/GroovyValueMapTest.groovy | 31 +-
.../traversal/step/map/GroovyVertexTest.groovy | 197 +-
.../step/sideEffect/GroovyAggregateTest.groovy | 32 +-
.../step/sideEffect/GroovyGroupCountTest.groovy | 70 +-
.../step/sideEffect/GroovyGroupTest.groovy | 55 +-
.../step/sideEffect/GroovyInjectTest.groovy | 35 +-
.../step/sideEffect/GroovyProfileTest.groovy | 50 +-
.../step/sideEffect/GroovySackTest.groovy | 35 +-
.../sideEffect/GroovySideEffectCapTest.groovy | 29 +-
.../step/sideEffect/GroovySideEffectTest.groovy | 18 +-
.../step/sideEffect/GroovyStoreTest.groovy | 42 +-
.../step/sideEffect/GroovySubgraphTest.groovy | 11 +-
.../step/sideEffect/GroovyTreeTest.groovy | 65 +-
.../process/GroovyProcessComputerSuite.java | 103 +-
.../process/GroovyProcessStandardSuite.java | 102 +-
.../computer/util/ScriptEngineLambdaTest.java | 162 --
.../util/function/ScriptEngineLambdaTest.java | 163 ++
.../apache/tinkerpop/gremlin/TestHelper.java | 10 +-
.../ranking/PageRankVertexProgramTest.java | 2 +-
.../process/traversal/step/map/AddEdgeTest.java | 6 +-
.../process/traversal/step/map/MatchTest.java | 2 +
.../step/sideEffect/SideEffectTest.java | 8 +-
.../traversal/step/sideEffect/SubgraphTest.java | 6 +-
.../tinkerpop/gremlin/structure/GraphTest.java | 1 +
.../tinkerpop/gremlin/structure/IoTest.java | 2457 ------------------
.../gremlin/structure/SerializationTest.java | 10 +-
.../structure/StructureIntegrateSuite.java | 52 +
.../structure/StructureStandardSuite.java | 1 +
.../gremlin/structure/TransactionTest.java | 10 +
.../tinkerpop/gremlin/structure/VertexTest.java | 1 +
.../gremlin/structure/io/IoIntegrateTest.java | 107 +
.../tinkerpop/gremlin/structure/io/IoTest.java | 2450 +++++++++++++++++
.../structure/util/star/StarGraphTest.java | 101 +-
.../tinkerpop/gremlin/hadoop/Constants.java | 4 +
.../groovy/plugin/HadoopRemoteAcceptor.java | 2 +-
.../hadoop/process/computer/HadoopCombine.java | 5 +-
.../hadoop/process/computer/HadoopMap.java | 5 +-
.../hadoop/process/computer/HadoopReduce.java | 6 +-
.../computer/example/TraversalSupplier1.java | 12 +-
.../computer/example/TraversalSupplier2.java | 11 +-
.../computer/example/TraversalSupplier3.java | 14 +-
.../computer/giraph/GiraphGraphComputer.java | 2 +-
.../process/computer/giraph/GiraphMemory.java | 6 +-
.../computer/giraph/GiraphMessageCombiner.java | 5 +-
.../computer/giraph/GiraphWorkerContext.java | 5 +-
.../process/computer/spark/SparkExecutor.java | 9 +-
.../computer/spark/SparkGraphComputer.java | 2 +-
.../process/computer/util/MemoryMapReduce.java | 3 +-
.../gremlin/hadoop/structure/HadoopGraph.java | 14 +-
.../structure/io/ObjectWritableComparator.java | 7 +-
.../tinkergraph/structure/TinkerGraph.java | 1 +
.../tinkergraph/TinkerGraphProvider.java | 2 +-
.../TinkerGraphStructureIntegrateTest.java | 36 +
147 files changed, 4298 insertions(+), 6283 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c20a9190/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
index 982e621,032fe57..df3f42a
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/AddEdgeTest.java
@@@ -18,13 -18,13 +18,13 @@@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.map;
- import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
import org.apache.tinkerpop.gremlin.FeatureRequirement;
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.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
- import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;
@@@ -40,8 -39,7 +40,8 @@@ import static org.junit.Assert.assertEq
* @author Marko A. Rodriguez (http://markorodriguez.com)
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
+@RunWith(GremlinProcessRunner.class)
- public abstract class AddEdgeTest extends AbstractGremlinTest {
+ public abstract class AddEdgeTest extends AbstractGremlinProcessTest {
public abstract Traversal<Vertex, Edge> get_g_VX1X_asXaX_outXcreatedX_addOutEXcreatedBy_aX(final Object v1Id);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c20a9190/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
index 672c704,637892d..f3499a0
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MatchTest.java
@@@ -45,6 -59,6 +45,8 @@@ import static org.apache.tinkerpop.grem
import static org.apache.tinkerpop.gremlin.structure.P.neq;
import static org.junit.Assert.*;
++<<<<<<<HEAD
++
/**
* @author Joshua Shinavier (http://fortytwo.net)
* @author Marko A. Rodriguez (http://markorodriguez.com)
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c20a9190/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java
index 9ab0306,8545095..c2ed140
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SideEffectTest.java
@@@ -18,15 -18,14 +18,15 @@@
*/
package org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect;
- import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
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.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
- import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.junit.Test;
+import org.junit.runner.RunWith;
import java.util.ArrayList;
import java.util.Iterator;
@@@ -35,13 -34,12 +35,13 @@@ import java.util.List
import static org.apache.tinkerpop.gremlin.LoadGraphWith.GraphData.MODERN;
import static org.junit.Assert.*;
--
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
* @author Stephen Mallette (http://stephen.genoprime.com)
*/
+@RunWith(GremlinProcessRunner.class)
- public abstract class SideEffectTest extends AbstractGremlinTest {
+ public abstract class SideEffectTest extends AbstractGremlinProcessTest {
++
public abstract Traversal<Vertex, String> get_g_VX1X_sideEffectXstore_aX_name(final Object v1Id);
public abstract Traversal<Vertex, String> get_g_VX1X_out_sideEffectXincr_cX_name(final Object v1Id);
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/c20a9190/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
----------------------------------------------------------------------
diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
index 30234f6,198c9eb..9da02d5
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/sideEffect/SubgraphTest.java
@@@ -21,15 -22,13 +22,14 @@@ import org.apache.commons.configuration
import org.apache.tinkerpop.gremlin.FeatureRequirement;
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.process.traversal.Traversal;
import org.apache.tinkerpop.gremlin.process.traversal.TraversalEngine;
- import org.apache.tinkerpop.gremlin.process.UseEngine;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.Vertex;
- import org.apache.commons.configuration.Configuration;
import org.junit.Test;
+import org.junit.runner.RunWith;
import java.util.Arrays;