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/09/30 04:47:09 UTC
[2/4] incubator-tinkerpop git commit: Merge branch 'master' into
thread-issue-tinkergraph
Merge branch 'master' into thread-issue-tinkergraph
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/18e5ea9f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/18e5ea9f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/18e5ea9f
Branch: refs/heads/master
Commit: 18e5ea9fe184ab60b63d7b21df93de84acac2536
Parents: a23dfa4 efa2417
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Sep 29 16:06:47 2015 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Sep 29 16:06:47 2015 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 4 +-
docs/javadoc/overview.html | 23 ++
docs/src/implementations.asciidoc | 2 +-
.../gremlin/structure/io/gryo/GryoMapper.java | 45 +++-
.../gremlin/structure/io/gryo/GryoPool.java | 229 +++++++++++++------
.../gremlin/structure/io/gryo/GryoReader.java | 62 ++---
.../structure/io/gryo/GryoMapperTest.java | 21 ++
.../gremlin/structure/io/gryo/GryoPoolTest.java | 19 +-
.../gremlin/driver/ConnectionPool.java | 19 +-
.../tinkerpop/gremlin/driver/Handler.java | 10 +-
.../driver/ser/GryoMessageSerializerV1d0.java | 2 +-
.../step/sideEffect/GroupCountTest.java | 1 -
hadoop-gremlin/conf/hadoop-gryo.properties | 2 +-
hadoop-gremlin/conf/hadoop-script.properties | 2 +-
.../hadoop/structure/io/HadoopPools.java | 14 +-
pom.xml | 5 +
spark-gremlin/pom.xml | 2 +-
.../io/gryo/GryoDeserializationStream.groovy | 60 +++++
.../process/computer/SparkGraphComputer.java | 8 -
.../spark/process/computer/io/InputRDD.java | 2 +-
.../io/gryo/GryoSerializationStream.java | 56 +++++
.../spark/structure/io/gryo/GryoSerializer.java | 124 ++++++++++
.../io/gryo/GryoSerializerInstance.java | 83 +++++++
.../computer/HadoopSparkGraphProvider.java | 5 +-
24 files changed, 655 insertions(+), 145 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/18e5ea9f/spark-gremlin/src/main/java/org/apache/tinkerpop/gremlin/spark/process/computer/SparkGraphComputer.java
----------------------------------------------------------------------