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/08/22 20:24:21 UTC
[2/7] tinkerpop git commit: [squash] account for value sent as Int.
[squash] account for value sent as Int.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/589f9485
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/589f9485
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/589f9485
Branch: refs/heads/master
Commit: 589f94855d29d9cee800b2d043c277a8c7b8618c
Parents: 720d181
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Wed Aug 15 10:27:28 2018 -0400
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Wed Aug 15 10:27:28 2018 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java | 3 ++-
.../gremlin/server/op/traversal/TraversalOpProcessor.java | 3 ++-
.../tinkerpop/gremlin/server/GremlinServerIntegrateTest.java | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/589f9485/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 78ae6a1..1dfc90f 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
@@ -267,7 +267,8 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
// timeout override
final long seto = args.containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT)
- ? (long) args.get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT)
+ // could be sent as an integer or long
+ ? ((Number) args.get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT)).longValue()
: settings.scriptEvaluationTimeout;
final GremlinExecutor.LifeCycle lifeCycle = GremlinExecutor.LifeCycle.build()
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/589f9485/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
index ea8752f..a1c514f 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
@@ -354,7 +354,8 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
// timeout override
final long seto = msg.getArgs().containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT)
- ? (long) msg.getArgs().get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT)
+ // could be sent as an integer or long
+ ? ((Number) msg.getArgs().get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT)).longValue()
: context.getSettings().scriptEvaluationTimeout;
final GraphManager graphManager = context.getGraphManager();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/589f9485/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
index eb5def9..42cb6d3 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
@@ -834,7 +834,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
public void shouldReceiveFailureTimeOutOnScriptEvalUsingOverride() throws Exception {
try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
final RequestMessage msg = RequestMessage.build("eval")
- .addArg(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT, 100)
+ .addArg(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT, 100L)
.addArg(Tokens.ARGS_GREMLIN, "Thread.sleep(3000);'some-stuff-that-should not return'")
.create();
final List<ResponseMessage> responses = client.submit(msg);