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 2016/08/27 00:55:05 UTC
[50/50] [abbrv] tinkerpop git commit: Merge remote-tracking branch
'origin/TINKERPOP-1278'
Merge remote-tracking branch 'origin/TINKERPOP-1278'
Conflicts:
CHANGELOG.asciidoc
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/39648a53
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/39648a53
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/39648a53
Branch: refs/heads/master
Commit: 39648a5363d3dce8ba69d638b4a4310ea7b986d4
Parents: 3f722e6 dd202e2
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Aug 26 20:53:40 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Aug 26 20:53:40 2016 -0400
----------------------------------------------------------------------
.gitignore | 4 +
CHANGELOG.asciidoc | 16 +
data/grateful-dead-v2d0-typed.json | 1616 ++---
data/tinkerpop-classic-v2d0-typed.json | 12 +-
data/tinkerpop-crew-v2d0-typed.json | 12 +-
data/tinkerpop-modern-v2d0-typed.json | 12 +-
docker/build/Dockerfile.template | 1 +
docs/preprocessor/awk/init-code-blocks.awk | 56 +-
docs/preprocessor/awk/language-variants.awk | 50 +
docs/preprocessor/awk/prepare.awk | 4 +-
docs/preprocessor/awk/progressbar.awk | 4 +-
docs/preprocessor/install-plugins.sh | 4 +
docs/preprocessor/preprocess-file.sh | 20 +-
.../developer/development-environment.asciidoc | 6 +-
docs/src/dev/provider/index.asciidoc | 125 +-
.../src/reference/gremlin-applications.asciidoc | 129 +-
docs/src/reference/gremlin-variants.asciidoc | 257 +
docs/src/reference/index.asciidoc | 2 +
docs/src/reference/the-graph.asciidoc | 161 +-
.../gremlin-language-variants/index.asciidoc | 664 +-
.../upgrade/release-3.2.x-incubating.asciidoc | 15 +-
docs/static/images/gremlin-python-drawing.png | Bin 0 -> 107595 bytes
.../images/gremlin-variant-architecture.png | Bin 0 -> 233060 bytes
docs/static/images/tinkerpop3.graffle | 6676 +++++++++++++++++-
docs/static/resources/gremlin-jython.py | 721 --
docs/static/resources/gremlin-python.py | 764 --
gremlin-console/conf/remote-graph.properties | 12 +-
.../plugin/gremlin-server-integration.yaml | 5 +-
.../CachedGremlinScriptEngineManager.java | 99 +
.../gremlin/jsr223/ConcurrentBindings.java | 42 +
.../gremlin/jsr223/CoreGremlinModule.java | 45 +
.../tinkerpop/gremlin/jsr223/Customizer.java | 28 +
.../DefaultGremlinScriptEngineManager.java | 424 ++
.../tinkerpop/gremlin/jsr223/GremlinModule.java | 61 +
.../gremlin/jsr223/GremlinScriptEngine.java | 52 +
.../jsr223/GremlinScriptEngineFactory.java | 44 +
.../jsr223/GremlinScriptEngineManager.java | 159 +
.../gremlin/jsr223/ImportCustomizer.java | 109 +
.../gremlin/jsr223/JavaTranslator.java | 173 +
.../SingleGremlinScriptEngineManager.java | 42 +
.../traversal/step/map/VertexProgramStep.java | 2 +-
.../decoration/VertexProgramStrategy.java | 2 +-
.../process/remote/RemoteConnection.java | 17 +-
.../gremlin/process/remote/RemoteGraph.java | 64 +-
.../traversal/AbstractRemoteTraversal.java | 117 +
.../AbstractRemoteTraversalSideEffects.java | 114 +
.../traversal/AbstractRemoteTraverser.java | 43 +
.../traversal/DefaultRemoteTraverser.java | 28 +
.../remote/traversal/RemoteTraversal.java | 29 +
.../traversal/RemoteTraversalSideEffects.java | 27 +
.../remote/traversal/RemoteTraverser.java | 35 +
.../remote/traversal/step/map/RemoteStep.java | 29 +-
.../strategy/decoration/RemoteStrategy.java | 53 +-
.../gremlin/process/traversal/Bindings.java | 58 +
.../gremlin/process/traversal/Bytecode.java | 263 +
.../gremlin/process/traversal/Translator.java | 65 +
.../gremlin/process/traversal/Traversal.java | 21 +
.../process/traversal/TraversalSideEffects.java | 7 +
.../process/traversal/TraversalSource.java | 192 +-
.../process/traversal/TraversalStrategies.java | 12 +
.../process/traversal/TraversalStrategy.java | 2 +-
.../dsl/graph/DefaultGraphTraversal.java | 5 +-
.../dsl/graph/EmptyGraphTraversal.java | 59 -
.../traversal/dsl/graph/GraphTraversal.java | 436 +-
.../dsl/graph/GraphTraversalSource.java | 121 +-
.../gremlin/process/traversal/dsl/graph/__.java | 4 +-
.../lambda/AbstractLambdaTraversal.java | 5 +
.../traversal/step/branch/LocalStep.java | 2 +-
.../process/traversal/step/map/GroupStep.java | 1 +
.../process/traversal/step/map/MatchStep.java | 2 +-
.../traversal/step/map/OrderGlobalStep.java | 6 +-
.../process/traversal/step/util/BulkSet.java | 5 +
.../gremlin/process/traversal/util/AndP.java | 4 +-
.../process/traversal/util/BytecodeHelper.java | 64 +
.../traversal/util/DefaultTraversal.java | 73 +-
.../util/DefaultTraversalStrategies.java | 12 +-
.../process/traversal/util/EmptyTraversal.java | 7 +-
.../util/EmptyTraversalStrategies.java | 1 +
.../gremlin/process/traversal/util/OrP.java | 3 +-
.../process/traversal/util/ScriptTraversal.java | 14 +-
.../process/traversal/util/TraversalHelper.java | 8 +
.../traversal/util/TraversalScriptFunction.java | 4 +-
.../io/graphson/AbstractObjectDeserializer.java | 51 +
.../structure/io/graphson/GraphSONIo.java | 24 +-
.../structure/io/graphson/GraphSONMapper.java | 22 +-
.../structure/io/graphson/GraphSONModule.java | 159 +-
.../structure/io/graphson/GraphSONReader.java | 50 +-
.../io/graphson/GraphSONSerializersV1d0.java | 1 +
.../io/graphson/GraphSONSerializersV2d0.java | 49 +-
.../structure/io/graphson/GraphSONTokens.java | 17 +-
.../GraphSONTraversalSerializersV2d0.java | 349 +
.../io/graphson/GraphSONTypeDeserializer.java | 74 +-
.../io/graphson/GraphSONTypeIdResolver.java | 14 +-
.../io/graphson/GraphSONTypeSerializer.java | 3 +
.../io/graphson/GraphSONXModuleV2d0.java | 140 +
.../gremlin/structure/io/gryo/GryoMapper.java | 7 +-
.../structure/io/gryo/GryoSerializers.java | 39 +
.../gremlin/structure/util/StringFactory.java | 12 +-
.../structure/util/empty/EmptyGraph.java | 20 +
.../tinkerpop/gremlin/util/CoreImports.java | 224 +
.../gremlin/util/ScriptEngineCache.java | 8 +
.../tinkerpop/gremlin/util/function/Lambda.java | 199 +
.../util/function/ScriptEngineLambda.java | 4 +-
.../io/graphson/AbstractGraphSONTest.java | 51 +
.../GraphSONMapperEmbeddedTypeTest.java | 85 +-
.../io/graphson/GraphSONMapperTest.java | 5 +-
...aphSONMapperV2d0PartialEmbeddedTypeTest.java | 192 +-
.../structure/io/gryo/GryoMapperTest.java | 16 +
.../structure/util/GraphFactoryTest.java | 9 +
.../util/function/ScriptEngineLambdaTest.java | 1 +
.../tinkerpop/gremlin/driver/Channelizer.java | 2 +-
.../apache/tinkerpop/gremlin/driver/Client.java | 86 +-
.../tinkerpop/gremlin/driver/Connection.java | 3 +-
.../tinkerpop/gremlin/driver/Handler.java | 53 +-
.../tinkerpop/gremlin/driver/ResultQueue.java | 88 +-
.../tinkerpop/gremlin/driver/ResultSet.java | 17 +-
.../apache/tinkerpop/gremlin/driver/Tokens.java | 103 +-
.../gremlin/driver/message/RequestMessage.java | 8 +
.../driver/remote/DriverRemoteConnection.java | 119 +-
.../driver/remote/DriverRemoteTraversal.java | 138 +
.../DriverRemoteTraversalSideEffects.java | 101 +
.../gremlin/driver/ser/Serializers.java | 3 +
.../gremlin/driver/ResultQueueTest.java | 122 +
.../tinkerpop/gremlin/driver/ResultSetTest.java | 4 +-
...raphSONMessageSerializerGremlinTestV1d0.java | 334 -
...raphSONMessageSerializerGremlinTestV2d0.java | 341 -
...raphSONMessageSerializerGremlinV1d0Test.java | 334 +
...raphSONMessageSerializerGremlinV2d0Test.java | 341 +
.../step/branch/GroovyRepeatTest.groovy | 2 +-
.../traversal/step/filter/GroovyHasTest.groovy | 5 +
.../step/filter/GroovyWhereTest.groovy | 6 +-
.../step/sideEffect/GroovySackTest.groovy | 2 +-
.../step/sideEffect/GroovyStoreTest.groovy | 2 +-
.../gremlin/groovy/GroovyEnvironmentSuite.java | 2 +
.../groovy/jsr223/GroovyTranslatorTest.java | 90 +
.../AbstractImportCustomizerProvider.java | 4 +
.../groovy/engine/ConcurrentBindings.java | 2 +
.../gremlin/groovy/engine/GremlinExecutor.java | 7 +-
.../gremlin/groovy/engine/ScriptEngines.java | 44 +-
.../jsr223/GremlinGroovyScriptEngine.java | 109 +-
.../GremlinGroovyScriptEngineFactory.java | 28 +-
.../gremlin/groovy/jsr223/GroovyTranslator.java | 153 +
...op.gremlin.jsr223.GremlinScriptEngineFactory | 1 +
.../groovy/engine/GremlinExecutorTest.java | 14 +-
.../jsr223/GroovyGremlinScriptEngineTest.java | 29 +
.../util/function/ScriptEngineLambdaTest.java | 163 -
gremlin-python/pom.xml | 468 ++
.../python/GraphTraversalSourceGenerator.groovy | 189 +
.../python/TraversalSourceGenerator.groovy | 287 +
.../gremlin/python/GenerateGremlinPython.java | 32 +
.../jsr223/GremlinJythonScriptEngine.java | 212 +
.../GremlinJythonScriptEngineFactory.java | 105 +
.../gremlin/python/jsr223/JythonTranslator.java | 57 +
.../gremlin/python/jsr223/PythonTranslator.java | 191 +
.../gremlin/python/jsr223/SymbolHelper.java | 61 +
gremlin-python/src/main/jython/LICENSE | 202 +
gremlin-python/src/main/jython/MANIFEST.in | 18 +
gremlin-python/src/main/jython/NOTICE | 5 +
gremlin-python/src/main/jython/README | 18 +
.../src/main/jython/gremlin_python/__init__.py | 20 +
.../jython/gremlin_python/driver/__init__.py | 20 +
.../driver/driver_remote_connection.py | 214 +
.../gremlin_python/driver/remote_connection.py | 79 +
.../jython/gremlin_python/process/__init__.py | 20 +
.../gremlin_python/process/graph_traversal.py | 1138 +++
.../jython/gremlin_python/process/traversal.py | 336 +
.../src/main/jython/gremlin_python/statics.py | 46 +
.../jython/gremlin_python/structure/__init__.py | 20 +
.../jython/gremlin_python/structure/graph.py | 90 +
.../gremlin_python/structure/io/__init__.py | 20 +
.../gremlin_python/structure/io/graphson.py | 290 +
gremlin-python/src/main/jython/runtest.py | 2892 ++++++++
gremlin-python/src/main/jython/setup.cfg | 21 +
gremlin-python/src/main/jython/setup.py | 75 +
.../src/main/jython/tests/__init__.py | 20 +
.../src/main/jython/tests/driver/__init__.py | 20 +
.../driver/test_driver_remote_connection.py | 124 +
.../src/main/jython/tests/process/__init__.py | 20 +
.../main/jython/tests/process/test_traversal.py | 57 +
.../src/main/jython/tests/structure/__init__.py | 20 +
.../main/jython/tests/structure/io/__init__.py | 20 +
.../jython/tests/structure/io/test_graphson.py | 79 +
.../main/jython/tests/structure/test_graph.py | 74 +
.../src/main/jython/tests/test_statics.py | 46 +
.../services/javax.script.ScriptEngineFactory | 20 +
...op.gremlin.jsr223.GremlinScriptEngineFactory | 1 +
.../driver/DriverRemoteConnectionTest.java | 153 +
.../jsr223/GremlinJythonScriptEngineTest.java | 101 +
.../python/jsr223/JythonScriptEngineSetup.java | 59 +
.../python/jsr223/JythonTranslatorTest.java | 87 +
.../python/jsr223/PythonComputerProvider.java | 36 +
.../jsr223/PythonGraphSONJavaTranslator.java | 77 +
.../jsr223/PythonGremlinScriptEngineTest.java | 31 +
.../jsr223/PythonProcessComputerTest.java | 33 +
.../jsr223/PythonProcessStandardTest.java | 33 +
.../gremlin/python/jsr223/PythonProvider.java | 161 +
.../io/graphson/GraphSONReaderTest.java | 133 +
.../io/graphson/GraphSONWriterTest.java | 130 +
.../src/test/resources/log4j-silent.properties | 23 +
.../src/test/resources/log4j-test.properties | 23 +
.../gremlin/python/driver/credentials.kryo | Bin 0 -> 138 bytes
.../python/driver/generate-modern.groovy | 33 +
.../driver/gremlin-server-modern-secure-py.yaml | 66 +
.../driver/tinkergraph-credentials.properties | 22 +
.../python/driver/tinkergraph-empty.properties | 18 +
gremlin-server/conf/gremlin-server-classic.yaml | 9 +-
.../conf/gremlin-server-modern-py.yaml | 61 +
.../conf/gremlin-server-modern-readonly.yaml | 9 +-
gremlin-server/conf/gremlin-server-modern.yaml | 9 +-
gremlin-server/conf/gremlin-server-neo4j.yaml | 6 +-
.../conf/gremlin-server-rest-secure.yaml | 1 +
gremlin-server/conf/gremlin-server-secure.yaml | 1 +
gremlin-server/conf/gremlin-server-spark.yaml | 6 +-
gremlin-server/conf/gremlin-server.yaml | 6 +-
gremlin-server/pom.xml | 5 +
gremlin-server/scripts/generate-all.groovy | 9 +-
.../tinkerpop/gremlin/server/GremlinServer.java | 6 +-
.../tinkerpop/gremlin/server/OpProcessor.java | 8 +
.../server/op/AbstractEvalOpProcessor.java | 1 -
.../gremlin/server/op/AbstractOpProcessor.java | 57 +-
.../tinkerpop/gremlin/server/op/OpLoader.java | 14 +
.../server/op/control/ControlOpProcessor.java | 2 +
.../gremlin/server/op/control/ControlOps.java | 2 +
.../op/traversal/TraversalOpProcessor.java | 342 +-
.../gremlin/server/util/SideEffectIterator.java | 97 +
.../gremlin/server/util/TraversalIterator.java | 54 +
.../remote/RemoteGraphComputerProvider.java | 6 +-
.../driver/remote/RemoteGraphProvider.java | 29 +-
...teGraphGroovyTranslatorComputerProvider.java | 54 +
...raphGroovyTranslatorProcessComputerTest.java | 33 +
...raphGroovyTranslatorProcessStandardTest.java | 33 +
.../RemoteGraphGroovyTranslatorProvider.java | 37 +
.../remote/RemoteGraphProcessComputerTest.java | 34 +
.../remote/RemoteGraphProcessStandardTest.java | 33 +
.../process/RemoteGraphProcessComputerTest.java | 34 -
.../process/RemoteGraphProcessStandardTest.java | 33 -
.../server/GremlinResultSetIntegrateTest.java | 23 +-
.../remote/gremlin-server-integration.yaml | 5 +-
.../server/gremlin-server-integration.yaml | 5 +-
.../server/gremlin-server-performance.yaml | 5 +-
.../CachedGremlinScriptEngineManagerTest.java | 49 +
.../jsr223/GremlinEnabledScriptEngineTest.java | 57 +
.../jsr223/GremlinScriptEngineSuite.java | 47 +
.../gremlin/jsr223/ScriptEngineLambdaTest.java | 158 +
.../gremlin/jsr223/ScriptEngineToTest.java | 35 +
.../gremlin/process/ProcessComputerSuite.java | 4 +
.../gremlin/process/ProcessStandardSuite.java | 6 +-
.../process/traversal/CoreTraversalTest.java | 2 +
.../traversal/step/branch/RepeatTest.java | 8 +-
.../process/traversal/step/filter/HasTest.java | 15 +
.../process/traversal/step/filter/IsTest.java | 4 +-
.../process/traversal/step/map/AddEdgeTest.java | 4 +-
.../process/traversal/step/map/SelectTest.java | 2 +-
.../traversal/step/sideEffect/SackTest.java | 8 +-
.../traversal/step/sideEffect/StoreTest.java | 8 +-
.../ElementIdStrategyProcessTest.java | 13 +-
.../decoration/TranslationStrategy.java | 135 +
.../TranslationStrategyProcessTest.java | 67 +
.../gremlin/structure/io/IoCustomTest.java | 19 +-
.../gremlin/structure/io/IoEdgeTest.java | 13 +-
.../gremlin/structure/io/IoGraphTest.java | 10 +-
.../gremlin/structure/io/IoPropertyTest.java | 13 +-
.../tinkerpop/gremlin/structure/io/IoTest.java | 2 +-
.../gremlin/structure/io/IoVertexTest.java | 13 +-
.../gremlin/structure/io/util/CustomId.java | 75 +-
.../io/graphson/grateful-dead-v2d0-typed.json | 1616 ++---
.../graphson/tinkerpop-classic-v2d0-typed.json | 12 +-
.../io/graphson/tinkerpop-crew-v2d0-typed.json | 12 +-
.../graphson/tinkerpop-modern-v2d0-typed.json | 12 +-
pom.xml | 32 +-
.../tinkergraph/TinkerGraphProvider.java | 30 +-
...erGraphGroovyTranslatorComputerProvider.java | 37 +
...raphGroovyTranslatorProcessComputerTest.java | 33 +
...raphGroovyTranslatorProcessStandardTest.java | 33 +
.../TinkerGraphGroovyTranslatorProvider.java | 75 +
...nkerGraphJavaTranslatorComputerProvider.java | 37 +
...rGraphJavaTranslatorProcessComputerTest.java | 33 +
...rGraphJavaTranslatorProcessStandardTest.java | 33 +
.../TinkerGraphJavaTranslatorProvider.java | 73 +
.../TinkerGraphGraphSONSerializerV2d0Test.java | 22 +-
.../structure/TinkerGraphPlayTest.java | 41 +-
.../io/graphson/GraphSONTranslator.java | 74 +
...GraphGraphSONTranslatorComputerProvider.java | 37 +
...phGraphSONTranslatorProcessComputerTest.java | 33 +
...phGraphSONTranslatorProcessStandardTest.java | 33 +
.../TinkerGraphGraphSONTranslatorProvider.java | 87 +
286 files changed, 26706 insertions(+), 5698 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/39648a53/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 24cb406,91d6fed..ad805c2
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,10 -26,24 +26,26 @@@ image::https://raw.githubusercontent.co
TinkerPop 3.2.2 (NOT OFFICIALLY RELEASED YET)
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+* Included GraphSON as a default serializer (in addition to Gryo, which was already present) in Gremlin Server if none are defined.
+ * Added `gremlin-python` package as a Gremlin language variant in Python.
+ * Added `Bytecode` which specifies the instructions and arguments used to construct a traversal.
+ * Created an experimental GraphSON representation of `Bytecode` that will be considered unstable until 3.3.0.
+ * Added `Translator` which allows from the translation of `Bytecode` into some other form (e.g. script, `Traversal`, etc.).
+ * Added `JavaTranslator`, `GroovyTranslator`, `PythonTranslator`, and `JythonTranslator` for translating `Bytecode` accordingly.
+ * Added `TranslationStrategy` to `gremlin-test` so translators can be tested against the the process test suite.
+ * Added `Traversal.Admin.nextTraverser()` to get the next result in bulk-form (w/ default implementation).
+ * Added `TraversalSource.getAnonymousTraversalClass()` (w/ default implementation).
+ * Added `GremlinScriptEngine` interface which specifies a `eval(Bytecode, Bindings)` method.
+ * Deprecated `RemoteGraph` in favor of `TraversalSource.withRemote()` as it is more technically correct to tie a remote traversal to the `TraversalSource` than a `Graph` instance.
+ * `GremlinGroovyScriptEngine` implements `GremlinScriptEngine`.
+ * Added `GremlinJythonScriptEngine` which implements `GremlinScriptEngine`.
+ * Removed support for submitting a Java serialized `Traversal` to Gremlin Server.
+ * Removed a largely internal feature that supported automatic unrolling of traversers in the Gremlin Driver.
+ * Made it possible to directly initialize `OpProcessor` implementations with server `Settings`.
+ * Included GraphSON as a default serializer (in addition to Gryo, which was already present) in Gremlin Server if none are defined
* Introduced GraphSON 2.0.
* Deprecated `embedTypes` on the builder for `GraphSONMapper`.
+* Bumped to Netty 4.0.40.final.
* Defaulted the `gremlinPool` setting in Gremlin Server to be zero, which will instructs it to use `Runtime.availableProcessors()` for that settings.
* Changed scope of log4j dependencies so that they would only be used in tests and the binary distributions of Gremlin Console and Server.
* Deprecated `Io.Builder.registry()` in favor of the newly introduced `Io.Builder.onMapper()`.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/39648a53/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/39648a53/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------