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 2018/03/20 15:59:46 UTC
[1/3] tinkerpop git commit: Support construct a GremlinServer
instance from gremlin executor service
Repository: tinkerpop
Updated Branches:
refs/heads/master 754eb7945 -> 8b17ab7a8
Support construct a GremlinServer instance from gremlin executor service
This constructor is useful when Gremlin Server is being used in an embedded
style and there is a need to share thread pools with the hosting application.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/d3dbd137
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/d3dbd137
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/d3dbd137
Branch: refs/heads/master
Commit: d3dbd13777f91ec1cd94fc83d309300c6181d29a
Parents: 2fd0f25
Author: Jermy Li <ja...@gmail.com>
Authored: Thu Mar 8 19:10:48 2018 +0800
Committer: Jermy Li <ja...@gmail.com>
Committed: Mon Mar 19 20:16:58 2018 +0800
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/server/GremlinServer.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/d3dbd137/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
index 5b04ebe..55a1d84 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/GremlinServer.java
@@ -81,6 +81,15 @@ public class GremlinServer {
* Construct a Gremlin Server instance from {@link Settings}.
*/
public GremlinServer(final Settings settings) {
+ this(settings, null);
+ }
+
+ /**
+ * Construct a Gremlin Server instance from {@link Settings} and {@link ExecutorService}.
+ * This constructor is useful when Gremlin Server is being used in an embedded style
+ * and there is a need to share thread pools with the hosting application.
+ */
+ public GremlinServer(final Settings settings, final ExecutorService gremlinExecutorService) {
settings.optionalMetrics().ifPresent(GremlinServer::configureMetrics);
this.settings = settings;
provideDefaultForGremlinPoolSize(settings);
@@ -108,8 +117,8 @@ public class GremlinServer {
workerGroup = new NioEventLoopGroup(settings.threadPoolWorker, threadFactoryWorker);
}
- serverGremlinExecutor = new ServerGremlinExecutor(settings, null, workerGroup);
- gremlinExecutorService = serverGremlinExecutor.getGremlinExecutorService();
+ serverGremlinExecutor = new ServerGremlinExecutor(settings, gremlinExecutorService, workerGroup);
+ this.gremlinExecutorService = serverGremlinExecutor.getGremlinExecutorService();
// initialize the OpLoader with configurations being passed to each OpProcessor implementation loaded
OpLoader.init(settings);
[3/3] tinkerpop git commit: Merge branch 'tp33'
Posted by sp...@apache.org.
Merge branch 'tp33'
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8b17ab7a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8b17ab7a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8b17ab7a
Branch: refs/heads/master
Commit: 8b17ab7a8e85edaef18ad8ddec569738b73f90d5
Parents: 754eb79 aab8218
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Mar 20 11:59:36 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Mar 20 11:59:36 2018 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/server/GremlinServer.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
[2/3] tinkerpop git commit: Merge branch 'pr-821' into tp33
Posted by sp...@apache.org.
Merge branch 'pr-821' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/aab82182
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/aab82182
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/aab82182
Branch: refs/heads/master
Commit: aab821826a005e7a50efe744ca5cb8f5f5d36d0d
Parents: c466efa d3dbd13
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Mar 20 11:17:50 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Mar 20 11:17:50 2018 -0400
----------------------------------------------------------------------
.../apache/tinkerpop/gremlin/server/GremlinServer.java | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------