You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2017/01/25 14:28:53 UTC
[1/2] tinkerpop git commit: Fixed a gremlin server bug with global
bindings
Repository: tinkerpop
Updated Branches:
refs/heads/master d18dd021a -> 1169f6168
Fixed a gremlin server bug with global bindings
TraversalSources established in init scripts using the new plugin system weren't getting set to the GraphManager given the fact that the GremlinScriptEngineManager does runs the scripts when the GremlinScriptEngine is first initialized. By forcing the GremlinScriptEngine to initialize with a throw-away script the init scripts will execute. This is a bit of a hack - will consider other solutions for 3.3.0. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/956f3505
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/956f3505
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/956f3505
Branch: refs/heads/master
Commit: 956f35056a967ecf1d8e74dc04bb227ba4823047
Parents: d08a68f
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jan 25 09:24:49 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 25 09:24:49 2017 -0500
----------------------------------------------------------------------
.../tinkerpop/gremlin/server/util/ServerGremlinExecutor.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/956f3505/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
index 2b2f1f1..199c9f8 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/util/ServerGremlinExecutor.java
@@ -145,6 +145,12 @@ public class ServerGremlinExecutor<T extends ScheduledExecutorService> {
logger.info("Initialized GremlinExecutor and configured ScriptEngines.");
+ // force each scriptengine to process something so that the init scripts will fire (this is necessary if
+ // the GremlinExecutor is using the GremlinScriptEngineManager. this is a bit of hack, but it at least allows
+ // the global bindings to become available after the init scripts are run (DefaultGremlinScriptEngineManager
+ // runs the init scripts when the GremlinScriptEngine is created.
+ settings.scriptEngines.keySet().forEach(engineName -> gremlinExecutor.eval("1+1", engineName, Collections.emptyMap()).join());
+
// script engine init may have altered the graph bindings or maybe even created new ones - need to
// re-apply those references back
gremlinExecutor.getGlobalBindings().entrySet().stream()
[2/2] tinkerpop git commit: Merge branch 'tp32'
Posted by sp...@apache.org.
Merge branch 'tp32'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1169f616
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1169f616
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1169f616
Branch: refs/heads/master
Commit: 1169f61680f0e0e40d227ca7d818c83eb8341e22
Parents: d18dd02 956f350
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Jan 25 09:28:30 2017 -0500
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Jan 25 09:28:30 2017 -0500
----------------------------------------------------------------------
.../tinkerpop/gremlin/server/util/ServerGremlinExecutor.java | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------