[26/50] tinkerpop git commit: Merge branch 'TINKERPOP-1095' into tp32

[sp...@apache.org]

Merge branch 'TINKERPOP-1095' 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/11459179
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/11459179
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/11459179

Branch: refs/heads/TINKERPOP-1443
Commit: 1145917996e9a6e37d8794cea4e067cda7879f6e
Parents: 6613178 48daf8d
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Mar 29 11:38:15 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Mar 29 11:38:15 2017 -0400

----------------------------------------------------------------------
 CHANGELOG.asciidoc                              |  11 +-
 .../gremlin/jsr223/GremlinScriptContext.java    | 234 +++++++++++++++++++
 .../jsr223/GremlinGroovyScriptEngine.java       |  22 ++
 3 files changed, 262 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/11459179/CHANGELOG.asciidoc
----------------------------------------------------------------------
diff --cc CHANGELOG.asciidoc
index 7d4e74b,e6216c0..417a7fe
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@@ -30,14 -29,14 +30,15 @@@ TinkerPop 3.2.5 (Release Date: NOT OFFI
  * De-registered metrics on Gremlin Server shutdown.
  * Added "help" command option on `:remote config` for plugins that support that feature in the Gremlin Console.
  * Allowed for multiple scripts and related arguments to be passed to `gremlin.sh` via `-i` and `-e`.
 +* Updated `PathRetractionStrategy` to not run if the provided traversal contains a `VertexProgramStep` that has a `LABELED_PATH` requirement.
  * Added various metrics to the `GremlinGroovyScriptEngine` around script compilation and exposed them in Gremlin Server.
  * Moved the `caffeine` dependency down to `gremlin-groovy` and out of `gremlin-server`.
- * Improved script compilation in `GremlinGroovyScriptEngine` to use better caching, log long compile times and prevent failed compilations from recompiling on future requests.
- * Script compilation is synchronised.
- * Script compilation times are placed in to logs.
- * Failed scripts will not be recompiled.
- * Scripts that take over 5 seconds to compile are logged as a warning.
+ * Improved script compilation in `GremlinGroovyScriptEngine to use better caching, log long compile times and prevent failed compilations from recompiling on future requests.
+ * Synchronized script compilation.
+ * Logged Script compilation times.
+ * Prevented failed scripts from recompiling.
+ * Logged warnings for scripts that take "too long" to compile.
+ * Improved memory usage of the `GremlinGroovyScriptEngine`.
  * Added `cyclicPath().from().to().by()` support to `GraphTraversal`.
  * Added `simplePath().from().to().by()` support to `GraphTraversal`.
  * Added `path().from().to()` support to `GraphTraversal` so sub-paths can be isolated from the current path.