Merge branch 'TINKERPOP-1631' into tp32 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/1f11dd3a Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1f11dd3a Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1f11dd3a Branch: refs/heads/TINKERPOP-1612 Commit: 1f11dd3a5ba625a8dac6e6c6200c4e93e112a652 Parents: ba9245c b57de66 Author: Stephen Mallette <sp...@genoprime.com> Authored: Thu Feb 23 08:00:55 2017 -0500 Committer: Stephen Mallette <sp...@genoprime.com> Committed: Thu Feb 23 08:00:55 2017 -0500 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 2 + .../AbstractGremlinScriptEngineFactory.java | 118 +++++++++++++++++++ .../gremlin/jsr223/BindingsGremlinPlugin.java | 49 ++------ .../jsr223/DefaultBindingsCustomizer.java | 17 +-- .../DefaultGremlinScriptEngineManager.java | 53 +++++---- .../gremlin/jsr223/LazyBindingsCustomizer.java | 18 +-- .../AbstractImportCustomizerProvider.java | 2 + .../groovy/CompilerCustomizerProvider.java | 3 + .../groovy/DefaultImportCustomizerProvider.java | 4 + .../groovy/EmptyImportCustomizerProvider.java | 2 + .../groovy/ImportCustomizerProvider.java | 4 + .../groovy/NoImportCustomizerProvider.java | 2 + .../GremlinGroovyScriptEngineFactory.java | 75 ++---------- gremlin-server/scripts/spark.groovy | 2 +- .../jsr223/BindingsScriptEngineTest.java | 67 +++++++---- .../gremlin/jsr223/MockGremlinScriptEngine.java | 62 ++++++++++ .../jsr223/MockGremlinScriptEngineFactory.java | 51 ++++++++ ...op.gremlin.jsr223.GremlinScriptEngineFactory | 1 + .../gremlin/jsr223/bindings-init.groovy | 22 ++++ .../hadoop/jsr223/HadoopGremlinPlugin.java | 11 +- .../hadoop/jsr223/HadoopGremlinPluginTest.java | 51 ++++++++ 21 files changed, 446 insertions(+), 170 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1f11dd3a/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --cc CHANGELOG.asciidoc index de78d24,e8e2522..871a4c9 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,9 -26,8 +26,11 @@@ image::https://raw.githubusercontent.co TinkerPop 3.2.5 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + * Deprecated `CustomizerProvider` infrastructure. + * Improved consistency of the application of bindings to `GremlinScriptEngine` implementations in the `BindingsGremlinPlugin`. +* Refactor `SparkContext` handler to support external kill and stop operations. +* Fixed an optimization bug in `LazyBarrierStrategy` around appending barriers to the end of a `Traversal`. +* `TraverserIterator` in GremlinServer is smart to try and bulk traversers prior to network I/O. [[release-3-2-4]] TinkerPop 3.2.4 (Release Date: February 8, 2017)