Merge remote-tracking branch 'origin/TINKERPOP-1320' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bb9d718c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bb9d718c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bb9d718c Branch: refs/heads/tp31 Commit: bb9d718ccf50f21c9928b0359fdf6a0b96115516 Parents: 460af69 76b4229 Author: Jason Plurad <plur...@us.ibm.com> Authored: Fri Jul 8 09:56:16 2016 -0400 Committer: Jason Plurad <plur...@us.ibm.com> Committed: Fri Jul 8 09:56:16 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../java/org/apache/tinkerpop/gremlin/TestHelper.java | 9 ++++++++- .../GremlinGroovyScriptEngineFileSandboxTest.java | 13 ++++++++----- .../java/org/apache/tinkerpop/gremlin/TestHelper.java | 10 +++++++++- 4 files changed, 26 insertions(+), 7 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bb9d718c/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --cc CHANGELOG.asciidoc index 0a2b6df,812a2f0..881dbb3 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,18 -26,12 +26,19 @@@ image::https://raw.githubusercontent.co TinkerPop 3.1.3 (NOT OFFICIALLY RELEASED YET) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* Enured calls to `Result.hasNext()` were idempotent. * Avoid hamcrest conflict by using mockito-core instead of mockito-all dependency in `gremlin-test`. +* Fixed bug in `GremlinExecutor` causing Gremlin Server to lock up when parallel requests were submitted on the same session if those parallel requests included a script that blocked indefinitely. +* Changed `GremlinExecutor` timeout scheduling so that the timer would not start until a time closer to the actual start of script evaluation. +* Fixed bug in `SubgraphStrategy` where step labels were not being propogated properly to new steps injected by the strategy. +* Fix incorrect test `FeatureRequirement` annotations. * Defaulted to `Edge.DEFAULT` if no edge label was supplied in GraphML. * Fixed bug in `IoGraphTest` causing IllegalArgumentException: URI is not hierarchical error for external graph implementations. + * Fixed bug in `GremlinGroovyScriptEngineFileSandboxTest` resource loading +* Improved `TinkerGraph` performance when iterating vertices and edges. * Fixed a bug where timeout functions provided to the `GremlinExecutor` were not executing in the same thread as the script evaluation. * Optimized a few special cases in `RangeByIsCountStrategy`. +* Added more "invalid" variable bindings to the list used by Gremlin Server to validate incoming bindings on requests. * Named the thread pool used by Gremlin Server sessions: "gremlin-server-session-$n". * Fixed a bug in `BulkSet.equals()` which made itself apparent when using `store()` and `aggregate()` with labeled `cap()`. * Fixed a bug where `Result.one()` could potentially block indefinitely under certain circumstances.
