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 2016/06/07 13:57:35 UTC
[34/34] incubator-tinkerpop git commit: Merge branch 'master' into
TINKERPOP-1278
Merge branch 'master' into TINKERPOP-1278
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/5ab566cf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/5ab566cf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/5ab566cf
Branch: refs/heads/TINKERPOP-1278
Commit: 5ab566cffcd34906ef23b5674036bc840cc316a6
Parents: fb29b25 3aa0e37
Author: Marko A. Rodriguez <ok...@gmail.com>
Authored: Tue Jun 7 07:56:48 2016 -0600
Committer: Marko A. Rodriguez <ok...@gmail.com>
Committed: Tue Jun 7 07:56:48 2016 -0600
----------------------------------------------------------------------
CHANGELOG.asciidoc | 2 +
docs/src/dev/provider/index.asciidoc | 10 +-
docs/src/recipes/between-vertices.asciidoc | 14 +-
.../src/reference/gremlin-applications.asciidoc | 5 +-
.../reference/implementations-hadoop.asciidoc | 4 +-
.../upgrade/release-3.2.x-incubating.asciidoc | 6 +-
.../process/computer/GiraphWorkerContext.java | 3 +-
.../gremlin/structure/io/gryo/GryoMapper.java | 441 ++++++++++++-------
.../gremlin/structure/io/gryo/GryoPool.java | 1 +
.../structure/io/gryo/GryoSerializers.java | 40 +-
.../structure/io/gryo/JavaTimeSerializers.java | 125 ++----
.../structure/io/gryo/PairSerializer.java | 11 +-
.../structure/io/gryo/TypeRegistration.java | 82 ++++
.../structure/io/gryo/URISerializer.java | 23 +-
.../structure/io/gryo/UUIDSerializer.java | 24 +-
.../structure/io/gryo/kryoshim/InputShim.java | 38 ++
.../structure/io/gryo/kryoshim/KryoShim.java | 41 ++
.../io/gryo/kryoshim/KryoShimService.java | 99 +++++
.../io/gryo/kryoshim/KryoShimServiceLoader.java | 215 +++++++++
.../structure/io/gryo/kryoshim/OutputShim.java | 40 ++
.../io/gryo/kryoshim/SerializerShim.java | 36 ++
.../io/gryo/kryoshim/package-info.java | 55 +++
.../kryoshim/shaded/ShadedInputAdapter.java | 66 +++
.../gryo/kryoshim/shaded/ShadedKryoAdapter.java | 67 +++
.../kryoshim/shaded/ShadedOutputAdapter.java | 71 +++
.../shaded/ShadedSerializerAdapter.java | 54 +++
.../io/gryo/kryoshim/shaded/package-info.java | 25 ++
.../util/star/StarGraphGryoSerializer.java | 130 +-----
.../util/star/StarGraphSerializer.java | 150 +++++++
.../gremlin/groovy/engine/GremlinExecutor.java | 12 +-
.../gremlin/groovy/engine/ScriptEngines.java | 28 +-
.../jsr223/GremlinGroovyScriptEngine.java | 8 +-
.../ConfigurationCustomizerProvider.java | 83 ++++
.../groovy/jsr223/BaseScriptForTesting.java | 30 ++
.../GremlinGroovyScriptEngineConfigTest.java | 40 ++
.../ConfigurationCustomizerProviderTest.java | 78 ++++
.../tinkerpop/gremlin/server/GremlinServer.java | 2 +-
.../gremlin/server/BaseScriptForTesting.java | 30 ++
.../server/GremlinServerIntegrateTest.java | 50 ++-
.../hadoop/process/computer/HadoopCombine.java | 3 +-
.../hadoop/process/computer/HadoopMap.java | 3 +-
.../hadoop/process/computer/HadoopReduce.java | 3 +-
.../structure/io/HadoopPoolShimService.java | 75 ++++
.../hadoop/structure/io/HadoopPools.java | 1 +
.../structure/io/HadoopPoolsConfigurable.java | 4 +-
.../hadoop/structure/io/ObjectWritable.java | 25 +-
.../hadoop/structure/io/VertexWritable.java | 39 +-
.../structure/io/gryo/GryoRecordReader.java | 3 +-
.../structure/io/gryo/GryoRecordWriter.java | 4 +-
.../structure/io/script/ScriptInputFormat.java | 5 +
.../structure/io/script/ScriptOutputFormat.java | 6 +
...n.structure.io.gryo.kryoshim.KryoShimService | 1 +
.../gremlin/hadoop/HadoopGraphProvider.java | 3 +
pom.xml | 3 +
.../spark/process/computer/SparkExecutor.java | 14 +-
.../structure/io/gryo/GryoRegistrator.java | 238 ++++++++++
.../spark/structure/io/gryo/GryoSerializer.java | 2 +-
.../io/gryo/IoRegistryAwareKryoSerializer.java | 116 +++++
.../io/gryo/ObjectWritableSerializer.java | 12 +-
.../io/gryo/VertexWritableSerializer.java | 12 +-
.../kryoshim/unshaded/UnshadedInputAdapter.java | 78 ++++
.../kryoshim/unshaded/UnshadedKryoAdapter.java | 74 ++++
.../unshaded/UnshadedKryoShimService.java | 154 +++++++
.../unshaded/UnshadedOutputAdapter.java | 83 ++++
.../unshaded/UnshadedSerializerAdapter.java | 57 +++
...n.structure.io.gryo.kryoshim.KryoShimService | 1 +
...tratorGraphComputerProcessIntegrateTest.java | 33 ++
...SparkHadoopGraphGryoRegistratorProvider.java | 52 +++
.../computer/SparkHadoopGraphProvider.java | 8 +-
.../spark/structure/io/ToyGraphInputRDD.java | 3 +-
70 files changed, 2843 insertions(+), 511 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/5ab566cf/pom.xml
----------------------------------------------------------------------