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/04/07 13:25:32 UTC
[50/50] [abbrv] incubator-tinkerpop git commit: Merge remote-tracking
branch 'origin/master' into variables
Merge remote-tracking branch 'origin/master' into variables
Conflicts:
tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.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/7783d4fd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7783d4fd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7783d4fd
Branch: refs/heads/variables
Commit: 7783d4fd5192aa6d49bb5e4ec7f197dab3e9c0b3
Parents: 0f15f5e ce1c1a6
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 7 07:24:00 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 7 07:24:00 2015 -0400
----------------------------------------------------------------------
.travis.yml | 42 -
CHANGELOG.asciidoc | 13 +-
DISCLAIMER | 7 +
DISCLAIMER.txt | 7 -
LICENSE | 202 +
LICENSE.txt | 202 -
NOTICE | 14 +
NOTICE.txt | 18 -
README.asciidoc | 28 +-
docs/preprocessor/preprocess.sh | 7 +-
docs/src/gremlin-applications.asciidoc | 72 +-
docs/src/implementations.asciidoc | 205 +-
docs/src/the-graphcomputer.asciidoc | 79 +-
docs/src/the-traversal.asciidoc | 108 +-
docs/static/images/spark-algorithm.png | Bin 0 -> 285061 bytes
docs/static/images/tinkerpop3.graffle | 5024 +++++++++++++++++-
gremlin-algorithm/pom.xml | 46 -
.../algorithm/generator/AbstractGenerator.java | 109 -
.../algorithm/generator/CommunityGenerator.java | 234 -
.../algorithm/generator/CopyDistribution.java | 47 -
.../algorithm/generator/Distribution.java | 70 -
.../generator/DistributionGenerator.java | 181 -
.../gremlin/algorithm/generator/Generator.java | 34 -
.../algorithm/generator/NormalDistribution.java | 76 -
.../generator/PowerLawDistribution.java | 76 -
.../algorithm/generator/SizableIterable.java | 88 -
gremlin-console/pom.xml | 6 +-
gremlin-console/src/assembly/distribution.xml | 11 +-
gremlin-console/src/assembly/standalone.xml | 20 +-
gremlin-console/src/main/LICENSE | 315 ++
gremlin-console/src/main/NOTICE | 447 ++
gremlin-console/src/main/bin/gremlin.sh | 2 +-
.../tinkerpop/gremlin/console/Console.groovy | 24 +-
.../console/commands/GremlinSetCommand.groovy | 70 +
.../console/commands/InstallCommand.groovy | 37 +-
.../console/plugin/GephiRemoteAcceptor.groovy | 25 +-
.../AbstractGremlinServerIntegrationTest.java | 17 -
.../DriverRemoteAcceptorIntegrateTest.java | 7 +-
.../plugin/gremlin-server-integration.yaml | 3 +-
gremlin-core/pom.xml | 4 +-
.../process/computer/ComputerResult.java | 4 +-
.../gremlin/process/computer/GraphComputer.java | 7 +-
.../gremlin/process/computer/Messenger.java | 4 +-
.../gremlin/process/computer/VertexProgram.java | 2 -
.../peerpressure/PeerPressureVertexProgram.java | 6 +-
.../computer/lambda/LambdaMapReduce.java | 290 -
.../computer/lambda/LambdaVertexProgram.java | 254 -
.../ranking/pagerank/PageRankVertexProgram.java | 6 +-
.../computer/traversal/SingleMessenger.java | 7 +-
.../computer/traversal/TraverserExecutor.java | 13 +-
.../process/computer/util/ComputerGraph.java | 6 +
.../computer/util/VertexProgramPool.java | 2 +-
.../traversal/dsl/graph/GraphTraversal.java | 12 +-
.../traversal/step/util/NoOpBarrierStep.java | 40 +
.../strategy/decoration/ElementIdStrategy.java | 105 +-
.../tinkerpop/gremlin/structure/Graph.java | 4 +-
.../gremlin/structure/util/ElementHelper.java | 13 +
.../structure/util/detached/DetachedEdge.java | 7 +-
.../util/detached/DetachedVertexProperty.java | 6 +
.../ElementIdStrategyTraverseTest.java | 110 +
gremlin-driver/pom.xml | 4 +-
.../tinkerpop/gremlin/driver/ResultSet.java | 5 +-
gremlin-groovy-test/pom.xml | 4 +-
.../computer/GroovyGraphComputerTest.groovy | 228 -
.../process/GroovyProcessComputerSuite.java | 3 -
gremlin-groovy/pom.xml | 9 +-
.../groovy/util/DependencyGrabber.groovy | 53 +-
.../AbstractImportCustomizerProvider.java | 14 +-
gremlin-server/conf/gremlin-server-neo4j.yaml | 59 -
gremlin-server/conf/neo4j-empty.properties | 20 -
gremlin-server/data/sample.kryo | Bin 0 -> 4781783 bytes
gremlin-server/pom.xml | 20 +-
gremlin-server/scripts/empty-sample.groovy | 22 +
gremlin-server/scripts/generate-sample.groovy | 23 -
gremlin-server/scripts/load-sample.groovy | 23 +
gremlin-server/scripts/sample.groovy | 22 -
gremlin-server/src/assembly/distribution.xml | 11 +-
gremlin-server/src/assembly/standalone.xml | 4 +
gremlin-server/src/main/LICENSE | 305 ++
gremlin-server/src/main/NOTICE | 416 ++
gremlin-server/src/main/bin/gremlin-server.sh | 5 +-
.../server/GremlinDriverIntegrateTest.java | 7 +-
.../server/GremlinTraversalPerformanceTest.java | 2 +-
.../server/gremlin-server-integration.yaml | 2 +-
.../server/gremlin-server-performance.yaml | 2 +-
gremlin-shaded/pom.xml | 4 +-
gremlin-test/pom.xml | 14 +-
.../tinkerpop/gremlin/AbstractGremlinSuite.java | 61 +-
.../tinkerpop/gremlin/AbstractGremlinTest.java | 4 +
.../algorithm/generator/AbstractGenerator.java | 109 +
.../algorithm/generator/CommunityGenerator.java | 234 +
.../algorithm/generator/CopyDistribution.java | 47 +
.../algorithm/generator/Distribution.java | 70 +
.../generator/DistributionGenerator.java | 181 +
.../gremlin/algorithm/generator/Generator.java | 34 +
.../algorithm/generator/NormalDistribution.java | 76 +
.../generator/PowerLawDistribution.java | 76 +
.../algorithm/generator/SizableIterable.java | 88 +
.../gremlin/process/ProcessComputerSuite.java | 4 +
.../gremlin/process/ProcessStandardSuite.java | 2 +
.../process/computer/GraphComputerTest.java | 890 ++--
.../ranking/PageRankVertexProgramTest.java | 2 +-
.../traversal/step/filter/DedupTest.java | 6 +-
.../traversal/step/filter/ExceptTest.java | 6 +-
.../traversal/step/filter/HasNotTest.java | 7 +-
.../process/traversal/step/filter/HasTest.java | 2 +-
.../process/traversal/step/map/OrderTest.java | 14 +-
.../process/traversal/step/map/VertexTest.java | 10 +-
.../traversal/step/sideEffect/ProfileTest.java | 10 +-
.../ElementIdStrategyProcessTest.java | 161 +
.../decoration/SubgraphStrategyProcessTest.java | 2 +-
.../structure/GraphConstructionTest.java | 3 +-
.../tinkerpop/gremlin/structure/IoTest.java | 175 +-
.../gremlin/structure/SerializationTest.java | 20 +-
.../util/detached/DetachedEdgeTest.java | 9 +-
.../detached/DetachedVertexPropertyTest.java | 9 +-
.../util/detached/DetachedVertexTest.java | 15 +-
hadoop-gremlin/pom.xml | 9 +-
.../computer/giraph/GiraphComputeVertex.java | 6 +-
.../process/computer/giraph/GiraphMemory.java | 8 +-
.../computer/giraph/GiraphMessenger.java | 8 +-
.../computer/giraph/GiraphWorkerContext.java | 4 +-
.../process/computer/spark/SparkExecutor.java | 164 +-
.../computer/spark/SparkGraphComputer.java | 65 +-
.../process/computer/spark/SparkMapEmitter.java | 9 +-
.../computer/spark/SparkMessagePayload.java | 49 -
.../process/computer/spark/SparkMessenger.java | 82 +
.../process/computer/spark/SparkPayload.java | 48 -
.../computer/spark/SparkReduceEmitter.java | 9 +-
.../computer/spark/SparkVertexPayload.java | 122 -
.../computer/spark/payload/MessagePayload.java | 38 +
.../process/computer/spark/payload/Payload.java | 30 +
.../spark/payload/ViewIncomingPayload.java | 98 +
.../spark/payload/ViewOutgoingPayload.java | 49 +
.../computer/spark/payload/ViewPayload.java | 42 +
.../hadoop/structure/HadoopConfiguration.java | 4 +-
.../gremlin/hadoop/structure/HadoopGraph.java | 12 +-
neo4j-gremlin/LICENSE.txt | 687 ---
neo4j-gremlin/pom.xml | 203 -
.../neo4j/groovy/plugin/Neo4jGremlinPlugin.java | 53 -
.../step/sideEffect/Neo4jGraphStep.java | 242 -
.../step/util/Neo4jCypherIterator.java | 66 -
.../optimization/Neo4jGraphStepStrategy.java | 76 -
.../gremlin/neo4j/structure/Neo4jEdge.java | 88 -
.../gremlin/neo4j/structure/Neo4jElement.java | 111 -
.../gremlin/neo4j/structure/Neo4jGraph.java | 600 ---
.../neo4j/structure/Neo4jGraphVariables.java | 178 -
.../gremlin/neo4j/structure/Neo4jHelper.java | 85 -
.../gremlin/neo4j/structure/Neo4jProperty.java | 99 -
.../gremlin/neo4j/structure/Neo4jVertex.java | 276 -
.../neo4j/structure/Neo4jVertexProperty.java | 211 -
...inkerpop.gremlin.groovy.plugin.GremlinPlugin | 1 -
.../neo4j/AbstractNeo4jGraphProvider.java | 156 -
.../gremlin/neo4j/BaseNeo4jGraphTest.java | 101 -
.../neo4j/DefaultNeo4jGraphProvider.java | 43 -
.../NoMetaMultiPropertyNeo4jGraphProvider.java | 42 -
.../neo4j/process/Neo4jCypherStartTest.java | 117 -
.../process/Neo4jGraphProcessStandardTest.java | 35 -
.../Neo4jGraphGroovyProcessStandardTest.java | 33 -
.../Neo4jGraphStructureStandardTest.java | 34 -
.../gremlin/neo4j/structure/Neo4jGraphTest.java | 740 ---
...eo4jGraphStructureStandardIntegrateTest.java | 34 -
pom.xml | 127 +-
tinkergraph-gremlin/pom.xml | 10 +-
.../process/computer/TinkerMessenger.java | 17 +-
.../tinkergraph/structure/TinkerGraph.java | 4 +-
.../tinkergraph/structure/TinkerGraphTest.java | 50 +-
167 files changed, 9850 insertions(+), 8008 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7783d4fd/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
----------------------------------------------------------------------
diff --cc tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
index 72e3762,51d1b51..4d75cbb
--- a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
+++ b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraphTest.java
@@@ -20,18 -20,10 +20,19 @@@ package org.apache.tinkerpop.gremlin.ti
import org.apache.commons.io.FileUtils;
import org.apache.tinkerpop.gremlin.AbstractGremlinTest;
+import org.apache.tinkerpop.gremlin.groovy.jsr223.GremlinGroovyScriptEngine;
+import org.apache.tinkerpop.gremlin.process.traversal.Step;
+ import org.apache.tinkerpop.gremlin.TestHelper;
import org.apache.tinkerpop.gremlin.process.traversal.T;
import org.apache.tinkerpop.gremlin.process.traversal.Traversal;
+import org.apache.tinkerpop.gremlin.process.traversal.TraversalSource;
import org.apache.tinkerpop.gremlin.process.traversal.dsl.graph.GraphTraversalSource;
+import org.apache.tinkerpop.gremlin.process.traversal.engine.StandardTraversalEngine;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.filter.IsStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.map.PropertiesStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GraphStep;
+import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
import org.apache.tinkerpop.gremlin.structure.Direction;
import org.apache.tinkerpop.gremlin.structure.Edge;
import org.apache.tinkerpop.gremlin.structure.Graph;