Merge remote-tracking branch 'origin/TINKERPOP-1352' into tp31
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/c8c77afe
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/c8c77afe
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/c8c77afe
Branch: refs/heads/TINKERPOP-1278
Commit: c8c77afeb63f88d7b153738db2bddba12aeda969
Parents: bb9d718 565b2e8
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Fri Jul 8 14:15:01 2016 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Fri Jul 8 14:15:01 2016 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 3 ++
.../tinkerpop/gremlin/driver/Connection.java | 5 ++-
.../gremlin/driver/ConnectionPool.java | 46 +++++++++-----------
gremlin-server/conf/gremlin-server-neo4j.yaml | 2 +-
.../conf/gremlin-server-rest-secure.yaml | 2 +-
gremlin-server/conf/gremlin-server-secure.yaml | 2 +-
gremlin-server/conf/gremlin-server-spark.yaml | 2 +-
gremlin-server/conf/gremlin-server.yaml | 2 +-
.../tinkerpop/gremlin/server/GremlinServer.java | 2 +-
.../server/op/AbstractEvalOpProcessor.java | 11 ++++-
.../gremlin/server/op/session/Session.java | 4 ++
.../server/op/session/SessionOpProcessor.java | 1 -
.../server/GremlinDriverIntegrateTest.java | 9 +++-
.../GremlinServerAuthOldIntegrateTest.java | 4 +-
.../GremlinServerSessionIntegrateTest.java | 17 +++++---
.../server/gremlin-server-integration.yaml | 2 +-
.../server/gremlin-server-performance.yaml | 2 +-
17 files changed, 70 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c8c77afe/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 881dbb3,7cf46f8..3499304
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -26,19 -26,15 +26,22 @@@ 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.
+ * Fixed a bug in the driver where many parallel requests over a session would
sometimes force a connection to close and replace itself.
* 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.
+ * Fixed a bug where the `ConnectionPool` in the driver would not grow with
certain configuration options.
+ * Fixed a bug where pauses in Gremlin Server writing to an overtaxed client
would generate unexpected `FastNoSuchElementException` errors.
* 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/c8c77afe/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/c8c77afe/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
----------------------------------------------------------------------
