[3/5] tinkerpop git commit: [squash] Fix .Net test.
[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/tp32
Commit: a361e7e39e92967256811a45f5fdf7611cd56109
Parents: 589f948
Author: Kevin Gallardo
Authored: Wed Aug 15 10:37:56 2018 -0400
Committer: Kevin Gallardo
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 =
[6/6] tinkerpop git commit: Merge branch 'tp32' into tp33
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/tp33 Commit: 59fc032f5f44e32617e3b1b9b49ecce9aa89becf Parents: 6582056 675c077 Author: Stephen Mallette Authored: Wed Aug 22 16:24:00 2018 -0400 Committer: Stephen Mallette 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 --
[5/7] tinkerpop git commit: Merge branch 'pr-914' into tp32
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 Authored: Wed Aug 22 16:23:27 2018 -0400 Committer: Stephen Mallette 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(-) --
[1/5] tinkerpop git commit: Do not format and reparse eval timeout arg when evaluating request.
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 6a6959a33 -> 675c07717
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/tp32
Commit: 720d181b1b1b68e4b4dbcd10c8aabdfcfc58a3be
Parents: ea18963
Author: Kevin Gallardo
Authored: Tue Aug 14 14:59:20 2018 -0400
Committer: Kevin Gallardo
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 aliases = (Map)
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();
[2/5] 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/tp32
Commit: 589f94855d29d9cee800b2d043c277a8c7b8618c
Parents: 720d181
Author: Kevin Gallardo
Authored: Wed Aug 15 10:27:28 2018 -0400
Committer: Kevin Gallardo
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 responses = client.submit(msg);
[3/7] tinkerpop git commit: [squash] Fix .Net test.
[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
Authored: Wed Aug 15 10:37:56 2018 -0400
Committer: Kevin Gallardo
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 =
[6/7] tinkerpop git commit: Merge branch 'tp32' into tp33
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 Authored: Wed Aug 22 16:24:00 2018 -0400 Committer: Stephen Mallette 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 --
[4/5] tinkerpop git commit: [squash] re: fix .Net timeout argument.
[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/tp32
Commit: 1f1465c038c009f78f7c3cb3e642aea7c6d4050c
Parents: a361e7e
Author: Kevin Gallardo
Authored: Tue Aug 21 10:24:57 2018 -0400
Committer: Kevin Gallardo
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 =
[5/5] tinkerpop git commit: Merge branch 'pr-914' into tp32
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/tp32 Commit: 675c07717e2599787390a1dea088d45c5f35bed1 Parents: 6a6959a 1f1465c Author: Stephen Mallette Authored: Wed Aug 22 16:23:27 2018 -0400 Committer: Stephen Mallette 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(-) --
[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
Authored: Tue Aug 14 14:59:20 2018 -0400
Committer: Kevin Gallardo
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 aliases = (Map)
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();
[2/6] 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/tp33
Commit: 589f94855d29d9cee800b2d043c277a8c7b8618c
Parents: 720d181
Author: Kevin Gallardo
Authored: Wed Aug 15 10:27:28 2018 -0400
Committer: Kevin Gallardo
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 responses = client.submit(msg);
[7/7] tinkerpop git commit: Merge branch 'tp33'
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 Authored: Wed Aug 22 16:24:08 2018 -0400 Committer: Stephen Mallette 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 --
[1/6] tinkerpop git commit: Do not format and reparse eval timeout arg when evaluating request.
Repository: tinkerpop
Updated Branches:
refs/heads/tp33 65820569f -> 59fc032f5
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/tp33
Commit: 720d181b1b1b68e4b4dbcd10c8aabdfcfc58a3be
Parents: ea18963
Author: Kevin Gallardo
Authored: Tue Aug 14 14:59:20 2018 -0400
Committer: Kevin Gallardo
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 aliases = (Map)
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();
[4/6] tinkerpop git commit: [squash] re: fix .Net timeout argument.
[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/tp33
Commit: 1f1465c038c009f78f7c3cb3e642aea7c6d4050c
Parents: a361e7e
Author: Kevin Gallardo
Authored: Tue Aug 21 10:24:57 2018 -0400
Committer: Kevin Gallardo
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 =
[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
Authored: Wed Aug 15 10:27:28 2018 -0400
Committer: Kevin Gallardo
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 responses = client.submit(msg);
[4/7] tinkerpop git commit: [squash] re: fix .Net timeout argument.
[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
Authored: Tue Aug 21 10:24:57 2018 -0400
Committer: Kevin Gallardo
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 =
[01/11] tinkerpop git commit: Add null checking for configuration
Repository: tinkerpop
Updated Branches:
refs/heads/master de29c768a -> 20bc5a3bb
Add null checking for configuration
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/32a8ee6d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/32a8ee6d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/32a8ee6d
Branch: refs/heads/master
Commit: 32a8ee6d2faed5bfbb36dd30d17dff7d6cff03e0
Parents: f49b279
Author: Justin Chu <15710241+justinch...@users.noreply.github.com>
Authored: Tue Aug 21 15:13:25 2018 -0400
Committer: Justin Chu <15710241+justinch...@users.noreply.github.com>
Committed: Tue Aug 21 15:18:50 2018 -0400
--
.../apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +-
.../apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32a8ee6d/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
--
diff --git
a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
index 701c85c..b018938 100644
---
a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
+++
b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
@@ -57,7 +57,7 @@ public abstract class AbstractNeo4jGraphProvider extends
AbstractGraphProvider {
graph.close();
}
-if (configuration.containsKey(Neo4jGraph.CONFIG_DIRECTORY)) {
+if (null != configuration &&
configuration.containsKey(Neo4jGraph.CONFIG_DIRECTORY)) {
// this is a non-in-sideEffects configuration so blow away the
directory
final File graphDirectory = new
File(configuration.getString(Neo4jGraph.CONFIG_DIRECTORY));
deleteDirectory(graphDirectory);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32a8ee6d/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
--
diff --git
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
index 7f0e6f3..911137d 100644
---
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
+++
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
@@ -85,7 +85,7 @@ public class TinkerGraphProvider extends
AbstractGraphProvider {
graph.close();
// in the even the graph is persisted we need to clean up
-final String graphLocation =
configuration.getString(TinkerGraph.GREMLIN_TINKERGRAPH_GRAPH_LOCATION, null);
+final String graphLocation = null != configuration ?
configuration.getString(TinkerGraph.GREMLIN_TINKERGRAPH_GRAPH_LOCATION, null) :
null;
if (graphLocation != null) {
final File f = new File(graphLocation);
f.delete();
[09/11] tinkerpop git commit: Merge branch 'pr-916'
Merge branch 'pr-916' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0207608e Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0207608e Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0207608e Branch: refs/heads/master Commit: 0207608ede9a722d167968024f4209443c7a9a4d Parents: de29c76 5aedbf1 Author: Stephen Mallette Authored: Wed Aug 22 16:17:03 2018 -0400 Committer: Stephen Mallette Committed: Wed Aug 22 16:17:03 2018 -0400 -- .../tinkerpop/gremlin/util/TinkerGraphProvider.java | 2 +- .../apache/tinkerpop/gremlin/AbstractGremlinTest.java | 7 --- .../org/apache/tinkerpop/gremlin/GraphProvider.java | 12 +--- .../gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +- .../gremlin/tinkergraph/TinkerGraphProvider.java| 2 +- 5 files changed, 16 insertions(+), 9 deletions(-) --
[02/11] tinkerpop git commit: Update javadoc and comments for clear method; Remove unused import
Update javadoc and comments for clear method;
Remove unused import
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/038b9cd7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/038b9cd7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/038b9cd7
Branch: refs/heads/master
Commit: 038b9cd759d0ac97a3c3820ec55026938d4c74be
Parents: 32a8ee6
Author: Justin Chu <15710241+justinch...@users.noreply.github.com>
Authored: Tue Aug 21 15:14:16 2018 -0400
Committer: Justin Chu <15710241+justinch...@users.noreply.github.com>
Committed: Tue Aug 21 17:33:34 2018 -0400
--
.../apache/tinkerpop/gremlin/AbstractGremlinTest.java | 4 +++-
.../org/apache/tinkerpop/gremlin/GraphProvider.java | 12 +---
2 files changed, 12 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/038b9cd7/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
index 8485d56..a03e351 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
@@ -31,7 +31,6 @@ import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.junit.After;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.rules.TestName;
import org.slf4j.Logger;
@@ -133,6 +132,8 @@ public abstract class AbstractGremlinTest {
public void tearDown() throws Exception {
if (null != graphProvider) {
graphProvider.getTestListener().ifPresent(l ->
l.onTestEnd(this.getClass(), name.getMethodName()));
+
+// GraphProvider that has implemented the clear method must check
null for graph and config.
graphProvider.clear(graph, config);
// All GraphProvider objects should be an instance of
ManagedGraphProvider, as this is handled by GraphManager
@@ -144,6 +145,7 @@ public abstract class AbstractGremlinTest {
logger.warn("The {} is not of type ManagedGraphProvider and
therefore graph instances may leak between test cases.",
graphProvider.getClass());
g = null;
+graph = null;
config = null;
graphProvider = null;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/038b9cd7/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
index c785cfc..30af95a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
@@ -125,8 +125,8 @@ public interface GraphProvider {
}
/**
- * Creates a new {@link Graph} instance from the Configuration object
using {@link GraphFactory}. The assumption
- * here is that the {@code Configuration} has been created by one of the
+ * Creates a new {@link Graph} instance from the {@link
org.apache.commons.configuration.Configuration} object using {@link
GraphFactory}.
+ * The assumption here is that the {@code Configuration} has been created
by one of the
* {@link #newGraphConfiguration(String, Class, String,
LoadGraphWith.GraphData)} methods and has therefore
* already been modified by the implementation as necessary for {@link
Graph} creation.
*/
@@ -149,6 +149,9 @@ public interface GraphProvider {
* to construct the graph. The default implementation simply calls
* {@link #clear(Graph, org.apache.commons.configuration.Configuration)}
with
* a null graph argument.
+ *
+ * Implementations should be able to accept an argument of null for the
{@code org.apache.commons.configuration.Configuration}
+ * as well, and a proper handling is needed. Otherwise, a
NullPointerException may be thrown.
*/
public default void clear(final Configuration configuration) throws
Exception {
clear(null, configuration);
@@ -160,10 +163,13 @@ public interface GraphProvider {
* For a brute force approach, implementers can simply delete data
directories provided in the configuration.
* Implementers may choose a more elegant approach if it exists.
*
- * Implementations should
[7/7] tinkerpop git commit: Merge branch 'tp32' into tp33
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/65820569 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/65820569 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/65820569 Branch: refs/heads/tp33 Commit: 65820569f9eb47f8435699d2308bbedc94306b7b Parents: a8931d5 6a6959a Author: Stephen Mallette Authored: Wed Aug 22 16:17:23 2018 -0400 Committer: Stephen Mallette Committed: Wed Aug 22 16:17:23 2018 -0400 -- --
[1/7] tinkerpop git commit: Add null checking for configuration
Repository: tinkerpop
Updated Branches:
refs/heads/tp33 b34515a91 -> 65820569f
Add null checking for configuration
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/32a8ee6d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/32a8ee6d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/32a8ee6d
Branch: refs/heads/tp33
Commit: 32a8ee6d2faed5bfbb36dd30d17dff7d6cff03e0
Parents: f49b279
Author: Justin Chu <15710241+justinch...@users.noreply.github.com>
Authored: Tue Aug 21 15:13:25 2018 -0400
Committer: Justin Chu <15710241+justinch...@users.noreply.github.com>
Committed: Tue Aug 21 15:18:50 2018 -0400
--
.../apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +-
.../apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32a8ee6d/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
--
diff --git
a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
index 701c85c..b018938 100644
---
a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
+++
b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
@@ -57,7 +57,7 @@ public abstract class AbstractNeo4jGraphProvider extends
AbstractGraphProvider {
graph.close();
}
-if (configuration.containsKey(Neo4jGraph.CONFIG_DIRECTORY)) {
+if (null != configuration &&
configuration.containsKey(Neo4jGraph.CONFIG_DIRECTORY)) {
// this is a non-in-sideEffects configuration so blow away the
directory
final File graphDirectory = new
File(configuration.getString(Neo4jGraph.CONFIG_DIRECTORY));
deleteDirectory(graphDirectory);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32a8ee6d/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
--
diff --git
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
index 7f0e6f3..911137d 100644
---
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
+++
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
@@ -85,7 +85,7 @@ public class TinkerGraphProvider extends
AbstractGraphProvider {
graph.close();
// in the even the graph is persisted we need to clean up
-final String graphLocation =
configuration.getString(TinkerGraph.GREMLIN_TINKERGRAPH_GRAPH_LOCATION, null);
+final String graphLocation = null != configuration ?
configuration.getString(TinkerGraph.GREMLIN_TINKERGRAPH_GRAPH_LOCATION, null) :
null;
if (graphLocation != null) {
final File f = new File(graphLocation);
f.delete();
[3/3] tinkerpop git commit: Merge branch 'pr-917' into tp32
Merge branch 'pr-917' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6a6959a3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6a6959a3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6a6959a3 Branch: refs/heads/tp32 Commit: 6a6959a33c24eea9777bc7c2c6df31954a6ca1c2 Parents: ca3a343 038b9cd Author: Stephen Mallette Authored: Wed Aug 22 16:16:34 2018 -0400 Committer: Stephen Mallette Committed: Wed Aug 22 16:16:34 2018 -0400 -- .../apache/tinkerpop/gremlin/AbstractGremlinTest.java | 4 +++- .../org/apache/tinkerpop/gremlin/GraphProvider.java | 12 +--- .../gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +- .../gremlin/tinkergraph/TinkerGraphProvider.java| 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) --
[3/7] tinkerpop git commit: Merge branch 'graphprovider-clear-tp32' into graphprovider-clear-tp33
Merge branch 'graphprovider-clear-tp32' into graphprovider-clear-tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bf94f43f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bf94f43f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bf94f43f Branch: refs/heads/tp33 Commit: bf94f43f39c7812adec402730aaa2a8ed8526900 Parents: b46c295 038b9cd Author: Justin Chu <15710241+justinch...@users.noreply.github.com> Authored: Tue Aug 21 18:24:42 2018 -0400 Committer: Justin Chu <15710241+justinch...@users.noreply.github.com> Committed: Tue Aug 21 18:24:42 2018 -0400 -- .../apache/tinkerpop/gremlin/AbstractGremlinTest.java | 4 +++- .../org/apache/tinkerpop/gremlin/GraphProvider.java | 12 +--- .../gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +- .../gremlin/tinkergraph/TinkerGraphProvider.java| 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf94f43f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java --
[4/7] tinkerpop git commit: Add null checking for configuration; Remove unused import
Add null checking for configuration;
Remove unused import
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6efd47da
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6efd47da
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6efd47da
Branch: refs/heads/tp33
Commit: 6efd47da55c1d621714c481b21cf8b4494585680
Parents: bf94f43
Author: Justin Chu <15710241+justinch...@users.noreply.github.com>
Authored: Tue Aug 21 18:28:59 2018 -0400
Committer: Justin Chu <15710241+justinch...@users.noreply.github.com>
Committed: Tue Aug 21 18:28:59 2018 -0400
--
.../org/apache/tinkerpop/gremlin/util/TinkerGraphProvider.java | 2 +-
.../java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6efd47da/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/util/TinkerGraphProvider.java
--
diff --git
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/util/TinkerGraphProvider.java
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/util/TinkerGraphProvider.java
index 7a87414..bd2d20b 100644
---
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/util/TinkerGraphProvider.java
+++
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/util/TinkerGraphProvider.java
@@ -85,7 +85,7 @@ public class TinkerGraphProvider extends
AbstractGraphProvider {
graph.close();
// in the even the graph is persisted we need to clean up
-final String graphLocation =
configuration.getString(TinkerGraph.GREMLIN_TINKERGRAPH_GRAPH_LOCATION, null);
+final String graphLocation = null != configuration ?
configuration.getString(TinkerGraph.GREMLIN_TINKERGRAPH_GRAPH_LOCATION, null) :
null;
if (graphLocation != null) {
final File f = new File(graphLocation);
f.delete();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6efd47da/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
index 2ccf762..a614252 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
@@ -41,7 +41,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
-import java.util.Random;
import java.util.Set;
import java.util.function.Consumer;
import java.util.stream.Collectors;
[5/7] tinkerpop git commit: Merge branch 'pr-917' into tp32
Merge branch 'pr-917' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6a6959a3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6a6959a3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6a6959a3 Branch: refs/heads/tp33 Commit: 6a6959a33c24eea9777bc7c2c6df31954a6ca1c2 Parents: ca3a343 038b9cd Author: Stephen Mallette Authored: Wed Aug 22 16:16:34 2018 -0400 Committer: Stephen Mallette Committed: Wed Aug 22 16:16:34 2018 -0400 -- .../apache/tinkerpop/gremlin/AbstractGremlinTest.java | 4 +++- .../org/apache/tinkerpop/gremlin/GraphProvider.java | 12 +--- .../gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +- .../gremlin/tinkergraph/TinkerGraphProvider.java| 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) --
[2/7] tinkerpop git commit: Update javadoc and comments for clear method; Remove unused import
Update javadoc and comments for clear method;
Remove unused import
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/038b9cd7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/038b9cd7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/038b9cd7
Branch: refs/heads/tp33
Commit: 038b9cd759d0ac97a3c3820ec55026938d4c74be
Parents: 32a8ee6
Author: Justin Chu <15710241+justinch...@users.noreply.github.com>
Authored: Tue Aug 21 15:14:16 2018 -0400
Committer: Justin Chu <15710241+justinch...@users.noreply.github.com>
Committed: Tue Aug 21 17:33:34 2018 -0400
--
.../apache/tinkerpop/gremlin/AbstractGremlinTest.java | 4 +++-
.../org/apache/tinkerpop/gremlin/GraphProvider.java | 12 +---
2 files changed, 12 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/038b9cd7/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
index 8485d56..a03e351 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
@@ -31,7 +31,6 @@ import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.junit.After;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.rules.TestName;
import org.slf4j.Logger;
@@ -133,6 +132,8 @@ public abstract class AbstractGremlinTest {
public void tearDown() throws Exception {
if (null != graphProvider) {
graphProvider.getTestListener().ifPresent(l ->
l.onTestEnd(this.getClass(), name.getMethodName()));
+
+// GraphProvider that has implemented the clear method must check
null for graph and config.
graphProvider.clear(graph, config);
// All GraphProvider objects should be an instance of
ManagedGraphProvider, as this is handled by GraphManager
@@ -144,6 +145,7 @@ public abstract class AbstractGremlinTest {
logger.warn("The {} is not of type ManagedGraphProvider and
therefore graph instances may leak between test cases.",
graphProvider.getClass());
g = null;
+graph = null;
config = null;
graphProvider = null;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/038b9cd7/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
index c785cfc..30af95a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
@@ -125,8 +125,8 @@ public interface GraphProvider {
}
/**
- * Creates a new {@link Graph} instance from the Configuration object
using {@link GraphFactory}. The assumption
- * here is that the {@code Configuration} has been created by one of the
+ * Creates a new {@link Graph} instance from the {@link
org.apache.commons.configuration.Configuration} object using {@link
GraphFactory}.
+ * The assumption here is that the {@code Configuration} has been created
by one of the
* {@link #newGraphConfiguration(String, Class, String,
LoadGraphWith.GraphData)} methods and has therefore
* already been modified by the implementation as necessary for {@link
Graph} creation.
*/
@@ -149,6 +149,9 @@ public interface GraphProvider {
* to construct the graph. The default implementation simply calls
* {@link #clear(Graph, org.apache.commons.configuration.Configuration)}
with
* a null graph argument.
+ *
+ * Implementations should be able to accept an argument of null for the
{@code org.apache.commons.configuration.Configuration}
+ * as well, and a proper handling is needed. Otherwise, a
NullPointerException may be thrown.
*/
public default void clear(final Configuration configuration) throws
Exception {
clear(null, configuration);
@@ -160,10 +163,13 @@ public interface GraphProvider {
* For a brute force approach, implementers can simply delete data
directories provided in the configuration.
* Implementers may choose a more elegant approach if it exists.
*
- * Implementations should be
[10/11] tinkerpop git commit: Merge branch 'tp32' into tp33
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/65820569 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/65820569 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/65820569 Branch: refs/heads/master Commit: 65820569f9eb47f8435699d2308bbedc94306b7b Parents: a8931d5 6a6959a Author: Stephen Mallette Authored: Wed Aug 22 16:17:23 2018 -0400 Committer: Stephen Mallette Committed: Wed Aug 22 16:17:23 2018 -0400 -- --
[1/3] tinkerpop git commit: Add null checking for configuration
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 ca3a34327 -> 6a6959a33
Add null checking for configuration
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/32a8ee6d
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/32a8ee6d
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/32a8ee6d
Branch: refs/heads/tp32
Commit: 32a8ee6d2faed5bfbb36dd30d17dff7d6cff03e0
Parents: f49b279
Author: Justin Chu <15710241+justinch...@users.noreply.github.com>
Authored: Tue Aug 21 15:13:25 2018 -0400
Committer: Justin Chu <15710241+justinch...@users.noreply.github.com>
Committed: Tue Aug 21 15:18:50 2018 -0400
--
.../apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +-
.../apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32a8ee6d/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
--
diff --git
a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
index 701c85c..b018938 100644
---
a/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
+++
b/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java
@@ -57,7 +57,7 @@ public abstract class AbstractNeo4jGraphProvider extends
AbstractGraphProvider {
graph.close();
}
-if (configuration.containsKey(Neo4jGraph.CONFIG_DIRECTORY)) {
+if (null != configuration &&
configuration.containsKey(Neo4jGraph.CONFIG_DIRECTORY)) {
// this is a non-in-sideEffects configuration so blow away the
directory
final File graphDirectory = new
File(configuration.getString(Neo4jGraph.CONFIG_DIRECTORY));
deleteDirectory(graphDirectory);
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/32a8ee6d/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
--
diff --git
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
index 7f0e6f3..911137d 100644
---
a/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
+++
b/tinkergraph-gremlin/src/test/java/org/apache/tinkerpop/gremlin/tinkergraph/TinkerGraphProvider.java
@@ -85,7 +85,7 @@ public class TinkerGraphProvider extends
AbstractGraphProvider {
graph.close();
// in the even the graph is persisted we need to clean up
-final String graphLocation =
configuration.getString(TinkerGraph.GREMLIN_TINKERGRAPH_GRAPH_LOCATION, null);
+final String graphLocation = null != configuration ?
configuration.getString(TinkerGraph.GREMLIN_TINKERGRAPH_GRAPH_LOCATION, null) :
null;
if (graphLocation != null) {
final File f = new File(graphLocation);
f.delete();
[6/7] tinkerpop git commit: Merge branch 'pr-918' into tp33
Merge branch 'pr-918' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a8931d58 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a8931d58 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a8931d58 Branch: refs/heads/tp33 Commit: a8931d581c26d355b92285400239ec588246bd4f Parents: b34515a 6efd47d Author: Stephen Mallette Authored: Wed Aug 22 16:16:54 2018 -0400 Committer: Stephen Mallette Committed: Wed Aug 22 16:16:54 2018 -0400 -- .../tinkerpop/gremlin/util/TinkerGraphProvider.java | 2 +- .../apache/tinkerpop/gremlin/AbstractGremlinTest.java | 5 +++-- .../org/apache/tinkerpop/gremlin/GraphProvider.java | 12 +--- .../gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +- .../gremlin/tinkergraph/TinkerGraphProvider.java| 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) --
[04/11] tinkerpop git commit: Add null checking for configuration; Remove unused import
Add null checking for configuration;
Remove unused import
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6efd47da
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6efd47da
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6efd47da
Branch: refs/heads/master
Commit: 6efd47da55c1d621714c481b21cf8b4494585680
Parents: bf94f43
Author: Justin Chu <15710241+justinch...@users.noreply.github.com>
Authored: Tue Aug 21 18:28:59 2018 -0400
Committer: Justin Chu <15710241+justinch...@users.noreply.github.com>
Committed: Tue Aug 21 18:28:59 2018 -0400
--
.../org/apache/tinkerpop/gremlin/util/TinkerGraphProvider.java | 2 +-
.../java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java | 1 -
2 files changed, 1 insertion(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6efd47da/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/util/TinkerGraphProvider.java
--
diff --git
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/util/TinkerGraphProvider.java
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/util/TinkerGraphProvider.java
index 7a87414..bd2d20b 100644
---
a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/util/TinkerGraphProvider.java
+++
b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/util/TinkerGraphProvider.java
@@ -85,7 +85,7 @@ public class TinkerGraphProvider extends
AbstractGraphProvider {
graph.close();
// in the even the graph is persisted we need to clean up
-final String graphLocation =
configuration.getString(TinkerGraph.GREMLIN_TINKERGRAPH_GRAPH_LOCATION, null);
+final String graphLocation = null != configuration ?
configuration.getString(TinkerGraph.GREMLIN_TINKERGRAPH_GRAPH_LOCATION, null) :
null;
if (graphLocation != null) {
final File f = new File(graphLocation);
f.delete();
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/6efd47da/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
index 2ccf762..a614252 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
@@ -41,7 +41,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
-import java.util.Random;
import java.util.Set;
import java.util.function.Consumer;
import java.util.stream.Collectors;
[07/11] tinkerpop git commit: Merge branch 'pr-917' into tp32
Merge branch 'pr-917' into tp32 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/6a6959a3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/6a6959a3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/6a6959a3 Branch: refs/heads/master Commit: 6a6959a33c24eea9777bc7c2c6df31954a6ca1c2 Parents: ca3a343 038b9cd Author: Stephen Mallette Authored: Wed Aug 22 16:16:34 2018 -0400 Committer: Stephen Mallette Committed: Wed Aug 22 16:16:34 2018 -0400 -- .../apache/tinkerpop/gremlin/AbstractGremlinTest.java | 4 +++- .../org/apache/tinkerpop/gremlin/GraphProvider.java | 12 +--- .../gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +- .../gremlin/tinkergraph/TinkerGraphProvider.java| 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) --
[2/3] tinkerpop git commit: Update javadoc and comments for clear method; Remove unused import
Update javadoc and comments for clear method;
Remove unused import
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/038b9cd7
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/038b9cd7
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/038b9cd7
Branch: refs/heads/tp32
Commit: 038b9cd759d0ac97a3c3820ec55026938d4c74be
Parents: 32a8ee6
Author: Justin Chu <15710241+justinch...@users.noreply.github.com>
Authored: Tue Aug 21 15:14:16 2018 -0400
Committer: Justin Chu <15710241+justinch...@users.noreply.github.com>
Committed: Tue Aug 21 17:33:34 2018 -0400
--
.../apache/tinkerpop/gremlin/AbstractGremlinTest.java | 4 +++-
.../org/apache/tinkerpop/gremlin/GraphProvider.java | 12 +---
2 files changed, 12 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/038b9cd7/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
index 8485d56..a03e351 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
@@ -31,7 +31,6 @@ import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.util.iterator.IteratorUtils;
import org.junit.After;
import org.junit.Before;
-import org.junit.BeforeClass;
import org.junit.Rule;
import org.junit.rules.TestName;
import org.slf4j.Logger;
@@ -133,6 +132,8 @@ public abstract class AbstractGremlinTest {
public void tearDown() throws Exception {
if (null != graphProvider) {
graphProvider.getTestListener().ifPresent(l ->
l.onTestEnd(this.getClass(), name.getMethodName()));
+
+// GraphProvider that has implemented the clear method must check
null for graph and config.
graphProvider.clear(graph, config);
// All GraphProvider objects should be an instance of
ManagedGraphProvider, as this is handled by GraphManager
@@ -144,6 +145,7 @@ public abstract class AbstractGremlinTest {
logger.warn("The {} is not of type ManagedGraphProvider and
therefore graph instances may leak between test cases.",
graphProvider.getClass());
g = null;
+graph = null;
config = null;
graphProvider = null;
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/038b9cd7/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
index c785cfc..30af95a 100644
--- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
+++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java
@@ -125,8 +125,8 @@ public interface GraphProvider {
}
/**
- * Creates a new {@link Graph} instance from the Configuration object
using {@link GraphFactory}. The assumption
- * here is that the {@code Configuration} has been created by one of the
+ * Creates a new {@link Graph} instance from the {@link
org.apache.commons.configuration.Configuration} object using {@link
GraphFactory}.
+ * The assumption here is that the {@code Configuration} has been created
by one of the
* {@link #newGraphConfiguration(String, Class, String,
LoadGraphWith.GraphData)} methods and has therefore
* already been modified by the implementation as necessary for {@link
Graph} creation.
*/
@@ -149,6 +149,9 @@ public interface GraphProvider {
* to construct the graph. The default implementation simply calls
* {@link #clear(Graph, org.apache.commons.configuration.Configuration)}
with
* a null graph argument.
+ *
+ * Implementations should be able to accept an argument of null for the
{@code org.apache.commons.configuration.Configuration}
+ * as well, and a proper handling is needed. Otherwise, a
NullPointerException may be thrown.
*/
public default void clear(final Configuration configuration) throws
Exception {
clear(null, configuration);
@@ -160,10 +163,13 @@ public interface GraphProvider {
* For a brute force approach, implementers can simply delete data
directories provided in the configuration.
* Implementers may choose a more elegant approach if it exists.
*
- * Implementations should be
[11/11] tinkerpop git commit: Merge branch 'tp33'
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/20bc5a3b Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/20bc5a3b Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/20bc5a3b Branch: refs/heads/master Commit: 20bc5a3bbe8f5fc3cb79c3de3965776085e2a557 Parents: 0207608 6582056 Author: Stephen Mallette Authored: Wed Aug 22 16:17:37 2018 -0400 Committer: Stephen Mallette Committed: Wed Aug 22 16:17:37 2018 -0400 -- --
[03/11] tinkerpop git commit: Merge branch 'graphprovider-clear-tp32' into graphprovider-clear-tp33
Merge branch 'graphprovider-clear-tp32' into graphprovider-clear-tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/bf94f43f Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/bf94f43f Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/bf94f43f Branch: refs/heads/master Commit: bf94f43f39c7812adec402730aaa2a8ed8526900 Parents: b46c295 038b9cd Author: Justin Chu <15710241+justinch...@users.noreply.github.com> Authored: Tue Aug 21 18:24:42 2018 -0400 Committer: Justin Chu <15710241+justinch...@users.noreply.github.com> Committed: Tue Aug 21 18:24:42 2018 -0400 -- .../apache/tinkerpop/gremlin/AbstractGremlinTest.java | 4 +++- .../org/apache/tinkerpop/gremlin/GraphProvider.java | 12 +--- .../gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +- .../gremlin/tinkergraph/TinkerGraphProvider.java| 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/bf94f43f/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java --
[05/11] tinkerpop git commit: Merge branch 'graphprovider-clear-tp33' into graphprovider-clear-master
Merge branch 'graphprovider-clear-tp33' into graphprovider-clear-master Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/1d9a17e0 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/1d9a17e0 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/1d9a17e0 Branch: refs/heads/master Commit: 1d9a17e031b0a653ff72800d1c15e058064521f6 Parents: a085355 6efd47d Author: Justin Chu <15710241+justinch...@users.noreply.github.com> Authored: Tue Aug 21 18:33:04 2018 -0400 Committer: Justin Chu <15710241+justinch...@users.noreply.github.com> Committed: Tue Aug 21 18:33:04 2018 -0400 -- .../tinkerpop/gremlin/util/TinkerGraphProvider.java | 2 +- .../apache/tinkerpop/gremlin/AbstractGremlinTest.java | 6 +++--- .../org/apache/tinkerpop/gremlin/GraphProvider.java | 12 +--- .../gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +- .../gremlin/tinkergraph/TinkerGraphProvider.java| 2 +- 5 files changed, 15 insertions(+), 9 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1d9a17e0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java -- diff --cc gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java index 6a2b700,a614252..aaa9da2 --- a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java +++ b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java @@@ -41,11 -39,8 +40,9 @@@ import java.lang.reflect.InvocationTarg import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Arrays; - import java.util.HashMap; import java.util.HashSet; import java.util.List; - import java.util.Map; +import java.util.Optional; import java.util.Set; import java.util.function.Consumer; import java.util.stream.Collectors; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1d9a17e0/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/GraphProvider.java -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/1d9a17e0/neo4j-gremlin/src/test/java/org/apache/tinkerpop/gremlin/neo4j/AbstractNeo4jGraphProvider.java --
[06/11] tinkerpop git commit: Add comment in AbstractGremlinTest#tearDown
Add comment in AbstractGremlinTest#tearDown
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/5aedbf1a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/5aedbf1a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/5aedbf1a
Branch: refs/heads/master
Commit: 5aedbf1ab43eb37213c7e6ff26e2e95c076befea
Parents: 1d9a17e
Author: Justin Chu <15710241+justinch...@users.noreply.github.com>
Authored: Tue Aug 21 19:14:55 2018 -0400
Committer: Justin Chu <15710241+justinch...@users.noreply.github.com>
Committed: Tue Aug 21 19:14:55 2018 -0400
--
.../main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java | 1 +
1 file changed, 1 insertion(+)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/5aedbf1a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
--
diff --git
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
index aaa9da2..a58ea0d 100644
---
a/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
+++
b/gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/AbstractGremlinTest.java
@@ -142,6 +142,7 @@ public abstract class AbstractGremlinTest {
graphProvider.getTestListener().ifPresent(l ->
l.onTestEnd(this.getClass(), name.getMethodName()));
// GraphProvider that has implemented the clear method must check
null for graph and config.
+// If #assumeRequirementsAreMetForTest returns false in #setup,
graph and config will be null.
graphProvider.clear(graph, config);
// All GraphProvider objects should be an instance of
ManagedGraphProvider, as this is handled by GraphManager
[08/11] tinkerpop git commit: Merge branch 'pr-918' into tp33
Merge branch 'pr-918' into tp33 Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/a8931d58 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/a8931d58 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/a8931d58 Branch: refs/heads/master Commit: a8931d581c26d355b92285400239ec588246bd4f Parents: b34515a 6efd47d Author: Stephen Mallette Authored: Wed Aug 22 16:16:54 2018 -0400 Committer: Stephen Mallette Committed: Wed Aug 22 16:16:54 2018 -0400 -- .../tinkerpop/gremlin/util/TinkerGraphProvider.java | 2 +- .../apache/tinkerpop/gremlin/AbstractGremlinTest.java | 5 +++-- .../org/apache/tinkerpop/gremlin/GraphProvider.java | 12 +--- .../gremlin/neo4j/AbstractNeo4jGraphProvider.java | 2 +- .../gremlin/tinkergraph/TinkerGraphProvider.java| 2 +- 5 files changed, 15 insertions(+), 8 deletions(-) --
[1/3] tinkerpop git commit: repleace String loop to String builder
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 f49b279bd -> ca3a34327
repleace String loop to String builder
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7485ae83
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7485ae83
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7485ae83
Branch: refs/heads/tp32
Commit: 7485ae83266e23a92703e5f277602f213742bdc9
Parents: f49b279
Author: Otavio Santana
Authored: Wed Aug 22 09:01:08 2018 -0300
Committer: Otavio Santana
Committed: Wed Aug 22 10:04:32 2018 -0300
--
.../jsr223/AbstractGremlinScriptEngineFactory.java| 6 +++---
.../process/traversal/dsl/GremlinDslProcessor.java| 12 +++-
.../traversal/util/DefaultTraversalMetrics.java | 14 +++---
3 files changed, 17 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7485ae83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
index e07e884..e54b8cc 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
@@ -107,12 +107,12 @@ public abstract class AbstractGremlinScriptEngineFactory
implements GremlinScrip
*/
@Override
public String getProgram(final String... statements) {
-String program = "";
+StringBuilder program = new StringBuilder();
for (String statement : statements) {
-program = program + statement + System.lineSeparator();
+program.append(statement).append(System.lineSeparator());
}
-return program;
+return program.toString();
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7485ae83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
index ec6379f..e5fd37a 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
@@ -429,23 +429,25 @@ public class GremlinDslProcessor extends
AbstractProcessor {
private void addMethodBody(final MethodSpec.Builder methodToAdd, final
ExecutableElement templateMethod,
final String startBody, final String endBody,
final Object... statementArgs) {
final List parameters =
templateMethod.getParameters();
-String body = startBody;
+StringBuilder body = new StringBuilder(startBody);
final int numberOfParams = parameters.size();
for (int ix = 0; ix < numberOfParams; ix++) {
final VariableElement param = parameters.get(ix);
methodToAdd.addParameter(ParameterSpec.get(param));
-body = body + param.getSimpleName();
-if (ix < numberOfParams - 1) body = body + ",";
+body.append(param.getSimpleName());
+if (ix < numberOfParams - 1) {
+body.append(",");
+}
}
-body = body + endBody;
+body.append(endBody);
// treat a final array as a varargs param
if (!parameters.isEmpty() && parameters.get(parameters.size() -
1).asType().getKind() == TypeKind.ARRAY)
methodToAdd.varargs(true);
-methodToAdd.addStatement(body, statementArgs);
+methodToAdd.addStatement(body.toString(), statementArgs);
}
private TypeName getOverridenReturnTypeDefinition(final ClassName
returnClazz, final String[] typeValues) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7485ae83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index c5f290a..e155ab6
[4/4] tinkerpop git commit: Merge branch 'tp32' into tp33
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/b34515a9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b34515a9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b34515a9
Branch: refs/heads/tp33
Commit: b34515a91b2055bef3c4561da65b2a1c5f8617ae
Parents: b46c295 ca3a343
Author: Robert Dale
Authored: Wed Aug 22 12:42:46 2018 -0400
Committer: Robert Dale
Committed: Wed Aug 22 12:42:46 2018 -0400
--
.../jsr223/AbstractGremlinScriptEngineFactory.java | 6 +++---
.../process/traversal/dsl/GremlinDslProcessor.java | 12 +++-
.../traversal/util/DefaultTraversalMetrics.java | 16 +---
3 files changed, 19 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b34515a9/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b34515a9/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
--
diff --cc
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index ae0bd8e,055e3ab..bfcfacc
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@@ -286,10 -188,121 +287,11 @@@ public final class DefaultTraversalMetr
private static String padLeft(final String text, final int amountToPad) {
// not sure why this method needed to exist. stupid string format
stuff and commons utilities wouldn't
// work for some reason in the context this method was used above.
- String newText = text;
+ final StringBuilder newText = new StringBuilder();
for (int ix = 0; ix < amountToPad; ix++) {
- newText = " " + newText;
+ newText.append(" ");
}
- return newText;
+ newText.append(text);
+ return newText.toString();
}
-
-private void computeTotals() {
-// Create temp list of ordered metrics
-final List tempMetrics = new
ArrayList<>(this.metrics.size());
-for (final String label : this.indexToLabelMap.values()) {
-// The indexToLabelMap is sorted by index (key)
-tempMetrics.add(this.metrics.get(label).clone());
-}
-
-// Calculate total duration
-this.totalStepDuration = 0;
-tempMetrics.forEach(metric -> this.totalStepDuration +=
metric.getDuration(MutableMetrics.SOURCE_UNIT));
-
-// Assign %'s
-tempMetrics.forEach(m -> {
-final double dur = m.getDuration(TimeUnit.NANOSECONDS) * 100.d /
this.totalStepDuration;
-m.setAnnotation(PERCENT_DURATION_KEY, dur);
-});
-
-// Store immutable instances of the calculated metrics
-this.computedMetrics = new LinkedHashMap<>(this.metrics.size());
-tempMetrics.forEach(it -> this.computedMetrics.put(it.getId(),
it.getImmutableClone()));
-}
-
-public static DefaultTraversalMetrics merge(final
Iterator toMerge) {
-final DefaultTraversalMetrics newTraversalMetrics = new
DefaultTraversalMetrics();
-
-// iterate the incoming TraversalMetrics
-toMerge.forEachRemaining(inTraversalMetrics -> {
-// aggregate the internal Metrics
-inTraversalMetrics.metrics.forEach((metricsId, toAggregate) -> {
-
-MutableMetrics aggregateMetrics =
newTraversalMetrics.metrics.get(metricsId);
-if (null == aggregateMetrics) {
-// need to create a Metrics to aggregate into
-aggregateMetrics = new
MutableMetrics(toAggregate.getId(), toAggregate.getName());
-
-newTraversalMetrics.metrics.put(metricsId,
aggregateMetrics);
-// Set the index of the Metrics
-for (final Map.Entry entry :
inTraversalMetrics.indexToLabelMap.entrySet()) {
-if (metricsId.equals(entry.getValue())) {
-
newTraversalMetrics.indexToLabelMap.put(entry.getKey(), metricsId);
-break;
-}
-}
-}
-aggregateMetrics.aggregate(toAggregate);
-});
-});
-return newTraversalMetrics;
-}
-
-public void setMetrics(final Traversal.Admin traversal,
[2/4] tinkerpop git commit: makes the StringBuilder final
makes the StringBuilder final
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f6ecbff6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f6ecbff6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f6ecbff6
Branch: refs/heads/tp33
Commit: f6ecbff6e036bb246efed3b2db5664a154b14442
Parents: 7485ae8
Author: Otavio Santana
Authored: Wed Aug 22 09:19:20 2018 -0300
Committer: Otavio Santana
Committed: Wed Aug 22 10:04:49 2018 -0300
--
.../gremlin/jsr223/AbstractGremlinScriptEngineFactory.java | 2 +-
.../gremlin/process/traversal/dsl/GremlinDslProcessor.java | 2 +-
.../process/traversal/util/DefaultTraversalMetrics.java | 8
3 files changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6ecbff6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
index e54b8cc..69f4f73 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
@@ -107,7 +107,7 @@ public abstract class AbstractGremlinScriptEngineFactory
implements GremlinScrip
*/
@Override
public String getProgram(final String... statements) {
-StringBuilder program = new StringBuilder();
+final StringBuilder program = new StringBuilder();
for (String statement : statements) {
program.append(statement).append(System.lineSeparator());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6ecbff6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
index e5fd37a..b86a9b8 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
@@ -429,7 +429,7 @@ public class GremlinDslProcessor extends AbstractProcessor {
private void addMethodBody(final MethodSpec.Builder methodToAdd, final
ExecutableElement templateMethod,
final String startBody, final String endBody,
final Object... statementArgs) {
final List parameters =
templateMethod.getParameters();
-StringBuilder body = new StringBuilder(startBody);
+final StringBuilder body = new StringBuilder(startBody);
final int numberOfParams = parameters.size();
for (int ix = 0; ix < numberOfParams; ix++) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6ecbff6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index e155ab6..2a1b036 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@ -109,14 +109,14 @@ public final class DefaultTraversalMetrics implements
TraversalMetrics, Serializ
private void appendMetrics(final Collection metrics,
final StringBuilder sb, final int indent) {
// Append each StepMetric's row. indexToLabelMap values are ordered by
index.
for (Metrics m : metrics) {
-StringBuilder rowName = new StringBuilder(m.getName());
+final StringBuilder metricName = new StringBuilder(m.getName());
// Handle indentation
for (int ii = 0; ii < indent; ii++) {
-rowName.insert(0, " ");
+metricName.insert(0, " ");
}
// Abbreviate if necessary
-rowName = new
StringBuilder(StringUtils.abbreviate(rowName.toString(), 50));
+final StringBuilder rowName = new
[2/3] tinkerpop git commit: makes the StringBuilder final
makes the StringBuilder final
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f6ecbff6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f6ecbff6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f6ecbff6
Branch: refs/heads/tp32
Commit: f6ecbff6e036bb246efed3b2db5664a154b14442
Parents: 7485ae8
Author: Otavio Santana
Authored: Wed Aug 22 09:19:20 2018 -0300
Committer: Otavio Santana
Committed: Wed Aug 22 10:04:49 2018 -0300
--
.../gremlin/jsr223/AbstractGremlinScriptEngineFactory.java | 2 +-
.../gremlin/process/traversal/dsl/GremlinDslProcessor.java | 2 +-
.../process/traversal/util/DefaultTraversalMetrics.java | 8
3 files changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6ecbff6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
index e54b8cc..69f4f73 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
@@ -107,7 +107,7 @@ public abstract class AbstractGremlinScriptEngineFactory
implements GremlinScrip
*/
@Override
public String getProgram(final String... statements) {
-StringBuilder program = new StringBuilder();
+final StringBuilder program = new StringBuilder();
for (String statement : statements) {
program.append(statement).append(System.lineSeparator());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6ecbff6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
index e5fd37a..b86a9b8 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
@@ -429,7 +429,7 @@ public class GremlinDslProcessor extends AbstractProcessor {
private void addMethodBody(final MethodSpec.Builder methodToAdd, final
ExecutableElement templateMethod,
final String startBody, final String endBody,
final Object... statementArgs) {
final List parameters =
templateMethod.getParameters();
-StringBuilder body = new StringBuilder(startBody);
+final StringBuilder body = new StringBuilder(startBody);
final int numberOfParams = parameters.size();
for (int ix = 0; ix < numberOfParams; ix++) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6ecbff6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index e155ab6..2a1b036 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@ -109,14 +109,14 @@ public final class DefaultTraversalMetrics implements
TraversalMetrics, Serializ
private void appendMetrics(final Collection metrics,
final StringBuilder sb, final int indent) {
// Append each StepMetric's row. indexToLabelMap values are ordered by
index.
for (Metrics m : metrics) {
-StringBuilder rowName = new StringBuilder(m.getName());
+final StringBuilder metricName = new StringBuilder(m.getName());
// Handle indentation
for (int ii = 0; ii < indent; ii++) {
-rowName.insert(0, " ");
+metricName.insert(0, " ");
}
// Abbreviate if necessary
-rowName = new
StringBuilder(StringUtils.abbreviate(rowName.toString(), 50));
+final StringBuilder rowName = new
[5/5] tinkerpop git commit: Merge branch 'tp33'
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/de29c768 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/de29c768 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/de29c768 Branch: refs/heads/master Commit: de29c768a5f6fd88b5c36c63adc6a31631f29bb5 Parents: a085355 b34515a Author: Robert Dale Authored: Wed Aug 22 12:42:59 2018 -0400 Committer: Robert Dale Committed: Wed Aug 22 12:42:59 2018 -0400 -- .../jsr223/AbstractGremlinScriptEngineFactory.java | 6 +++--- .../process/traversal/dsl/GremlinDslProcessor.java | 12 +++- .../traversal/util/DefaultTraversalMetrics.java | 16 +--- 3 files changed, 19 insertions(+), 15 deletions(-) --
[3/5] tinkerpop git commit: changes the StringBuilder operation to optmizes the byte array operation
changes the StringBuilder operation to optmizes the byte array operation
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ca3a3432
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ca3a3432
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ca3a3432
Branch: refs/heads/master
Commit: ca3a3432789d5e5443cb9bacb3dd934937c95797
Parents: f6ecbff
Author: Otavio Santana
Authored: Wed Aug 22 10:26:05 2018 -0300
Committer: Otavio Santana
Committed: Wed Aug 22 10:26:05 2018 -0300
--
.../process/traversal/util/DefaultTraversalMetrics.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ca3a3432/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index 2a1b036..055e3ab 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@ -109,12 +109,13 @@ public final class DefaultTraversalMetrics implements
TraversalMetrics, Serializ
private void appendMetrics(final Collection metrics,
final StringBuilder sb, final int indent) {
// Append each StepMetric's row. indexToLabelMap values are ordered by
index.
for (Metrics m : metrics) {
-final StringBuilder metricName = new StringBuilder(m.getName());
+final StringBuilder metricName = new StringBuilder();
// Handle indentation
for (int ii = 0; ii < indent; ii++) {
-metricName.insert(0, " ");
+metricName.append(" ");
}
+metricName.append(m.getName());
// Abbreviate if necessary
final StringBuilder rowName = new
StringBuilder(StringUtils.abbreviate(metricName.toString(), 50));
@@ -187,10 +188,11 @@ public final class DefaultTraversalMetrics implements
TraversalMetrics, Serializ
private static String padLeft(final String text, final int amountToPad) {
// not sure why this method needed to exist. stupid string format
stuff and commons utilities wouldn't
// work for some reason in the context this method was used above.
-final StringBuilder newText = new StringBuilder(text);
+final StringBuilder newText = new StringBuilder();
for (int ix = 0; ix < amountToPad; ix++) {
-newText.insert(0, " ");
+newText.append(" ");
}
+newText.append(text);
return newText.toString();
}
[1/4] tinkerpop git commit: repleace String loop to String builder
Repository: tinkerpop
Updated Branches:
refs/heads/tp33 b46c295c0 -> b34515a91
repleace String loop to String builder
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7485ae83
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7485ae83
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7485ae83
Branch: refs/heads/tp33
Commit: 7485ae83266e23a92703e5f277602f213742bdc9
Parents: f49b279
Author: Otavio Santana
Authored: Wed Aug 22 09:01:08 2018 -0300
Committer: Otavio Santana
Committed: Wed Aug 22 10:04:32 2018 -0300
--
.../jsr223/AbstractGremlinScriptEngineFactory.java| 6 +++---
.../process/traversal/dsl/GremlinDslProcessor.java| 12 +++-
.../traversal/util/DefaultTraversalMetrics.java | 14 +++---
3 files changed, 17 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7485ae83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
index e07e884..e54b8cc 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
@@ -107,12 +107,12 @@ public abstract class AbstractGremlinScriptEngineFactory
implements GremlinScrip
*/
@Override
public String getProgram(final String... statements) {
-String program = "";
+StringBuilder program = new StringBuilder();
for (String statement : statements) {
-program = program + statement + System.lineSeparator();
+program.append(statement).append(System.lineSeparator());
}
-return program;
+return program.toString();
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7485ae83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
index ec6379f..e5fd37a 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
@@ -429,23 +429,25 @@ public class GremlinDslProcessor extends
AbstractProcessor {
private void addMethodBody(final MethodSpec.Builder methodToAdd, final
ExecutableElement templateMethod,
final String startBody, final String endBody,
final Object... statementArgs) {
final List parameters =
templateMethod.getParameters();
-String body = startBody;
+StringBuilder body = new StringBuilder(startBody);
final int numberOfParams = parameters.size();
for (int ix = 0; ix < numberOfParams; ix++) {
final VariableElement param = parameters.get(ix);
methodToAdd.addParameter(ParameterSpec.get(param));
-body = body + param.getSimpleName();
-if (ix < numberOfParams - 1) body = body + ",";
+body.append(param.getSimpleName());
+if (ix < numberOfParams - 1) {
+body.append(",");
+}
}
-body = body + endBody;
+body.append(endBody);
// treat a final array as a varargs param
if (!parameters.isEmpty() && parameters.get(parameters.size() -
1).asType().getKind() == TypeKind.ARRAY)
methodToAdd.varargs(true);
-methodToAdd.addStatement(body, statementArgs);
+methodToAdd.addStatement(body.toString(), statementArgs);
}
private TypeName getOverridenReturnTypeDefinition(final ClassName
returnClazz, final String[] typeValues) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7485ae83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index c5f290a..e155ab6
[3/4] tinkerpop git commit: changes the StringBuilder operation to optmizes the byte array operation
changes the StringBuilder operation to optmizes the byte array operation
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ca3a3432
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ca3a3432
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ca3a3432
Branch: refs/heads/tp33
Commit: ca3a3432789d5e5443cb9bacb3dd934937c95797
Parents: f6ecbff
Author: Otavio Santana
Authored: Wed Aug 22 10:26:05 2018 -0300
Committer: Otavio Santana
Committed: Wed Aug 22 10:26:05 2018 -0300
--
.../process/traversal/util/DefaultTraversalMetrics.java | 10 ++
1 file changed, 6 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ca3a3432/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index 2a1b036..055e3ab 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@ -109,12 +109,13 @@ public final class DefaultTraversalMetrics implements
TraversalMetrics, Serializ
private void appendMetrics(final Collection metrics,
final StringBuilder sb, final int indent) {
// Append each StepMetric's row. indexToLabelMap values are ordered by
index.
for (Metrics m : metrics) {
-final StringBuilder metricName = new StringBuilder(m.getName());
+final StringBuilder metricName = new StringBuilder();
// Handle indentation
for (int ii = 0; ii < indent; ii++) {
-metricName.insert(0, " ");
+metricName.append(" ");
}
+metricName.append(m.getName());
// Abbreviate if necessary
final StringBuilder rowName = new
StringBuilder(StringUtils.abbreviate(metricName.toString(), 50));
@@ -187,10 +188,11 @@ public final class DefaultTraversalMetrics implements
TraversalMetrics, Serializ
private static String padLeft(final String text, final int amountToPad) {
// not sure why this method needed to exist. stupid string format
stuff and commons utilities wouldn't
// work for some reason in the context this method was used above.
-final StringBuilder newText = new StringBuilder(text);
+final StringBuilder newText = new StringBuilder();
for (int ix = 0; ix < amountToPad; ix++) {
-newText.insert(0, " ");
+newText.append(" ");
}
+newText.append(text);
return newText.toString();
}
[4/5] tinkerpop git commit: Merge branch 'tp32' into tp33
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/b34515a9
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/b34515a9
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/b34515a9
Branch: refs/heads/master
Commit: b34515a91b2055bef3c4561da65b2a1c5f8617ae
Parents: b46c295 ca3a343
Author: Robert Dale
Authored: Wed Aug 22 12:42:46 2018 -0400
Committer: Robert Dale
Committed: Wed Aug 22 12:42:46 2018 -0400
--
.../jsr223/AbstractGremlinScriptEngineFactory.java | 6 +++---
.../process/traversal/dsl/GremlinDslProcessor.java | 12 +++-
.../traversal/util/DefaultTraversalMetrics.java | 16 +---
3 files changed, 19 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b34515a9/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/b34515a9/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
--
diff --cc
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index ae0bd8e,055e3ab..bfcfacc
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@@ -286,10 -188,121 +287,11 @@@ public final class DefaultTraversalMetr
private static String padLeft(final String text, final int amountToPad) {
// not sure why this method needed to exist. stupid string format
stuff and commons utilities wouldn't
// work for some reason in the context this method was used above.
- String newText = text;
+ final StringBuilder newText = new StringBuilder();
for (int ix = 0; ix < amountToPad; ix++) {
- newText = " " + newText;
+ newText.append(" ");
}
- return newText;
+ newText.append(text);
+ return newText.toString();
}
-
-private void computeTotals() {
-// Create temp list of ordered metrics
-final List tempMetrics = new
ArrayList<>(this.metrics.size());
-for (final String label : this.indexToLabelMap.values()) {
-// The indexToLabelMap is sorted by index (key)
-tempMetrics.add(this.metrics.get(label).clone());
-}
-
-// Calculate total duration
-this.totalStepDuration = 0;
-tempMetrics.forEach(metric -> this.totalStepDuration +=
metric.getDuration(MutableMetrics.SOURCE_UNIT));
-
-// Assign %'s
-tempMetrics.forEach(m -> {
-final double dur = m.getDuration(TimeUnit.NANOSECONDS) * 100.d /
this.totalStepDuration;
-m.setAnnotation(PERCENT_DURATION_KEY, dur);
-});
-
-// Store immutable instances of the calculated metrics
-this.computedMetrics = new LinkedHashMap<>(this.metrics.size());
-tempMetrics.forEach(it -> this.computedMetrics.put(it.getId(),
it.getImmutableClone()));
-}
-
-public static DefaultTraversalMetrics merge(final
Iterator toMerge) {
-final DefaultTraversalMetrics newTraversalMetrics = new
DefaultTraversalMetrics();
-
-// iterate the incoming TraversalMetrics
-toMerge.forEachRemaining(inTraversalMetrics -> {
-// aggregate the internal Metrics
-inTraversalMetrics.metrics.forEach((metricsId, toAggregate) -> {
-
-MutableMetrics aggregateMetrics =
newTraversalMetrics.metrics.get(metricsId);
-if (null == aggregateMetrics) {
-// need to create a Metrics to aggregate into
-aggregateMetrics = new
MutableMetrics(toAggregate.getId(), toAggregate.getName());
-
-newTraversalMetrics.metrics.put(metricsId,
aggregateMetrics);
-// Set the index of the Metrics
-for (final Map.Entry entry :
inTraversalMetrics.indexToLabelMap.entrySet()) {
-if (metricsId.equals(entry.getValue())) {
-
newTraversalMetrics.indexToLabelMap.put(entry.getKey(), metricsId);
-break;
-}
-}
-}
-aggregateMetrics.aggregate(toAggregate);
-});
-});
-return newTraversalMetrics;
-}
-
-public void setMetrics(final Traversal.Admin traversal,
[1/5] tinkerpop git commit: repleace String loop to String builder
Repository: tinkerpop
Updated Branches:
refs/heads/master a08535570 -> de29c768a
repleace String loop to String builder
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/7485ae83
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/7485ae83
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/7485ae83
Branch: refs/heads/master
Commit: 7485ae83266e23a92703e5f277602f213742bdc9
Parents: f49b279
Author: Otavio Santana
Authored: Wed Aug 22 09:01:08 2018 -0300
Committer: Otavio Santana
Committed: Wed Aug 22 10:04:32 2018 -0300
--
.../jsr223/AbstractGremlinScriptEngineFactory.java| 6 +++---
.../process/traversal/dsl/GremlinDslProcessor.java| 12 +++-
.../traversal/util/DefaultTraversalMetrics.java | 14 +++---
3 files changed, 17 insertions(+), 15 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7485ae83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
index e07e884..e54b8cc 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
@@ -107,12 +107,12 @@ public abstract class AbstractGremlinScriptEngineFactory
implements GremlinScrip
*/
@Override
public String getProgram(final String... statements) {
-String program = "";
+StringBuilder program = new StringBuilder();
for (String statement : statements) {
-program = program + statement + System.lineSeparator();
+program.append(statement).append(System.lineSeparator());
}
-return program;
+return program.toString();
}
}
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7485ae83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
index ec6379f..e5fd37a 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
@@ -429,23 +429,25 @@ public class GremlinDslProcessor extends
AbstractProcessor {
private void addMethodBody(final MethodSpec.Builder methodToAdd, final
ExecutableElement templateMethod,
final String startBody, final String endBody,
final Object... statementArgs) {
final List parameters =
templateMethod.getParameters();
-String body = startBody;
+StringBuilder body = new StringBuilder(startBody);
final int numberOfParams = parameters.size();
for (int ix = 0; ix < numberOfParams; ix++) {
final VariableElement param = parameters.get(ix);
methodToAdd.addParameter(ParameterSpec.get(param));
-body = body + param.getSimpleName();
-if (ix < numberOfParams - 1) body = body + ",";
+body.append(param.getSimpleName());
+if (ix < numberOfParams - 1) {
+body.append(",");
+}
}
-body = body + endBody;
+body.append(endBody);
// treat a final array as a varargs param
if (!parameters.isEmpty() && parameters.get(parameters.size() -
1).asType().getKind() == TypeKind.ARRAY)
methodToAdd.varargs(true);
-methodToAdd.addStatement(body, statementArgs);
+methodToAdd.addStatement(body.toString(), statementArgs);
}
private TypeName getOverridenReturnTypeDefinition(final ClassName
returnClazz, final String[] typeValues) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/7485ae83/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index
[2/5] tinkerpop git commit: makes the StringBuilder final
makes the StringBuilder final
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f6ecbff6
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f6ecbff6
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f6ecbff6
Branch: refs/heads/master
Commit: f6ecbff6e036bb246efed3b2db5664a154b14442
Parents: 7485ae8
Author: Otavio Santana
Authored: Wed Aug 22 09:19:20 2018 -0300
Committer: Otavio Santana
Committed: Wed Aug 22 10:04:49 2018 -0300
--
.../gremlin/jsr223/AbstractGremlinScriptEngineFactory.java | 2 +-
.../gremlin/process/traversal/dsl/GremlinDslProcessor.java | 2 +-
.../process/traversal/util/DefaultTraversalMetrics.java | 8
3 files changed, 6 insertions(+), 6 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6ecbff6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
index e54b8cc..69f4f73 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/jsr223/AbstractGremlinScriptEngineFactory.java
@@ -107,7 +107,7 @@ public abstract class AbstractGremlinScriptEngineFactory
implements GremlinScrip
*/
@Override
public String getProgram(final String... statements) {
-StringBuilder program = new StringBuilder();
+final StringBuilder program = new StringBuilder();
for (String statement : statements) {
program.append(statement).append(System.lineSeparator());
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6ecbff6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
index e5fd37a..b86a9b8 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/dsl/GremlinDslProcessor.java
@@ -429,7 +429,7 @@ public class GremlinDslProcessor extends AbstractProcessor {
private void addMethodBody(final MethodSpec.Builder methodToAdd, final
ExecutableElement templateMethod,
final String startBody, final String endBody,
final Object... statementArgs) {
final List parameters =
templateMethod.getParameters();
-StringBuilder body = new StringBuilder(startBody);
+final StringBuilder body = new StringBuilder(startBody);
final int numberOfParams = parameters.size();
for (int ix = 0; ix < numberOfParams; ix++) {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f6ecbff6/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
index e155ab6..2a1b036 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/DefaultTraversalMetrics.java
@@ -109,14 +109,14 @@ public final class DefaultTraversalMetrics implements
TraversalMetrics, Serializ
private void appendMetrics(final Collection metrics,
final StringBuilder sb, final int indent) {
// Append each StepMetric's row. indexToLabelMap values are ordered by
index.
for (Metrics m : metrics) {
-StringBuilder rowName = new StringBuilder(m.getName());
+final StringBuilder metricName = new StringBuilder(m.getName());
// Handle indentation
for (int ii = 0; ii < indent; ii++) {
-rowName.insert(0, " ");
+metricName.insert(0, " ");
}
// Abbreviate if necessary
-rowName = new
StringBuilder(StringUtils.abbreviate(rowName.toString(), 50));
+final StringBuilder rowName = new
