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 2015/11/05 22:31:11 UTC
[06/12] incubator-tinkerpop git commit: TINKERPOP3-931 modified the
scopes of OpProcessor
TINKERPOP3-931 modified the scopes of OpProcessor
increases scope of various OpProcessor implementation to make them more extensible. Added javadoc.
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/ebfd5bdb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/ebfd5bdb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/ebfd5bdb
Branch: refs/heads/TINKERPOP3-923
Commit: ebfd5bdbcf4b16569778493644ad29ca9b12c623
Parents: 4cb087d
Author: Nghia Tran <ng...@gmail.com>
Authored: Wed Nov 4 17:50:40 2015 -0800
Committer: Nghia Tran <ng...@gmail.com>
Committed: Wed Nov 4 17:50:40 2015 -0800
----------------------------------------------------------------------
.../gremlin/server/op/AbstractEvalOpProcessor.java | 2 +-
.../gremlin/server/op/session/SessionOpProcessor.java | 9 ++++++---
2 files changed, 7 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ebfd5bdb/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
index cd502e3..9c5c9c9 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
@@ -59,7 +59,7 @@ import static com.codahale.metrics.MetricRegistry.name;
*/
public abstract class AbstractEvalOpProcessor implements OpProcessor {
private static final Logger logger = LoggerFactory.getLogger(AbstractEvalOpProcessor.class);
- private static final Timer evalOpTimer = MetricManager.INSTANCE.getTimer(name(GremlinServer.class, "op", "eval"));
+ public static final Timer evalOpTimer = MetricManager.INSTANCE.getTimer(name(GremlinServer.class, "op", "eval"));
/**
* This may or may not be the full set of invalid binding keys. It is dependent on the static imports made to
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/ebfd5bdb/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java
index 8a31fe9..8441464 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/session/SessionOpProcessor.java
@@ -56,7 +56,7 @@ public class SessionOpProcessor extends AbstractEvalOpProcessor {
/**
* Script engines are evaluated in a per session context where imports/scripts are isolated per session.
*/
- private static ConcurrentHashMap<String, Session> sessions = new ConcurrentHashMap<>();
+ protected static ConcurrentHashMap<String, Session> sessions = new ConcurrentHashMap<>();
static {
MetricManager.INSTANCE.getGuage(sessions::size, name(GremlinServer.class, "sessions"));
@@ -159,8 +159,11 @@ public class SessionOpProcessor extends AbstractEvalOpProcessor {
});
}
-
- private static Session getSession(final Context context, final RequestMessage msg) {
+ /**
+ * Examines the {@link RequestMessage} and extracts the session token. The session is then either found or a new
+ * one is created.
+ */
+ protected static Session getSession(final Context context, final RequestMessage msg) {
final String sessionId = (String) msg.getArgs().get(Tokens.ARGS_SESSION);
logger.debug("In-session request {} for eval for session {} in thread {}",