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 2017/01/12 13:25:37 UTC
[5/7] tinkerpop git commit: Merge remote-tracking branch
'upstream/tp32' into api-check-tp32
Merge remote-tracking branch 'upstream/tp32' into api-check-tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/c4d4e8ef
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c4d4e8ef
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c4d4e8ef
Branch: refs/heads/TINKERPOP-1443
Commit: c4d4e8ef30c13dc4020dfcc360e21396fec386e6
Parents: aa6593a 9c44f0d
Author: Lukas Krejci <lk...@redhat.com>
Authored: Fri Jan 6 23:16:53 2017 +0100
Committer: Lukas Krejci <lk...@redhat.com>
Committed: Fri Jan 6 23:16:53 2017 +0100
----------------------------------------------------------------------
CHANGELOG.asciidoc | 36 ++
docker/build.sh | 2 +-
docker/scripts/build.sh | 7 +
.../developer/development-environment.asciidoc | 20 +-
docs/src/dev/io/graphson.asciidoc | 4 +-
docs/src/dev/provider/index.asciidoc | 2 +-
.../src/reference/gremlin-applications.asciidoc | 24 +-
docs/src/reference/gremlin-variants.asciidoc | 5 -
.../reference/implementations-neo4j.asciidoc | 2 +-
docs/src/reference/the-graph.asciidoc | 2 +-
docs/src/reference/the-traversal.asciidoc | 35 +-
.../gremlin-language-variants/index.asciidoc | 3 -
.../upgrade/release-3.2.x-incubating.asciidoc | 124 +++++-
.../groovy/plugin/GiraphGremlinPlugin.java | 2 +
.../giraph/jsr223/GiraphGremlinPlugin.java | 58 +++
.../src/test/resources/giraph-site.xml | 12 +
.../archetype-resources/src/main/java/App.java | 2 +-
.../src/main/java/Service.java | 4 +-
.../src/test/java/ServiceTest.java | 4 +-
.../src/test/resources/gremlin-server.yaml | 2 +-
.../tinkerpop/gremlin/console/Console.groovy | 31 +-
.../ConsoleImportCustomizerProvider.groovy | 2 +
.../tinkerpop/gremlin/console/Mediator.groovy | 4 +-
.../console/commands/InstallCommand.groovy | 14 +-
.../console/jsr223/GephiRemoteAcceptor.groovy | 369 +++++++++++++++++
.../console/plugin/ConsolePluginAcceptor.groovy | 2 +-
.../console/plugin/GephiRemoteAcceptor.groovy | 2 +
.../gremlin/console/plugin/PluggedIn.groovy | 112 ++++++
.../groovy/plugin/DriverGremlinPlugin.java | 2 +
.../groovy/plugin/DriverRemoteAcceptor.java | 2 +
.../groovy/plugin/GephiGremlinPlugin.java | 1 +
.../groovy/plugin/UtilitiesGremlinPlugin.java | 1 +
.../console/jsr223/DriverGremlinPlugin.java | 104 +++++
.../console/jsr223/DriverRemoteAcceptor.java | 238 +++++++++++
.../console/jsr223/GephiGremlinPlugin.java | 41 ++
.../console/jsr223/UtilitiesGremlinPlugin.java | 106 +++++
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 3 +
.../jsr223/UtilitiesGremlinPluginScript.groovy | 52 +++
.../groovy/plugin/GremlinPluginAdapterTest.java | 130 ++++++
.../plugin/gremlin-server-integration.yaml | 2 +-
.../gremlin/console/groovy/plugin/remote.yaml | 2 +-
.../groovy/plugin/script-customizer-1.groovy | 3 +
.../groovy/plugin/script-customizer-2.groovy | 2 +
.../gremlin/jsr223/AbstractGremlinPlugin.java | 58 +++
.../gremlin/jsr223/BindingsCustomizer.java | 33 ++
.../CachedGremlinScriptEngineManager.java | 1 +
.../gremlin/jsr223/CoreGremlinModule.java | 25 +-
.../gremlin/jsr223/CoreGremlinPlugin.java | 62 +++
.../tinkerpop/gremlin/jsr223/CoreImports.java | 250 ++++++++++++
.../tinkerpop/gremlin/jsr223/Customizer.java | 4 +-
.../jsr223/DefaultBindingsCustomizer.java | 40 ++
.../DefaultGremlinScriptEngineManager.java | 38 +-
.../gremlin/jsr223/DefaultImportCustomizer.java | 102 +++++
.../gremlin/jsr223/DefaultScriptCustomizer.java | 56 +++
.../tinkerpop/gremlin/jsr223/GremlinModule.java | 13 +
.../tinkerpop/gremlin/jsr223/GremlinPlugin.java | 61 +++
.../jsr223/GremlinScriptEngineManager.java | 8 +
.../gremlin/jsr223/ImportCustomizer.java | 83 +---
.../gremlin/jsr223/ImportGremlinPlugin.java | 190 +++++++++
.../gremlin/jsr223/LazyBindingsCustomizer.java | 39 ++
.../gremlin/jsr223/ScriptCustomizer.java | 34 ++
.../gremlin/jsr223/ScriptEngineCache.java | 54 +++
.../gremlin/jsr223/ScriptFileGremlinPlugin.java | 77 ++++
.../SingleGremlinScriptEngineManager.java | 9 +-
.../jsr223/console/ConsoleCustomizer.java | 33 ++
.../jsr223/console/GremlinShellEnvironment.java | 37 ++
.../gremlin/jsr223/console/PluginAcceptor.java | 62 +++
.../gremlin/jsr223/console/RemoteAcceptor.java | 83 ++++
.../gremlin/jsr223/console/RemoteException.java | 40 ++
.../process/remote/RemoteConnection.java | 28 +-
.../remote/traversal/RemoteTraversal.java | 8 +-
.../remote/traversal/step/map/RemoteStep.java | 32 +-
.../gremlin/process/traversal/Bindings.java | 39 +-
.../gremlin/process/traversal/Bytecode.java | 19 +-
.../gremlin/process/traversal/Traversal.java | 23 ++
.../process/traversal/TraversalEngine.java | 2 +-
.../process/traversal/TraversalSideEffects.java | 8 +-
.../process/traversal/TraversalSource.java | 7 +-
.../traversal/dsl/graph/GraphTraversal.java | 130 ++++--
.../dsl/graph/GraphTraversalSource.java | 4 +-
.../gremlin/process/traversal/dsl/graph/__.java | 43 +-
.../traversal/step/map/GroupStepV3d0.java | 2 +-
.../step/map/LambdaCollectingBarrierStep.java | 2 +-
.../traversal/step/util/HasContainer.java | 26 +-
.../strategy/decoration/SubgraphStrategy.java | 4 +-
.../optimization/FilterRankingStrategy.java | 43 +-
.../IncidentToAdjacentStrategy.java | 4 +-
.../optimization/InlineFilterStrategy.java | 20 +-
.../process/traversal/util/TraversalHelper.java | 19 +-
.../process/traversal/util/TraversalRing.java | 8 +-
.../gremlin/structure/io/IoRegistry.java | 2 +-
.../structure/io/graphson/GraphSONModule.java | 24 +-
.../io/graphson/GraphSONSerializersV2d0.java | 24 ++
.../GraphSONTraversalSerializersV2d0.java | 9 +-
.../io/graphson/GraphSONTypeSerializer.java | 100 +++--
.../structure/io/gryo/GryoClassResolver.java | 13 +
.../gremlin/structure/io/gryo/GryoMapper.java | 402 +------------------
.../gremlin/structure/io/gryo/GryoPool.java | 23 +-
.../structure/io/gryo/GryoSerializers.java | 43 +-
.../gremlin/structure/io/gryo/GryoTypeReg.java | 140 +++++++
.../gremlin/structure/io/gryo/GryoVersion.java | 332 +++++++++++++++
.../structure/io/gryo/UtilSerializers.java | 64 +++
.../structure/io/gryo/kryoshim/InputShim.java | 2 +
.../structure/io/gryo/kryoshim/OutputShim.java | 2 +
.../kryoshim/shaded/ShadedInputAdapter.java | 5 +
.../kryoshim/shaded/ShadedOutputAdapter.java | 8 +-
.../gremlin/structure/util/ElementHelper.java | 6 +-
.../gremlin/structure/util/StringFactory.java | 19 +-
.../tinkerpop/gremlin/util/CoreImports.java | 35 +-
.../gremlin/util/ScriptEngineCache.java | 4 +-
.../jsr223/DefaultImportCustomizerTest.java | 76 ++++
.../jsr223/DefaultScriptCustomizerTest.java | 55 +++
.../gremlin/jsr223/ImportGremlinPluginTest.java | 149 +++++++
.../gremlin/jsr223/ScriptEngineCacheTest.java | 46 +++
.../jsr223/ScriptFileGremlinPluginTest.java | 62 +++
.../jsr223/SingleScriptEngineManagerTest.java | 45 +++
.../optimization/GraphFilterStrategyTest.java | 2 +-
.../gremlin/process/traversal/BytecodeTest.java | 32 +-
.../process/traversal/TraversalTest.java | 328 +++++++++++++++
.../traversal/step/filter/HasStepTest.java | 12 +-
.../optimization/FilterRankingStrategyTest.java | 27 +-
.../optimization/InlineFilterStrategyTest.java | 12 +-
.../gremlin/structure/io/IoXIoRegistry.java | 2 +-
.../gremlin/structure/io/IoYIoRegistry.java | 2 +-
.../structure/io/gryo/GryoMapperTest.java | 41 +-
.../structure/util/ElementHelperTest.java | 73 +++-
.../gremlin/jsr223/script-customizer-1.groovy | 3 +
.../gremlin/jsr223/script-customizer-2.groovy | 2 +
gremlin-driver/pom.xml | 2 +-
.../apache/tinkerpop/gremlin/driver/Client.java | 5 +-
.../tinkerpop/gremlin/driver/Connection.java | 6 +-
.../driver/remote/DriverRemoteConnection.java | 24 +-
.../driver/remote/DriverRemoteTraversal.java | 16 +-
.../DriverRemoteTraversalSideEffects.java | 22 +-
.../ser/AbstractGryoMessageSerializerV1d0.java | 4 +-
.../driver/ser/AbstractMessageSerializer.java | 26 +-
.../DriverRemoteTraversalSideEffectsTest.java | 12 +-
.../ser/GryoBaseMessageSerializerV1d0Test.java | 93 +++++
.../step/filter/GroovyWhereTest.groovy | 11 +
.../traversal/step/map/GroovyPathTest.groovy | 5 +
.../dsl/credential/CredentialGraphTest.java | 121 ++++++
.../dsl/credential/CredentialGraphTest.java | 2 +-
gremlin-groovy/pom.xml | 10 +-
.../groovy/util/DependencyGrabber.groovy | 84 ++--
.../gremlin/groovy/engine/GremlinExecutor.java | 139 ++++++-
.../gremlin/groovy/engine/ScriptEngines.java | 2 +
.../jsr223/CompileStaticGroovyCustomizer.java | 60 +++
.../jsr223/ConfigurationGroovyCustomizer.java | 82 ++++
.../groovy/jsr223/DependencyManager.java | 3 +
.../jsr223/GremlinGroovyScriptEngine.java | 102 +++--
.../jsr223/GroovyCompilerGremlinPlugin.java | 132 ++++++
.../gremlin/groovy/jsr223/GroovyCustomizer.java | 33 ++
.../groovy/jsr223/ImportGroovyCustomizer.java | 66 +++
.../jsr223/InterpreterModeGroovyCustomizer.java | 36 ++
.../jsr223/ScriptEnginePluginAcceptor.java | 2 +
.../groovy/jsr223/SugarGremlinPlugin.java | 41 ++
.../jsr223/ThreadInterruptGroovyCustomizer.java | 35 ++
.../jsr223/TimedInterruptGroovyCustomizer.java | 62 +++
.../jsr223/TimedInterruptTimeoutException.java | 38 ++
.../jsr223/TypeCheckedGroovyCustomizer.java | 65 +++
.../CompileStaticCustomizerProvider.java | 3 +
.../ConfigurationCustomizerProvider.java | 3 +
.../InterpreterModeCustomizerProvider.java | 5 +
.../ThreadInterruptCustomizerProvider.java | 3 +
.../TimedInterruptCustomizerProvider.java | 3 +
.../TimedInterruptTimeoutException.java | 4 +
.../TypeCheckedCustomizerProvider.java | 3 +
.../VariableIdentificationCustomizer.java | 2 +
.../jsr223/dsl/credential/CredentialGraph.java | 121 ++++++
.../CredentialGraphGremlinPlugin.java | 51 +++
.../dsl/credential/CredentialGraphTokens.java | 31 ++
.../groovy/plugin/AbstractGremlinPlugin.java | 2 +
.../gremlin/groovy/plugin/Artifact.java | 2 +
.../gremlin/groovy/plugin/GremlinPlugin.java | 1 +
.../groovy/plugin/GremlinPluginException.java | 2 +
.../plugin/IllegalEnvironmentException.java | 2 +
.../gremlin/groovy/plugin/PluginAcceptor.java | 2 +
.../plugin/PluginInitializationException.java | 2 +
.../gremlin/groovy/plugin/RemoteAcceptor.java | 2 +
.../gremlin/groovy/plugin/RemoteException.java | 2 +
.../groovy/plugin/SugarGremlinPlugin.java | 2 +
.../plugin/dsl/credential/CredentialGraph.java | 2 +
.../CredentialGraphGremlinPlugin.java | 2 +
.../dsl/credential/CredentialGraphTokens.java | 2 +
.../tinkerpop/gremlin/groovy/util/Artifact.java | 86 ++++
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 2 +
...aultDefaultImportCustomizerProviderTest.java | 90 +++++
.../DefaultImportCustomizerProviderTest.java | 90 -----
...mlinGroovyScriptEngineCompileStaticTest.java | 72 +++-
.../GremlinGroovyScriptEngineConfigTest.java | 11 +-
.../jsr223/GremlinGroovyScriptEngineTest.java | 52 ++-
...inGroovyScriptEngineThreadInterruptTest.java | 23 +-
...linGroovyScriptEngineTimedInterruptTest.java | 65 ++-
...remlinGroovyScriptEngineTypeCheckedTest.java | 72 +++-
.../jsr223/GroovyCompilerGremlinPluginTest.java | 128 ++++++
.../gremlin/groovy/plugin/ArtifactTest.java | 2 -
.../gremlin/groovy/util/ArtifactTest.java | 85 ++++
.../util/DependencyGrabberIntegrateTest.java | 2 +-
gremlin-python/pom.xml | 7 +-
.../python/GraphTraversalSourceGenerator.groovy | 15 +-
.../python/TraversalSourceGenerator.groovy | 35 +-
.../jsr223/GremlinJythonScriptEngine.java | 172 +++++---
.../GremlinJythonScriptEngineFactory.java | 9 +-
.../driver/driver_remote_connection.py | 23 +-
.../gremlin_python/driver/remote_connection.py | 19 +-
.../gremlin_python/process/graph_traversal.py | 19 +-
.../jython/gremlin_python/process/traversal.py | 33 ++
.../gremlin_python/structure/io/graphson.py | 10 +
.../driver/test_driver_remote_connection.py | 78 +++-
.../main/jython/tests/process/test_traversal.py | 26 ++
.../jython/tests/structure/io/test_graphson.py | 10 +
.../jsr223/GremlinJythonScriptEngineTest.java | 12 +-
.../python/jsr223/JythonScriptEngineSetup.java | 2 +-
.../python/jsr223/JythonTranslatorTest.java | 10 -
.../jsr223/PythonGraphSONJavaTranslator.java | 2 +-
.../gremlin/python/jsr223/PythonProvider.java | 5 +-
.../driver/gremlin-server-modern-secure-py.yaml | 4 +-
.../gremlin/server/AbstractChannelizer.java | 2 +-
.../tinkerpop/gremlin/server/Settings.java | 8 +
.../handler/SaslAuthenticationHandler.java | 2 +-
.../jsr223/GremlinServerGremlinPlugin.java | 42 ++
.../server/op/AbstractEvalOpProcessor.java | 5 +
.../gremlin/server/op/AbstractOpProcessor.java | 9 +-
.../op/traversal/TraversalOpProcessor.java | 11 +-
.../server/util/ServerGremlinExecutor.java | 16 +-
.../driver/remote/RemoteGraphProvider.java | 5 +-
.../AbstractGremlinServerPerformanceTest.java | 2 +-
.../server/GremlinAdditionPerformanceTest.java | 2 +-
.../server/GremlinDriverIntegrateTest.java | 98 ++---
.../server/GremlinResultSetIntegrateTest.java | 4 +-
.../server/GremlinServerAuthIntegrateTest.java | 24 +-
.../GremlinServerAuthOldIntegrateTest.java | 25 +-
.../server/GremlinServerHttpIntegrateTest.java | 94 ++---
.../server/GremlinServerIntegrateTest.java | 103 +++--
.../GremlinServerSessionIntegrateTest.java | 22 +-
.../server/GremlinTraversalPerformanceTest.java | 2 +-
.../gremlin/server/TestClientFactory.java | 60 +++
.../remote/gremlin-server-integration.yaml | 2 +-
.../server/gremlin-server-integration.yaml | 2 +-
.../server/gremlin-server-performance.yaml | 2 +-
.../apache/tinkerpop/gremlin/TestHelper.java | 16 +
.../jsr223/GremlinEnabledScriptEngineTest.java | 37 +-
.../gremlin/process/ProcessComputerSuite.java | 6 +-
.../gremlin/process/ProcessStandardSuite.java | 4 +-
.../TraversalInterruptionComputerTest.java | 15 +-
.../process/traversal/step/ComplexTest.java | 205 ++++++++++
.../traversal/step/filter/WhereTest.java | 31 ++
.../process/traversal/step/map/PathTest.java | 35 +-
.../traversal/step/map/PeerPressureTest.java | 2 +
.../gremlin/structure/PropertyTest.java | 1 +
.../groovy/plugin/HadoopGremlinPlugin.java | 2 +
.../groovy/plugin/HadoopRemoteAcceptor.java | 2 +
.../hadoop/jsr223/HadoopGremlinPlugin.java | 159 ++++++++
.../hadoop/jsr223/HadoopRemoteAcceptor.java | 127 ++++++
.../hadoop/structure/HadoopConfiguration.java | 4 +-
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 1 +
.../neo4j/groovy/plugin/Neo4jGremlinPlugin.java | 2 +
.../neo4j/jsr223/Neo4jGremlinPlugin.java | 71 ++++
.../step/sideEffect/Neo4jGraphStep.java | 11 +-
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 1 +
.../Neo4jGraphStepStrategyTest.java | 12 +-
pom.xml | 25 +-
.../spark/groovy/plugin/SparkGremlinPlugin.java | 2 +
.../spark/jsr223/SparkGremlinPlugin.java | 92 +++++
.../io/gryo/IoRegistryAwareKryoSerializer.java | 6 -
.../kryoshim/unshaded/UnshadedInputAdapter.java | 32 +-
.../kryoshim/unshaded/UnshadedKryoAdapter.java | 30 +-
.../unshaded/UnshadedKryoShimService.java | 6 -
.../unshaded/UnshadedOutputAdapter.java | 35 +-
.../unshaded/UnshadedSerializerAdapter.java | 9 +-
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 1 +
.../SparkGraphComputerProcessIntegrateTest.java | 32 ++
.../computer/SparkGraphComputerProcessTest.java | 32 --
...GraphComputerGroovyProcessIntegrateTest.java | 33 ++
.../SparkGraphComputerGroovyProcessTest.java | 33 --
.../PersistedInputOutputRDDIntegrateTest.java | 358 +++++++++++++++++
.../io/PersistedInputOutputRDDTest.java | 358 -----------------
.../groovy/plugin/TinkerGraphGremlinPlugin.java | 3 +-
.../jsr223/TinkerGraphGremlinPlugin.java | 72 ++++
.../step/sideEffect/TinkerGraphStep.java | 9 +-
.../tinkergraph/structure/TinkerGraph.java | 2 +-
.../tinkergraph/structure/TinkerIoRegistry.java | 18 +-
.../structure/TinkerIoRegistryV2d0.java | 18 +-
...pache.tinkerpop.gremlin.jsr223.GremlinPlugin | 1 +
.../TinkerGraphStepStrategyTest.java | 10 +-
.../TinkerGraphGraphSONSerializerV2d0Test.java | 4 +-
.../tinkergraph/structure/TinkerGraphTest.java | 27 +-
287 files changed, 9290 insertions(+), 1874 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c4d4e8ef/pom.xml
----------------------------------------------------------------------