Merge remote-tracking branch 'origin/TINKERPOP-1319' into tp31
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/460af69b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/460af69b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/460af69b Branch: refs/heads/TINKERPOP-1278 Commit: 460af69b0030680f85babcc4a0e50b5c76a5dea9 Parents: 6836f2f 5f7810b Author: Jason Plurad <plur...@us.ibm.com> Authored: Fri Jul 8 09:39:39 2016 -0400 Committer: Jason Plurad <plur...@us.ibm.com> Committed: Fri Jul 8 09:39:39 2016 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../upgrade/release-3.1.x-incubating.asciidoc | 10 +++++++++ .../dsl/credential/CredentialGraphTest.java | 11 ++++++++++ .../decoration/EventStrategyProcessTest.java | 4 ++++ .../tinkerpop/gremlin/structure/EdgeTest.java | 12 ++++++++-- .../gremlin/structure/FeatureSupportTest.java | 19 +++++++++++----- .../tinkerpop/gremlin/structure/GraphTest.java | 12 ++++++++-- .../gremlin/structure/PropertyTest.java | 2 +- .../gremlin/structure/VertexPropertyTest.java | 2 ++ .../tinkerpop/gremlin/structure/VertexTest.java | 23 +++++++++++++++++--- 10 files changed, 82 insertions(+), 14 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/460af69b/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --cc CHANGELOG.asciidoc index 3ec73e5,cb27b2a..0a2b6df --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@@ -26,17 -26,12 +26,18 @@@ 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. +* 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. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/460af69b/docs/src/upgrade/release-3.1.x-incubating.asciidoc ----------------------------------------------------------------------