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/04/21 12:43:37 UTC
[10/39] incubator-tinkerpop git commit: Merge branch 'master' into
io-docs
Merge branch 'master' into io-docs
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/bfc65661
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/bfc65661
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/bfc65661
Branch: refs/heads/refactor-io
Commit: bfc656618ed8b0cdbda40df420cb4ac3dcdedca4
Parents: 9811e4e 107e265
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Apr 20 16:17:06 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Apr 20 16:17:06 2015 +0200
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 +
README.asciidoc | 2 +-
data/grateful-dead-vertices.kryo | Bin 1028298 -> 975214 bytes
data/grateful-dead.kryo | Bin 515409 -> 493339 bytes
data/tinkerpop-classic-typed.json | 2 +-
data/tinkerpop-classic-vertices.kryo | Bin 1323 -> 1179 bytes
data/tinkerpop-classic-vertices.ldjson | 12 +-
data/tinkerpop-classic.json | 2 +-
data/tinkerpop-classic.kryo | Bin 817 -> 765 bytes
data/tinkerpop-crew-vertices.kryo | Bin 2743 -> 2575 bytes
data/tinkerpop-crew.kryo | Bin 1916 -> 1858 bytes
data/tinkerpop-modern-vertices.kryo | Bin 1439 -> 1295 bytes
data/tinkerpop-modern.kryo | Bin 877 -> 825 bytes
.../gremlin/process/traversal/Path.java | 9 +-
.../process/traversal/TraversalStrategies.java | 4 -
.../gremlin/process/traversal/Traverser.java | 12 +-
.../gremlin/process/traversal/util/Metrics.java | 10 -
.../gremlin/structure/io/gryo/GryoMapper.java | 206 ++-----------------
.../gremlin/structure/io/gryo/GryoReader.java | 18 +-
.../gremlin/structure/io/gryo/GryoWriter.java | 34 ++-
.../structure/util/batch/BatchGraph.java | 21 +-
.../structure/io/gryo/GryoReaderWriterTest.java | 102 +++++++++
.../driver/message/ResponseStatusCode.java | 6 +-
.../ser/AbstractJsonMessageSerializerV1d0.java | 37 ++--
.../driver/ser/GryoMessageSerializerV1d0.java | 95 ++++-----
.../driver/ser/JsonMessageSerializerV1d0.java | 16 +-
.../ser/GryoMessageSerializerV1D0Test.java | 21 ++
gremlin-server/data/sample.kryo | Bin 4781783 -> 4781767 bytes
gremlin-server/pom.xml | 176 ----------------
.../handler/HttpGremlinEndpointHandler.java | 4 +-
.../gremlin/server/handler/IteratorHandler.java | 6 +-
.../handler/NioGremlinResponseEncoder.java | 20 +-
.../server/handler/OpExecutorHandler.java | 6 +-
.../server/handler/OpSelectorHandler.java | 6 +-
.../handler/WsGremlinResponseEncoder.java | 22 +-
.../src/test/resources/application.conf | 26 ---
gremlin-server/src/test/resources/gatling.conf | 109 ----------
.../src/test/resources/logback-test.xml | 39 ----
.../GremlinServerAdditionSimulation.scala | 96 ---------
.../tinkerpop/gremlin/AbstractGremlinSuite.java | 19 +-
.../apache/tinkerpop/gremlin/GraphProvider.java | 64 +++---
.../gremlin/process/ProcessComputerSuite.java | 2 +-
.../structure/StructureStandardSuite.java | 10 +-
.../structure/io/graphml/grateful-dead.xml | 18 +-
.../structure/io/graphml/tinkerpop-classic.xml | 18 +-
.../structure/io/graphml/tinkerpop-modern.xml | 18 +-
.../graphson/tinkerpop-classic-normalized.json | 2 +-
.../io/graphson/tinkerpop-classic-typed.json | 2 +-
.../io/graphson/tinkerpop-classic.json | 2 +-
.../io/gryo/grateful-dead-vertices.kryo | Bin 1028298 -> 975214 bytes
.../structure/io/gryo/grateful-dead.kryo | Bin 515409 -> 493339 bytes
.../io/gryo/tinkerpop-classic-vertices.kryo | Bin 1323 -> 1179 bytes
.../structure/io/gryo/tinkerpop-classic.kryo | Bin 817 -> 765 bytes
.../io/gryo/tinkerpop-crew-vertices.kryo | Bin 2743 -> 2575 bytes
.../structure/io/gryo/tinkerpop-crew.kryo | Bin 1916 -> 1858 bytes
.../io/gryo/tinkerpop-modern-vertices.kryo | Bin 1439 -> 1295 bytes
.../structure/io/gryo/tinkerpop-modern.kryo | Bin 877 -> 825 bytes
.../structure/io/gryo/GryoRecordReader.java | 8 +-
tinkergraph-gremlin/pom.xml | 30 ++-
.../tinkergraph/structure/TinkerGraph.java | 36 ++--
.../tinkergraph/structure/TinkerGraphTest.java | 23 ++-
61 files changed, 424 insertions(+), 950 deletions(-)
----------------------------------------------------------------------