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/04/17 13:30:17 UTC
[6/6] tinkerpop git commit: Merge branch 'pr-569' into tp32
Merge branch 'pr-569' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5282ad7d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5282ad7d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5282ad7d
Branch: refs/heads/tp32
Commit: 5282ad7ddeae9a73d3893dd067dae32b79cd891d
Parents: 5ff3e43 410707b
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Mon Apr 17 08:20:08 2017 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Mon Apr 17 08:20:08 2017 -0400
----------------------------------------------------------------------
CHANGELOG.asciidoc | 5 +
.../src/reference/gremlin-applications.asciidoc | 1 +
.../upgrade/release-3.2.x-incubating.asciidoc | 13 ++
.../gremlin/server/AbstractChannelizer.java | 8 +-
.../tinkerpop/gremlin/server/GraphManager.java | 178 +++++++--------
.../tinkerpop/gremlin/server/GremlinServer.java | 10 +-
.../tinkerpop/gremlin/server/Settings.java | 6 +
.../handler/HttpGremlinEndpointHandler.java | 12 +-
.../gremlin/server/op/session/Session.java | 8 +-
.../server/op/session/SessionOpProcessor.java | 12 +-
.../server/op/standard/StandardOpProcessor.java | 12 +-
.../op/traversal/TraversalOpProcessor.java | 6 +-
.../server/util/DefaultGraphManager.java | 224 +++++++++++++++++++
.../server/util/ServerGremlinExecutor.java | 28 ++-
.../driver/remote/RemoteGraphProvider.java | 2 +-
.../gremlin/server/GraphManagerTest.java | 62 -----
.../server/GremlinServerIntegrateTest.java | 2 +-
.../server/util/DefaultGraphManagerTest.java | 134 +++++++++++
18 files changed, 527 insertions(+), 196 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5282ad7d/CHANGELOG.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5282ad7d/docs/src/reference/gremlin-applications.asciidoc
----------------------------------------------------------------------
diff --cc docs/src/reference/gremlin-applications.asciidoc
index 359238b,a748f79..af01cce
--- a/docs/src/reference/gremlin-applications.asciidoc
+++ b/docs/src/reference/gremlin-applications.asciidoc
@@@ -1072,10 -1072,10 +1072,11 @@@ The following table describes the vario
[width="100%",cols="3,10,^2",options="header"]
|=========================================================
|Key |Description |Default
-|authentication.className |The fully qualified classname of an `Authenticator` implementation to use. If this setting is not present, then authentication is effectively disabled. |`AllowAllAuthenticator`
+|authentication.authenticator |The fully qualified classname of an `Authenticator` implementation to use. If this setting is not present, then authentication is effectively disabled. |`AllowAllAuthenticator`
+|authentication.authenticationHandler | The fully qualified classname of an `AbstractAuthenticationHandler` implementation to use. If this setting is not present, but the `authentication.authenticator` is, it will use that authenticator with the default `AbstractAuthenticationHandler` implementation for the specified `Channelizer` |_none_
|authentication.config |A `Map` of configuration settings to be passes to the `Authenticator` when it is constructed. The settings available are dependent on the implementation. |_none_
|channelizer |The fully qualified classname of the `Channelizer` implementation to use. A `Channelizer` is a "channel initializer" which Gremlin Server uses to define the type of processing pipeline to use. By allowing different `Channelizer` implementations, Gremlin Server can support different communication protocols (e.g. Websockets, Java NIO, etc.). |`WebSocketChannelizer`
+ |graphManager |The fully qualified classname of the `GraphManager` implementation to use. A `GraphManager` is a class that adheres to the Tinkerpop `GraphManager` interface, allowing custom implementations for storing and managing graph references, as well as defining custom methods to open and close graphs instantiations. It is important to note that the Tinkerpop Http and WebSocketChannelizers auto-commit and auto-rollback based on the graphs stored in the graphManager upon script execution completion. |`DefaultGraphManager`
|graphs |A `Map` of `Graph` configuration files where the key of the `Map` becomes the name to which the `Graph` will be bound and the value is the file name of a `Graph` configuration file. |_none_
|gremlinPool |The number of "Gremlin" threads available to execute actual scripts in a `ScriptEngine`. This pool represents the workers available to handle blocking operations in Gremlin Server. When set to `0`, Gremlin Server will use the value provided by `Runtime.availableProcessors()`. |0
|host |The name of the host to bind the server to. |localhost
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5282ad7d/docs/src/upgrade/release-3.2.x-incubating.asciidoc
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5282ad7d/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/AbstractChannelizer.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5282ad7d/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
----------------------------------------------------------------------
diff --cc gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
index b449662,bbc34b9..336fd53
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
@@@ -28,8 -28,8 +28,9 @@@ import org.apache.tinkerpop.gremlin.pro
import org.apache.tinkerpop.gremlin.server.auth.AllowAllAuthenticator;
import org.apache.tinkerpop.gremlin.server.auth.Authenticator;
import org.apache.tinkerpop.gremlin.server.channel.WebSocketChannelizer;
+ import org.apache.tinkerpop.gremlin.server.util.DefaultGraphManager;
import info.ganglia.gmetric4j.gmetric.GMetric;
+import org.apache.tinkerpop.gremlin.server.op.session.SessionOpProcessor;
import org.apache.tinkerpop.gremlin.server.util.LifeCycleHook;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.yaml.snakeyaml.TypeDescription;
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5282ad7d/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/Session.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5282ad7d/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5282ad7d/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/standard/StandardOpProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5282ad7d/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------