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:20 UTC
[1/7] tinkerpop git commit: Do not format and reparse eval timeout
arg when evaluating request.
Repository: tinkerpop
Updated Branches:
refs/heads/master 20bc5a3bb -> fb14324fb
Do not format and reparse eval timeout arg when evaluating request.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/720d181b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/720d181b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/720d181b
Branch: refs/heads/master
Commit: 720d181b1b1b68e4b4dbcd10c8aabdfcfc58a3be
Parents: ea18963
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Tue Aug 14 14:59:20 2018 -0400
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Tue Aug 14 14:59:20 2018 -0400
----------------------------------------------------------------------
.../tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java | 5 +++--
.../gremlin/server/op/traversal/TraversalOpProcessor.java | 5 +++--
2 files changed, 6 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/720d181b/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 ca1ee53..78ae6a1 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
@@ -266,8 +266,9 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
true : (Boolean) args.getOrDefault(Tokens.ARGS_MANAGE_TRANSACTION, false);
// timeout override
- final long seto = args.containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT) ?
- Long.parseLong(args.get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT).toString()) : settings.scriptEvaluationTimeout;
+ final long seto = args.containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT)
+ ? (long) args.get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT)
+ : settings.scriptEvaluationTimeout;
final GremlinExecutor.LifeCycle lifeCycle = GremlinExecutor.LifeCycle.build()
.scriptEvaluationTimeoutOverride(seto)
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/720d181b/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 0168cba..ea8752f 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
@@ -353,8 +353,9 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
final Map<String, String> aliases = (Map<String, String>) msg.optionalArgs(Tokens.ARGS_ALIASES).get();
// timeout override
- final long seto = msg.getArgs().containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT) ?
- Long.parseLong(msg.getArgs().get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT).toString()) : context.getSettings().scriptEvaluationTimeout;
+ final long seto = msg.getArgs().containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT)
+ ? (long) msg.getArgs().get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT)
+ : context.getSettings().scriptEvaluationTimeout;
final GraphManager graphManager = context.getGraphManager();
final String traversalSourceName = aliases.entrySet().iterator().next().getValue();
[7/7] 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/fb14324f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/fb14324f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/fb14324f
Branch: refs/heads/master
Commit: fb14324fb47cdff98b07798da4a7fc957c7374e3
Parents: 20bc5a3 59fc032
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 22 16:24:08 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 22 16:24:08 2018 -0400
----------------------------------------------------------------------
.../test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs | 2 +-
.../tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java | 6 ++++--
.../gremlin/server/op/traversal/TraversalOpProcessor.java | 6 ++++--
.../tinkerpop/gremlin/server/GremlinServerIntegrateTest.java | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb14324f/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/fb14324f/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------
[2/7] tinkerpop git commit: [squash] account for value sent as Int.
Posted by sp...@apache.org.
[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);
[4/7] tinkerpop git commit: [squash] re: fix .Net timeout argument.
Posted by sp...@apache.org.
[squash] re: fix .Net timeout argument.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1f1465c0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1f1465c0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1f1465c0
Branch: refs/heads/master
Commit: 1f1465c038c009f78f7c3cb3e642aea7c6d4050c
Parents: a361e7e
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Tue Aug 21 10:24:57 2018 -0400
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Tue Aug 21 10:24:57 2018 -0400
----------------------------------------------------------------------
.../test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1f1465c0/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs
index 1b0d31c..8e67ba4 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs
@@ -101,8 +101,8 @@ namespace Gremlin.Net.IntegrationTest.Driver
var gremlinServer = new GremlinServer(TestHost, TestPort);
using (var gremlinClient = new GremlinClient(gremlinServer))
{
- const int timeOutInMs = 1;
- const long scriptSleepTimeInMs = 5000;
+ const long timeOutInMs = 1L;
+ const int scriptSleepTimeInMs = 5000;
var sleepScript = _requestMessageProvider.GetSleepGremlinScript(scriptSleepTimeInMs);
var requestMsg =
[3/7] tinkerpop git commit: [squash] Fix .Net test.
Posted by sp...@apache.org.
[squash] Fix .Net test.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a361e7e3
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a361e7e3
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a361e7e3
Branch: refs/heads/master
Commit: a361e7e39e92967256811a45f5fdf7611cd56109
Parents: 589f948
Author: Kevin Gallardo <ke...@datastax.com>
Authored: Wed Aug 15 10:37:56 2018 -0400
Committer: Kevin Gallardo <ke...@datastax.com>
Committed: Wed Aug 15 10:37:56 2018 -0400
----------------------------------------------------------------------
.../test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/a361e7e3/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs
----------------------------------------------------------------------
diff --git a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs
index 6f6505f..1b0d31c 100644
--- a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs
+++ b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs
@@ -102,7 +102,7 @@ namespace Gremlin.Net.IntegrationTest.Driver
using (var gremlinClient = new GremlinClient(gremlinServer))
{
const int timeOutInMs = 1;
- const int scriptSleepTimeInMs = 5000;
+ const long scriptSleepTimeInMs = 5000;
var sleepScript = _requestMessageProvider.GetSleepGremlinScript(scriptSleepTimeInMs);
var requestMsg =
[5/7] tinkerpop git commit: Merge branch 'pr-914' into tp32
Posted by sp...@apache.org.
Merge branch 'pr-914' into tp32
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/675c0771
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/675c0771
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/675c0771
Branch: refs/heads/master
Commit: 675c07717e2599787390a1dea088d45c5f35bed1
Parents: 6a6959a 1f1465c
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 22 16:23:27 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 22 16:23:27 2018 -0400
----------------------------------------------------------------------
.../test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs | 2 +-
.../tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java | 6 ++++--
.../gremlin/server/op/traversal/TraversalOpProcessor.java | 6 ++++--
.../tinkerpop/gremlin/server/GremlinServerIntegrateTest.java | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
[6/7] tinkerpop git commit: Merge branch 'tp32' into tp33
Posted by sp...@apache.org.
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/59fc032f
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/59fc032f
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/59fc032f
Branch: refs/heads/master
Commit: 59fc032f5f44e32617e3b1b9b49ecce9aa89becf
Parents: 6582056 675c077
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Wed Aug 22 16:24:00 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Wed Aug 22 16:24:00 2018 -0400
----------------------------------------------------------------------
.../test/Gremlin.Net.IntegrationTest/Driver/MessagesTests.cs | 2 +-
.../tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java | 6 ++++--
.../gremlin/server/op/traversal/TraversalOpProcessor.java | 6 ++++--
.../tinkerpop/gremlin/server/GremlinServerIntegrateTest.java | 2 +-
4 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/59fc032f/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/AbstractEvalOpProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/59fc032f/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/op/traversal/TraversalOpProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/59fc032f/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinServerIntegrateTest.java
----------------------------------------------------------------------