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/09/03 17:33:50 UTC
[30/31] incubator-tinkerpop git commit: Merge remote-tracking branch
'origin/tp30'
Merge remote-tracking branch 'origin/tp30'
Conflicts:
gremlin-console/pom.xml
gremlin-core/pom.xml
gremlin-driver/pom.xml
gremlin-groovy-test/pom.xml
gremlin-groovy/pom.xml
gremlin-server/pom.xml
gremlin-shaded/pom.xml
gremlin-test/pom.xml
hadoop-gremlin/pom.xml
neo4j-gremlin/pom.xml
neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/process/traversal/step/sideEffect/Neo4jGraphStep.java
pom.xml
tinkergraph-gremlin/pom.xml
tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/process/traversal/step/sideEffect/TinkerGraphStep.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/9fd51293
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9fd51293
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9fd51293
Branch: refs/heads/master
Commit: 9fd5129369927d15d25860e7b992044b912609ba
Parents: 2253c67 5a38139
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Thu Sep 3 11:20:24 2015 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Thu Sep 3 11:20:24 2015 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 35 +-
RELEASE.asciidoc | 46 ++-
gremlin-console/src/main/LICENSE | 36 +-
gremlin-console/src/main/NOTICE | 59 +--
.../gremlin/process/computer/VertexProgram.java | 4 +
.../computer/bulkloading/BulkLoader.java | 115 ++++++
.../bulkloading/BulkLoaderVertexProgram.java | 407 +++++++++++++++++++
.../bulkloading/IncrementalBulkLoader.java | 150 +++++++
.../util/AbstractVertexProgramBuilder.java | 5 +-
.../ComputerVerificationStrategy.java | 7 +
.../tinkerpop/gremlin/structure/Graph.java | 13 +
.../gremlin/structure/io/gryo/GryoMapper.java | 3 +-
.../structure/io/gryo/PairSerializer.java | 42 ++
.../traversal/step/filter/GroovyHasTest.groovy | 5 +
.../traversal/step/map/GroovyOrderTest.groovy | 4 +-
.../process/GroovyProcessComputerSuite.java | 24 +-
.../AbstractImportCustomizerProvider.java | 2 +
gremlin-server/src/main/LICENSE | 33 +-
gremlin-server/src/main/NOTICE | 90 +---
.../gremlin/process/ProcessComputerSuite.java | 2 +
.../BulkLoaderVertexProgramTest.java | 82 ++++
.../process/traversal/step/filter/HasTest.java | 20 +-
.../process/traversal/step/map/OrderTest.java | 22 +-
hadoop-gremlin/pom.xml | 6 +
.../step/sideEffect/Neo4jGraphStep.java | 4 +-
.../gremlin/neo4j/structure/Neo4jGraph.java | 5 +
.../step/sideEffect/TinkerGraphStep.java | 4 +-
.../tinkergraph/structure/TinkerGraph.java | 5 +
28 files changed, 1042 insertions(+), 188 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9fd51293/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9fd51293/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/Graph.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9fd51293/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoMapper.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9fd51293/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
----------------------------------------------------------------------
diff --cc gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
index dfde060,47301e7..6382ced
--- a/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
+++ b/gremlin-groovy-test/src/main/java/org/apache/tinkerpop/gremlin/process/GroovyProcessComputerSuite.java
@@@ -42,7 -43,26 +43,27 @@@ import org.apache.tinkerpop.gremlin.pro
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovySimplePathTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyTailTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.filter.GroovyWhereTest;
- import org.apache.tinkerpop.gremlin.process.traversal.step.map.*;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyAddEdgeTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyCoalesceTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyConstantTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyCountTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyFoldTest;
++import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyLoopsTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMapKeysTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMapTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMapValuesTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMatchTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMaxTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMeanTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyMinTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyOrderTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyPathTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyPropertiesTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovySelectTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovySumTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyUnfoldTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyValueMapTest;
+ import org.apache.tinkerpop.gremlin.process.traversal.step.map.GroovyVertexTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroovyAggregateTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroovyGroupCountTest;
import org.apache.tinkerpop.gremlin.process.traversal.step.sideEffect.GroovyGroupTest;
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9fd51293/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/AbstractImportCustomizerProvider.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9fd51293/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/ProcessComputerSuite.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9fd51293/hadoop-gremlin/pom.xml
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9fd51293/neo4j-gremlin/src/main/java/org/apache/tinkerpop/gremlin/neo4j/structure/Neo4jGraph.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/9fd51293/tinkergraph-gremlin/src/main/java/org/apache/tinkerpop/gremlin/tinkergraph/structure/TinkerGraph.java
----------------------------------------------------------------------