You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2015/12/03 21:31:30 UTC
[17/17] incubator-tinkerpop git commit: Merge branch 'master' into
TINKERPOP3-1014
Merge branch 'master' into TINKERPOP3-1014
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/9af66047
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/9af66047
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/9af66047
Branch: refs/heads/TINKERPOP3-1014
Commit: 9af660476ec291fa12a499bb60349c8244167509
Parents: 83b93e0 1134ad2
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Thu Dec 3 13:31:03 2015 -0700
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Thu Dec 3 13:31:03 2015 -0700
----------------------------------------------------------------------
.travis.yml | 5 +-
CHANGELOG.asciidoc | 6 +
docs/src/reference/the-traversal.asciidoc | 33 +++--
.../gremlin/process/traversal/Order.java | 28 +++-
.../traversal/dsl/graph/GraphTraversal.java | 20 ++-
.../traversal/step/map/SelectColumnStep.java | 68 ----------
.../traversal/step/util/FunctionComparator.java | 56 ++++++++
.../tinkerpop/gremlin/structure/Column.java | 39 +++++-
.../step/branch/GroovyLocalTest.groovy | 2 +-
.../traversal/step/map/GroovyOrderTest.groovy | 8 +-
.../process/GroovyProcessComputerSuite.java | 2 +
.../process/GroovyProcessStandardSuite.java | 2 +
.../groovy/engine/GremlinExecutorTest.java | 8 +-
.../jsr223/GremlinGroovyScriptEngineTest.java | 52 ++++---
.../BulkLoaderVertexProgramTest.java | 2 +-
.../process/traversal/step/map/OrderTest.java | 11 +-
.../structure/hdfs/HadoopEdgeIterator.java | 4 -
.../structure/hdfs/HadoopElementIterator.java | 35 ++---
.../structure/hdfs/HadoopVertexIterator.java | 4 -
.../HadoopGraphStructureStandardTest.java | 35 +++++
.../io/HadoopGraphStructureStandardTest.java | 35 -----
pom.xml | 10 +-
.../process/computer/SparkContextHelper.java | 39 ++++++
.../process/computer/SparkGraphComputer.java | 15 +-
.../computer/payload/MessagePayload.java | 5 +-
.../computer/payload/ViewIncomingPayload.java | 6 +-
.../computer/payload/ViewOutgoingPayload.java | 12 +-
.../spark/structure/io/InputRDDFormat.java | 136 +++++++++++++++++++
.../spark/structure/io/gryo/GryoSerializer.java | 6 +
.../io/gryo/WrappedArraySerializer.java | 46 +++++++
.../gremlin/spark/AbstractSparkTest.java | 43 ++++++
.../process/computer/LocalPropertyTest.java | 8 +-
.../computer/SparkHadoopGraphProvider.java | 22 ++-
.../spark/structure/io/InputOutputRDDTest.java | 7 +-
.../spark/structure/io/InputRDDTest.java | 28 +++-
.../spark/structure/io/OutputRDDTest.java | 7 +-
.../io/PersistedInputOutputRDDTest.java | 14 +-
.../spark/structure/io/ToyGraphInputRDD.java | 73 ++++++++++
.../structure/TinkerGraphPlayTest.java | 7 +-
39 files changed, 698 insertions(+), 241 deletions(-)
----------------------------------------------------------------------