Merge branch 'TINKERPOP-1321'
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/4bb9f36a Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/4bb9f36a Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/4bb9f36a Branch: refs/heads/TINKERPOP-1331 Commit: 4bb9f36ae11304fc469cd2fb4184bd31bd3a4d27 Parents: 406956d 45abdcc Author: Marko A. Rodriguez <okramma...@gmail.com> Authored: Tue Jun 7 06:46:29 2016 -0600 Committer: Marko A. Rodriguez <okramma...@gmail.com> Committed: Tue Jun 7 06:46:29 2016 -0600 ---------------------------------------------------------------------- .../process/computer/GiraphWorkerContext.java | 3 +- .../gremlin/structure/io/gryo/GryoMapper.java | 443 ++++++++++++------- .../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 +++++++ .../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 +- ...n.structure.io.gryo.kryoshim.KryoShimService | 1 + .../gremlin/hadoop/HadoopGraphProvider.java | 4 + .../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 + .../gremlin/spark/AbstractSparkTest.java | 4 + ...tratorGraphComputerProcessIntegrateTest.java | 33 ++ ...SparkHadoopGraphGryoRegistratorProvider.java | 56 +++ .../computer/SparkHadoopGraphProvider.java | 16 +- .../spark/structure/io/ToyGraphInputRDD.java | 3 +- 52 files changed, 2480 insertions(+), 477 deletions(-) ----------------------------------------------------------------------
