Merge branch 'TINKERPOP-1274' of https://github.com/newkek/incubator-tinkerpop
into TINKERPOP-1274
Conflicts:
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONMapper.java
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/graphson/GraphSONModule.java
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/10abe8e1
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/10abe8e1
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/10abe8e1
Branch: refs/heads/TINKERPOP-1274
Commit: 10abe8e14caa2312bc89e3289978ef417831b4ce
Parents: f5b64fa 16e26b5
Author: Stephen Mallette <[email protected]>
Authored: Thu Jun 30 13:32:48 2016 -0400
Committer: Stephen Mallette <[email protected]>
Committed: Thu Jun 30 13:32:48 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 30 +-
DISCLAIMER | 7 -
README.asciidoc | 8 +-
bin/process-docs.sh | 2 +-
bin/publish-docs.sh | 15 +
bin/validate-distribution.sh | 9 +-
docs/preprocessor/awk/prepare.awk | 4 +
docs/preprocessor/preprocess-file.sh | 10 +-
docs/preprocessor/preprocess.sh | 44 +-
docs/src/dev/developer/administration.asciidoc | 5 +-
docs/src/dev/developer/contributing.asciidoc | 676 +-
.../developer/development-environment.asciidoc | 99 +
docs/src/dev/developer/for-committers.asciidoc | 394 +
docs/src/dev/developer/index.asciidoc | 12 +
docs/src/dev/provider/index.asciidoc | 82 +-
docs/src/recipes/between-vertices.asciidoc | 28 +-
docs/src/recipes/centrality.asciidoc | 168 +
docs/src/recipes/cycle-detection.asciidoc | 61 +
.../src/recipes/if-then-based-grouping.asciidoc | 13 +-
docs/src/recipes/index.asciidoc | 8 +-
docs/src/recipes/shortest-path.asciidoc | 19 +-
docs/src/recipes/style-guide.asciidoc | 81 +
.../src/reference/gremlin-applications.asciidoc | 10 +-
.../reference/implementations-hadoop.asciidoc | 80 +-
.../reference/implementations-intro.asciidoc | 2 +-
.../reference/implementations-neo4j.asciidoc | 77 +-
docs/src/reference/the-graph.asciidoc | 132 +-
docs/src/reference/the-traversal.asciidoc | 35 +-
.../tutorials/getting-started/index.asciidoc | 2 +-
.../gremlin-language-variants/index.asciidoc | 6 +-
.../upgrade/release-3.1.x-incubating.asciidoc | 2 +-
.../upgrade/release-3.2.x-incubating.asciidoc | 46 +-
docs/static/images/betweeness-example.png | Bin 0 -> 8465 bytes
docs/static/images/graph-cycle.png | Bin 0 -> 774901 bytes
docs/static/images/neo4j-ha.png | Bin 0 -> 108249 bytes
docs/static/images/tinkerpop3.graffle | 23433 ++++++++---------
docs/static/resources/gremlin-jython.py | 2 +-
docs/static/resources/gremlin-python.py | 2 +-
.../process/computer/GiraphGraphComputer.java | 59 +-
.../process/computer/GiraphWorkerContext.java | 3 +-
gremlin-console/src/assembly/distribution.xml | 4 -
.../tinkerpop/gremlin/console/Console.groovy | 16 +-
.../groovy/plugin/DriverRemoteAcceptor.java | 10 +-
.../DriverRemoteAcceptorIntegrateTest.java | 8 +
.../gremlin/process/computer/GraphFilter.java | 11 +
.../gremlin/process/computer/ProgramPhase.java | 40 +
.../peerpressure/PeerPressureVertexProgram.java | 21 +-
.../computer/traversal/MasterExecutor.java | 65 +-
.../traversal/MemoryTraversalSideEffects.java | 28 +-
.../computer/traversal/SingleMessenger.java | 49 -
.../traversal/TraversalVertexProgram.java | 102 +-
.../computer/traversal/TraverserExecutor.java | 203 -
.../computer/traversal/WorkerExecutor.java | 245 +
.../traversal/step/VertexComputing.java | 6 +-
.../step/map/PageRankVertexProgramStep.java | 8 +-
.../step/map/PeerPressureVertexProgramStep.java | 16 +-
.../step/map/ProgramVertexProgramStep.java | 9 +-
.../step/map/TraversalVertexProgramStep.java | 13 +-
.../traversal/step/map/VertexProgramStep.java | 21 +-
.../optimization/GraphFilterStrategy.java | 3 +-
.../process/computer/util/EmptyMemory.java | 91 +
.../process/computer/util/SingleMessenger.java | 49 +
.../gremlin/process/remote/RemoteGraph.java | 20 +-
.../process/traversal/step/map/GroupStep.java | 311 +-
.../traversal/step/map/SelectOneStep.java | 2 +-
.../step/sideEffect/GroupSideEffectStep.java | 61 +-
.../traversal/step/sideEffect/SubgraphStep.java | 19 +-
.../traversal/step/util/ImmutablePath.java | 3 +-
.../process/traversal/step/util/Parameters.java | 18 +-
.../decoration/HaltedTraverserStrategy.java | 71 +
.../strategy/decoration/SubgraphStrategy.java | 40 +-
.../optimization/RangeByIsCountStrategy.java | 54 +-
.../traversal/util/DefaultTraversal.java | 5 +-
.../traversal/util/TraversalExplanation.java | 69 +-
.../process/traversal/util/TraversalHelper.java | 2 +-
.../structure/io/graphml/GraphMLReader.java | 3 +-
.../structure/io/graphson/GraphSONMapper.java | 90 +-
.../structure/io/graphson/GraphSONModule.java | 90 +-
.../structure/io/graphson/GraphSONReader.java | 8 +-
.../io/graphson/GraphSONSerializerProvider.java | 15 +-
.../io/graphson/GraphSONSerializersV1d0.java | 2 +-
.../io/graphson/GraphSONSerializersV2d0.java | 480 +
.../io/graphson/GraphSONTypeDeserializer.java | 201 +
.../io/graphson/GraphSONTypeIdResolver.java | 140 +
.../graphson/GraphSONTypeResolverBuilder.java | 60 +
.../io/graphson/GraphSONTypeSerializer.java | 160 +
.../structure/io/graphson/GraphSONUtil.java | 29 +
.../structure/io/graphson/GraphSONWriter.java | 11 +-
.../io/graphson/JavaTimeSerializersV2d0.java | 323 +
.../io/graphson/JavaUtilSerializersV2d0.java | 116 +
.../structure/io/graphson/JsonParserConcat.java | 81 +
.../io/graphson/LegacyGraphSONReader.java | 4 +-
.../io/graphson/TinkerPopJacksonModule.java | 58 +
.../io/graphson/ToStringGraphSONSerializer.java | 41 +
.../gremlin/structure/io/gryo/GryoMapper.java | 439 +-
.../gremlin/structure/io/gryo/GryoPool.java | 1 +
.../structure/io/gryo/GryoSerializers.java | 52 +-
.../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/DirectionalStarGraph.java | 39 +
.../star/StarGraphGraphSONDeserializer.java | 91 +
.../util/star/StarGraphGraphSONSerializer.java | 250 -
.../star/StarGraphGraphSONSerializerV1d0.java | 178 +
.../star/StarGraphGraphSONSerializerV2d0.java | 165 +
.../util/star/StarGraphGryoSerializer.java | 130 +-
.../util/star/StarGraphSerializer.java | 150 +
.../RangeByIsCountStrategyTest.java | 73 +-
.../util/TraversalExplanationTest.java | 61 +-
.../GraphSONMapperEmbeddedTypeTest.java | 19 +-
.../io/graphson/GraphSONMapperTest.java | 17 +-
...aphSONMapperV2d0PartialEmbeddedTypeTest.java | 269 +
.../structure/io/gryo/GryoMapperTest.java | 63 +-
.../tinkerpop/gremlin/driver/ResultQueue.java | 86 +-
.../tinkerpop/gremlin/driver/ResultSet.java | 6 +-
.../driver/remote/DriverRemoteConnection.java | 3 +-
.../AbstractGraphSONMessageSerializerV2d0.java | 248 +
.../ser/AbstractGryoMessageSerializerV1d0.java | 311 +
.../GraphSONMessageSerializerGremlinV2d0.java | 68 +
.../ser/GraphSONMessageSerializerV2d0.java | 124 +
.../ser/GryoLiteMessageSerializerV1d0.java | 164 +
.../driver/ser/GryoMessageSerializerV1d0.java | 298 +-
.../tinkerpop/gremlin/driver/ser/SerTokens.java | 1 +
.../gremlin/driver/ser/Serializers.java | 5 +-
.../GraphSONMessageSerializerGremlinTest.java | 349 +
...raphSONMessageSerializerGremlinV1d0Test.java | 334 -
.../ser/GraphSONMessageSerializerV1d0Test.java | 9 +-
.../ser/GraphSONMessageSerializerV2d0Test.java | 485 +
.../ser/GryoBaseMessageSerializerV1d0Test.java | 520 +
.../ser/GryoLiteMessageSerializerV1d0Test.java | 150 +
.../ser/GryoMessageSerializerV1d0Test.java | 445 +-
.../step/branch/GroovyLocalTest.groovy | 8 +
.../traversal/step/map/GroovyMatchTest.groovy | 10 +
.../step/map/GroovyPageRankTest.groovy | 5 +
.../step/map/GroovyPeerPressureTest.groovy | 5 +
.../step/map/GroovyPropertiesTest.groovy | 6 +
.../traversal/step/map/GroovyVertexTest.groovy | 13 +-
.../step/sideEffect/GroovyGroupTest.groovy | 10 +
.../step/sideEffect/GroovySackTest.groovy | 2 +-
.../step/sideEffect/GroovySubgraphTest.groovy | 5 +
gremlin-groovy/pom.xml | 276 +-
.../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 +
gremlin-server/conf/gremlin-server-classic.yaml | 1 +
.../conf/gremlin-server-modern-readonly.yaml | 1 +
gremlin-server/conf/gremlin-server-modern.yaml | 1 +
gremlin-server/conf/gremlin-server-neo4j.yaml | 1 +
.../conf/gremlin-server-rest-secure.yaml | 2 -
gremlin-server/conf/gremlin-server-secure.yaml | 1 +
gremlin-server/conf/gremlin-server-spark.yaml | 1 +
gremlin-server/conf/gremlin-server.yaml | 1 +
gremlin-server/src/assembly/distribution.xml | 4 -
.../tinkerpop/gremlin/server/GremlinServer.java | 2 +-
.../gremlin/server/op/session/Session.java | 6 +-
.../op/traversal/TraversalOpProcessor.java | 21 +-
.../gremlin/server/BaseScriptForTesting.java | 30 +
.../server/GremlinResultSetIntegrateTest.java | 16 +
.../server/GremlinServerIntegrateTest.java | 50 +-
.../remote/gremlin-server-integration.yaml | 1 +
.../server/gremlin-server-integration.yaml | 1 +
gremlin-test/pom.xml | 196 +-
.../traversal/TraversalInterruptionTest.java | 3 +-
.../traversal/step/branch/LocalTest.java | 38 +-
.../process/traversal/step/map/MatchTest.java | 67 +-
.../process/traversal/step/map/OrderTest.java | 1 +
.../traversal/step/map/PageRankTest.java | 26 +
.../traversal/step/map/PeerPressureTest.java | 31 +
.../process/traversal/step/map/ProgramTest.java | 49 +-
.../traversal/step/map/PropertiesTest.java | 53 +-
.../process/traversal/step/map/VertexTest.java | 27 +-
.../traversal/step/sideEffect/GroupTest.java | 77 +
.../traversal/step/sideEffect/SubgraphTest.java | 40 +-
.../decoration/SubgraphStrategyProcessTest.java | 22 +
.../gremlin/structure/io/IoGraphTest.java | 4 +-
.../tinkerpop/gremlin/structure/io/IoTest.java | 40 +
.../io/graphml/tinkerpop-no-edge-labels.xml | 25 +
.../computer/AbstractHadoopGraphComputer.java | 63 +-
.../hadoop/process/computer/HadoopCombine.java | 3 +-
.../hadoop/process/computer/HadoopMap.java | 3 +-
.../hadoop/process/computer/HadoopReduce.java | 3 +-
.../gremlin/hadoop/structure/HadoopGraph.java | 124 +-
.../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 +
.../groovy/plugin/HadoopGremlinPluginCheck.java | 189 +-
pom.xml | 3 +
.../spark/process/computer/SparkExecutor.java | 35 +-
.../process/computer/SparkGraphComputer.java | 81 +-
.../optimization/SparkInterceptorStrategy.java | 3 +-
.../SparkSingleIterationStrategy.java | 3 +-
.../SparkStarBarrierInterceptor.java | 6 +-
.../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 +-
.../structure/TinkerIoRegistryV2d0.java | 227 +
.../decoration/HaltedTraverserStrategyTest.java | 102 +
.../structure/IoDataGenerationTest.java | 109 +-
.../TinkerGraphGraphSONSerializerV2d0Test.java | 292 +
.../structure/TinkerGraphPlayTest.java | 26 +-
238 files changed, 24227 insertions(+), 15538 deletions(-)
----------------------------------------------------------------------
