You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2019/09/19 12:08:10 UTC
[tinkerpop] branch TINKERPOP-2295 created (now 89014e6)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch TINKERPOP-2295
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
at 89014e6 TINKERPOP-2295 Removed scriptEvaluationTimeout configurations
This branch includes the following new commits:
new 89014e6 TINKERPOP-2295 Removed scriptEvaluationTimeout configurations
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[tinkerpop] 01/01: TINKERPOP-2295 Removed scriptEvaluationTimeout
configurations
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch TINKERPOP-2295
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 89014e654fe484e45058f79b0f9a189ada8e59ac
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Thu Sep 19 08:07:17 2019 -0400
TINKERPOP-2295 Removed scriptEvaluationTimeout configurations
This setting was previously deprecated in 3.3.9 and is no longer needed.
---
CHANGELOG.asciidoc | 1 +
.../gremlin-server-integration-secure.yaml | 2 +-
.../gremlin-server/gremlin-server-integration.yaml | 2 +-
docs/src/reference/gremlin-variants.asciidoc | 2 +-
docs/src/upgrade/release-3.5.x.asciidoc | 2 +
.../apache/tinkerpop/gremlin/driver/Client.java | 4 +-
.../tinkerpop/gremlin/driver/RequestOptions.java | 2 +-
.../apache/tinkerpop/gremlin/driver/Tokens.java | 6 ---
.../driver/remote/DriverRemoteConnection.java | 6 +--
.../driver/remote/DriverRemoteConnectionTest.java | 2 +-
.../gremlin/groovy/engine/GremlinExecutor.java | 35 --------------
.../gremlin/groovy/engine/GremlinExecutorTest.java | 12 ++---
.../apache/tinkerpop/gremlin/server/Settings.java | 12 +----
.../gremlin/server/op/AbstractEvalOpProcessor.java | 7 +--
.../server/op/traversal/TraversalOpProcessor.java | 7 +--
.../gremlin/server/GremlinDriverIntegrateTest.java | 20 --------
.../gremlin/server/GremlinServerIntegrateTest.java | 56 ++--------------------
17 files changed, 27 insertions(+), 151 deletions(-)
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index ef27141..78a43de 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -35,6 +35,7 @@ This release also includes changes from <<release-3-4-3, 3.4.3>>.
* Added support for `TextP` in Neo4j using its string search functions.
* Removed the "experimental" support for multi/meta-properties in Neo4j.
* Removed Gryo serialization configurations from Gremlin Server sample configurations and default configurations.
+* Removed previously deprecated `scriptEvaluationTimeout`.
* Removed previously deprecated remote traversal side-effects.
* Removed previously deprecated `Serializers.DEFAULT_RESULT_SERIALIZER` and `Serializers.DEFAULT_REQUEST_SERIALIZER`.
* Removed previously deprecated `decr` and `incr` from `Order`.
diff --git a/docker/gremlin-server/gremlin-server-integration-secure.yaml b/docker/gremlin-server/gremlin-server-integration-secure.yaml
index 2274852..57719ab 100644
--- a/docker/gremlin-server/gremlin-server-integration-secure.yaml
+++ b/docker/gremlin-server/gremlin-server-integration-secure.yaml
@@ -17,7 +17,7 @@
host: 0.0.0.0
port: 45941
-scriptEvaluationTimeout: 30000
+evaluationTimeout: 30000
graphs: {
graph: conf/tinkergraph-empty.properties,
classic: conf/tinkergraph-empty.properties,
diff --git a/docker/gremlin-server/gremlin-server-integration.yaml b/docker/gremlin-server/gremlin-server-integration.yaml
index 4ccaf32..16427ea 100644
--- a/docker/gremlin-server/gremlin-server-integration.yaml
+++ b/docker/gremlin-server/gremlin-server-integration.yaml
@@ -17,7 +17,7 @@
host: 0.0.0.0
port: 45940
-scriptEvaluationTimeout: 30000
+evaluationTimeout: 30000
graphs: {
graph: conf/tinkergraph-empty.properties,
classic: conf/tinkergraph-empty.properties,
diff --git a/docs/src/reference/gremlin-variants.asciidoc b/docs/src/reference/gremlin-variants.asciidoc
index b8b56c8..cefb2cc 100644
--- a/docs/src/reference/gremlin-variants.asciidoc
+++ b/docs/src/reference/gremlin-variants.asciidoc
@@ -407,7 +407,7 @@ which will boost performance and reduce resources required on the server.
There are a number of overloads to `Client.submit()` that accept a `RequestOptions` object. The `RequestOptions`
provide a way to include options that are specific to the request made with the call to `submit()`. A good use-case for
-this feature is to set a per-request override to the `scriptEvaluationTimeout` so that it only applies to the current
+this feature is to set a per-request override to the `evaluationTimeout` so that it only applies to the current
request.
[source,java]
diff --git a/docs/src/upgrade/release-3.5.x.asciidoc b/docs/src/upgrade/release-3.5.x.asciidoc
index 90f1f0a..0145602 100644
--- a/docs/src/upgrade/release-3.5.x.asciidoc
+++ b/docs/src/upgrade/release-3.5.x.asciidoc
@@ -145,6 +145,7 @@ The following deprecated classes, methods or fields have been removed in this ve
** `org.apache.tinkerpop.gremlin.structure.util.star.StarGraph#builder()`
** `org.apache.tinkerpop.gremlin.structure.util.star.StarGraph.Builder#create()`
* `gremlin-driver`
+** `org.apache.tinkerpop.gremlin.driver.Tokens#ARGS_SCRIPT_EVAL_TIMEOUT`
** `org.apache.tinkerpop.gremlin.driver.Cluster.Builder#keyCertChainFile(String)`
** `org.apache.tinkerpop.gremlin.driver.Cluster.Builder#keyFile(String)`
** `org.apache.tinkerpop.gremlin.driver.Cluster.Builder#keyPassword(String)`
@@ -152,6 +153,7 @@ The following deprecated classes, methods or fields have been removed in this ve
** `org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteTraversalSideEffects`
** `org.apache.tinkerpop.gremlin.driver.remote.DriverRemoteTraversal#getSideEffects()`
* `gremlin-server`
+** `org.apache.tinkerpop.gremlin.server.Settings.scriptEvaluationTimeout`
** `org.apache.tinkerpop.gremlin.server.Settings.SslSettings.keyCertChainFile`
** `org.apache.tinkerpop.gremlin.server.Settings.SslSettings.keyFile`
** `org.apache.tinkerpop.gremlin.server.Settings.SslSettings.keyPassword`
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
index 15934d8..a2fca7a 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Client.java
@@ -341,7 +341,7 @@ public abstract class Client {
.add(Tokens.ARGS_BATCH_SIZE, batchSize);
// apply settings if they were made available
- options.getTimeout().ifPresent(timeout -> request.add(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT, timeout));
+ options.getTimeout().ifPresent(timeout -> request.add(Tokens.ARGS_EVAL_TIMEOUT, timeout));
options.getParameters().ifPresent(params -> request.addArg(Tokens.ARGS_BINDINGS, params));
options.getAliases().ifPresent(aliases -> request.addArg(Tokens.ARGS_ALIASES, aliases));
options.getOverrideRequestId().ifPresent(request::overrideRequestId);
@@ -565,7 +565,7 @@ public abstract class Client {
// apply settings if they were made available
options.getBatchSize().ifPresent(batchSize -> request.add(Tokens.ARGS_BATCH_SIZE, batchSize));
- options.getTimeout().ifPresent(timeout -> request.add(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT, timeout));
+ options.getTimeout().ifPresent(timeout -> request.add(Tokens.ARGS_EVAL_TIMEOUT, timeout));
return submitAsync(request.create());
} catch (Exception ex) {
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java
index 06bce18..70c0618 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/RequestOptions.java
@@ -127,7 +127,7 @@ public final class RequestOptions {
}
/**
- * The per client request override in milliseconds for the server configured {@code scriptEvaluationTimeout}.
+ * The per client request override in milliseconds for the server configured {@code evaluationTimeout}.
* If this value is not set, then the configuration for the server is used.
*/
public Builder timeout(final long timeout) {
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
index a84df2e..867edf2 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Tokens.java
@@ -40,12 +40,6 @@ public final class Tokens {
public static final String ARGS_FORCE = "force";
public static final String ARGS_GREMLIN = "gremlin";
public static final String ARGS_LANGUAGE = "language";
-
- /**
- * @deprecated As of release 3.3.9, replaced by {@link #ARGS_EVAL_TIMEOUT}.
- */
- @Deprecated
- public static final String ARGS_SCRIPT_EVAL_TIMEOUT = "scriptEvaluationTimeout";
public static final String ARGS_EVAL_TIMEOUT = "evaluationTimeout";
public static final String ARGS_HOST = "host";
public static final String ARGS_SESSION = "session";
diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
index 360af85..9afa330 100644
--- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
+++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnection.java
@@ -38,7 +38,7 @@ import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import static org.apache.tinkerpop.gremlin.driver.Tokens.ARGS_BATCH_SIZE;
-import static org.apache.tinkerpop.gremlin.driver.Tokens.ARGS_SCRIPT_EVAL_TIMEOUT;
+import static org.apache.tinkerpop.gremlin.driver.Tokens.ARGS_EVAL_TIMEOUT;
import static org.apache.tinkerpop.gremlin.driver.Tokens.ARGS_USER_AGENT;
import static org.apache.tinkerpop.gremlin.driver.Tokens.REQUEST_ID;
@@ -233,8 +233,8 @@ public class DriverRemoteConnection implements RemoteConnection {
while (itty.hasNext()) {
final OptionsStrategy optionsStrategy = itty.next();
final Map<String,Object> options = optionsStrategy.getOptions();
- if (options.containsKey(ARGS_SCRIPT_EVAL_TIMEOUT))
- builder.timeout((long) options.get(ARGS_SCRIPT_EVAL_TIMEOUT));
+ if (options.containsKey(ARGS_EVAL_TIMEOUT))
+ builder.timeout((long) options.get(ARGS_EVAL_TIMEOUT));
if (options.containsKey(REQUEST_ID))
builder.overrideRequestId((UUID) options.get(REQUEST_ID));
if (options.containsKey(ARGS_BATCH_SIZE))
diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnectionTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnectionTest.java
index 820a0d3..a161ddf 100644
--- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnectionTest.java
+++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/remote/DriverRemoteConnectionTest.java
@@ -42,7 +42,7 @@ public class DriverRemoteConnectionTest {
with("y", 100).
with(Tokens.ARGS_BATCH_SIZE, 1000).
with(Tokens.REQUEST_ID, requestId).
- with(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT, 100000L).
+ with(Tokens.ARGS_EVAL_TIMEOUT, 100000L).
with(Tokens.ARGS_USER_AGENT, "test").
V().asAdmin().getBytecode());
assertEquals(requestId, options.getOverrideRequestId().get());
diff --git a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
index a0982ef..13c750a 100644
--- a/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
+++ b/gremlin-groovy/src/main/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutor.java
@@ -504,21 +504,6 @@ public class GremlinExecutor implements AutoCloseable {
}
/**
- * Amount of time a script has before it times out. Note that the time required covers both script evaluation
- * as well as any time needed for a post result transformation (if the transformation function is supplied
- * to the {@link GremlinExecutor#eval}).
- *
- * @param scriptEvaluationTimeout Time in milliseconds that an evaluation is allowed to run and its
- * results potentially transformed. Set to zero to have no timeout set.
- * @deprecated As of release 3.3.9, replaced by {@link #evaluationTimeout}.
- */
- @Deprecated
- public Builder scriptEvaluationTimeout(final long scriptEvaluationTimeout) {
- this.evaluationTimeout = scriptEvaluationTimeout;
- return this;
- }
-
- /**
* Amount of time an evaluation has before it times out. Note that the time required covers both evaluation
* as well as any time needed for a post result transformation (if the transformation function is supplied
* to the {@link GremlinExecutor#eval}).
@@ -635,14 +620,6 @@ public class GremlinExecutor implements AutoCloseable {
evaluationTimeoutOverride = Optional.ofNullable(builder.evaluationTimeoutOverride);
}
- /**
- * @deprecated As of release 3.3.9, replaced by {@link #getEvaluationTimeoutOverride()}.
- */
- @Deprecated
- public Optional<Long> getScriptEvaluationTimeoutOverride() {
- return evaluationTimeoutOverride;
- }
-
public Optional<Long> getEvaluationTimeoutOverride() {
return evaluationTimeoutOverride;
}
@@ -742,18 +719,6 @@ public class GremlinExecutor implements AutoCloseable {
/**
* An override to the global {@code evaluationTimeout} setting on the script engine. If this value
* is set to {@code null} (the default) it will use the global setting.
- *
- * @deprecated As of release 3.3.9, replaced by {@link #evaluationTimeoutOverride}
- */
- @Deprecated
- public Builder scriptEvaluationTimeoutOverride(final Long scriptEvaluationTimeoutOverride) {
- this.evaluationTimeoutOverride = scriptEvaluationTimeoutOverride;
- return this;
- }
-
- /**
- * An override to the global {@code evaluationTimeout} setting on the script engine. If this value
- * is set to {@code null} (the default) it will use the global setting.
*/
public Builder evaluationTimeoutOverride(final Long evaluationTimeoutOverride) {
this.evaluationTimeoutOverride = evaluationTimeoutOverride;
diff --git a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java
index 98ca601..9175d0a 100644
--- a/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java
+++ b/gremlin-groovy/src/test/java/org/apache/tinkerpop/gremlin/groovy/engine/GremlinExecutorTest.java
@@ -265,7 +265,7 @@ public class GremlinExecutorTest {
final CountDownLatch timeOutCount = new CountDownLatch(1);
final GremlinExecutor gremlinExecutor = GremlinExecutor.build()
- .scriptEvaluationTimeout(250)
+ .evaluationTimeout(250)
.afterFailure((b, e) -> failureCalled.set(true))
.afterSuccess((b) -> successCalled.set(true))
.afterTimeout((b) -> timeOutCount.countDown()).create();
@@ -319,13 +319,13 @@ public class GremlinExecutorTest {
final CountDownLatch timeOutCount = new CountDownLatch(1);
final GremlinExecutor gremlinExecutor = GremlinExecutor.build()
- .scriptEvaluationTimeout(10000)
+ .evaluationTimeout(10000)
.afterFailure((b, e) -> failureCalled.set(true))
.afterSuccess((b) -> successCalled.set(true))
.afterTimeout((b) -> timeOutCount.countDown()).create();
try {
final GremlinExecutor.LifeCycle lifeCycle = GremlinExecutor.LifeCycle.build()
- .scriptEvaluationTimeoutOverride(250L).create();
+ .evaluationTimeoutOverride(250L).create();
gremlinExecutor.eval("Thread.sleep(1000);10", "gremlin-groovy", new SimpleBindings(), lifeCycle).get();
fail("This script should have timed out with an exception");
} catch (Exception ex) {
@@ -458,15 +458,15 @@ public class GremlinExecutorTest {
@Test
public void shouldCancelTimeoutOnSuccessfulScript() throws Exception {
- final long scriptEvaluationTimeout = 5_000;
+ final long evaluationTimeout = 5_000;
final GremlinExecutor gremlinExecutor = GremlinExecutor.build()
- .scriptEvaluationTimeout(scriptEvaluationTimeout)
+ .evaluationTimeout(evaluationTimeout)
.create();
final long now = System.currentTimeMillis();
assertEquals(2, gremlinExecutor.eval("1+1").get());
gremlinExecutor.close();
- assertTrue(System.currentTimeMillis() - now < scriptEvaluationTimeout);
+ assertTrue(System.currentTimeMillis() - now < evaluationTimeout);
}
@Test
diff --git a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
index 5b62241..039dd5e 100644
--- a/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
+++ b/gremlin-server/src/main/java/org/apache/tinkerpop/gremlin/server/Settings.java
@@ -101,16 +101,6 @@ public class Settings {
public int threadPoolBoss = 1;
/**
- * Time in milliseconds to wait for a request (script or bytecode) to complete execution. Defaults to -1 and
- * thus defers to {@link #evaluationTimeout} for this configuration. When set to something greater than -1 then
- * this configuration is used.
- *
- * @deprecated As of release 3.3.9, replaced by {@link #evaluationTimeout}.
- */
- @Deprecated
- public long scriptEvaluationTimeout = -1L;
-
- /**
* Time in milliseconds to wait for a request (script or bytecode) to complete execution. Defaults to 30000.
*/
public long evaluationTimeout = 30000L;
@@ -255,7 +245,7 @@ public class Settings {
}
public long getEvaluationTimeout() {
- return -1 == scriptEvaluationTimeout ? evaluationTimeout : scriptEvaluationTimeout;
+ return evaluationTimeout;
}
/**
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 b5ff83c..cb43865 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
@@ -221,11 +221,8 @@ public abstract class AbstractEvalOpProcessor extends AbstractOpProcessor {
// timeout override - handle both deprecated and newly named configuration. earlier logic should prevent
// both configurations from being submitted at the same time
- final long seto = args.containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT) || args.containsKey(Tokens.ARGS_EVAL_TIMEOUT)
- // could be sent as an integer or long
- ? (args.containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT) ?
- ((Number) args.get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT)).longValue() : ((Number) args.get(Tokens.ARGS_EVAL_TIMEOUT)).longValue())
- : settings.getEvaluationTimeout();
+ final long seto = args.containsKey(Tokens.ARGS_EVAL_TIMEOUT) ?
+ ((Number) args.get(Tokens.ARGS_EVAL_TIMEOUT)).longValue() : settings.getEvaluationTimeout();
final GremlinExecutor.LifeCycle lifeCycle = GremlinExecutor.LifeCycle.build()
.evaluationTimeoutOverride(seto)
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 187d002..b91de7a 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
@@ -162,11 +162,8 @@ public class TraversalOpProcessor extends AbstractOpProcessor {
// timeout override - handle both deprecated and newly named configuration. earlier logic should prevent
// both configurations from being submitted at the same time
final Map<String, Object> args = msg.getArgs();
- final long seto = args.containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT) || args.containsKey(Tokens.ARGS_EVAL_TIMEOUT)
- // could be sent as an integer or long
- ? (args.containsKey(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT) ?
- ((Number) args.get(Tokens.ARGS_SCRIPT_EVAL_TIMEOUT)).longValue() : ((Number) args.get(Tokens.ARGS_EVAL_TIMEOUT)).longValue())
- : context.getSettings().getEvaluationTimeout();
+ final long seto = args.containsKey(Tokens.ARGS_EVAL_TIMEOUT) ?
+ ((Number) args.get(Tokens.ARGS_EVAL_TIMEOUT)).longValue() : context.getSettings().getEvaluationTimeout();
final GraphManager graphManager = context.getGraphManager();
final String traversalSourceName = aliases.entrySet().iterator().next().getValue();
diff --git a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
index 6e07387..0de28b7 100644
--- a/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
+++ b/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java
@@ -191,9 +191,6 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
case "shouldProcessEvalInterruption":
settings.evaluationTimeout = 1500;
break;
- case "shouldProcessEvalTimeoutOverride":
- settings.scriptEvaluationTimeout = 15000;
- break;
}
return settings;
@@ -224,23 +221,6 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration
}
@Test
- public void shouldProcessEvalTimeoutOverride() throws Exception {
- final Cluster cluster = TestClientFactory.open();
- final Client client = cluster.connect();
- final RequestOptions options = RequestOptions.build().timeout(500).create();
-
- try {
- client.submit("Thread.sleep(5000);'done'", options).all().get();
- fail("Should have timed out");
- } catch (Exception ex) {
- final ResponseException re = (ResponseException) ex.getCause();
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, re.getResponseStatusCode());
- }
-
- cluster.close();
- }
-
- @Test
public void shouldProcessTraversalInterruption() throws Exception {
final Cluster cluster = TestClientFactory.open();
final Client client = cluster.connect();
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 cc9d084..78400ba 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
@@ -64,14 +64,11 @@ import org.hamcrest.Matchers;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import java.lang.reflect.Field;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import java.util.Set;
-import java.util.UUID;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
@@ -81,7 +78,7 @@ import java.util.function.Supplier;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
-import static org.apache.tinkerpop.gremlin.driver.Tokens.ARGS_SCRIPT_EVAL_TIMEOUT;
+import static org.apache.tinkerpop.gremlin.driver.Tokens.ARGS_EVAL_TIMEOUT;
import static org.apache.tinkerpop.gremlin.groovy.jsr223.GroovyCompilerGremlinPlugin.Compilation.COMPILE_STATIC;
import static org.apache.tinkerpop.gremlin.process.remote.RemoteConnection.GREMLIN_REMOTE;
import static org.apache.tinkerpop.gremlin.process.remote.RemoteConnection.GREMLIN_REMOTE_CONNECTION_CLASS;
@@ -269,9 +266,6 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
case "shouldTimeOutRemoteTraversal":
settings.evaluationTimeout = 500;
break;
- case "shouldTimeOutRemoteTraversalUsingDeprecatedConfiguration":
- settings.scriptEvaluationTimeout = 500;
- break;
case "shouldPingChannelIfClientDies":
settings.keepAliveInterval = 1000;
break;
@@ -383,40 +377,12 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
}
@Test
- public void shouldTimeOutRemoteTraversalUsingDeprecatedConfiguration() throws Exception {
- final GraphTraversalSource g = traversal().withRemote(conf);
-
- try {
- // tests sleeping thread
- g.inject(1).sideEffect(Lambda.consumer("Thread.sleep(10000)")).iterate();
- fail("This traversal should have timed out");
- } catch (Exception ex) {
- final Throwable t = ex.getCause();
- assertThat(t, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, ((ResponseException) t).getResponseStatusCode());
- }
-
- // make a graph with a cycle in it to force a long run traversal
- graphGetter.get().traversal().addV("person").as("p").addE("self").to("p").iterate();
-
- try {
- // tests an "unending" traversal
- g.V().repeat(__.out()).until(__.outE().count().is(0)).iterate();
- fail("This traversal should have timed out");
- } catch (Exception ex) {
- final Throwable t = ex.getCause();
- assertThat(t, instanceOf(ResponseException.class));
- assertEquals(ResponseStatusCode.SERVER_ERROR_TIMEOUT, ((ResponseException) t).getResponseStatusCode());
- }
- }
-
- @Test
public void shouldTimeOutRemoteTraversalWithPerRequestOption() {
final GraphTraversalSource g = traversal().withRemote(conf);
try {
// tests sleeping thread
- g.with(ARGS_SCRIPT_EVAL_TIMEOUT, 500L).inject(1).sideEffect(Lambda.consumer("Thread.sleep(10000)")).iterate();
+ g.with(ARGS_EVAL_TIMEOUT, 500L).inject(1).sideEffect(Lambda.consumer("Thread.sleep(10000)")).iterate();
fail("This traversal should have timed out");
} catch (Exception ex) {
final Throwable t = ex.getCause();
@@ -429,7 +395,7 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
try {
// tests an "unending" traversal
- g.with(ARGS_SCRIPT_EVAL_TIMEOUT, 500L).V().repeat(__.out()).until(__.outE().count().is(0)).iterate();
+ g.with(ARGS_EVAL_TIMEOUT, 500L).V().repeat(__.out()).until(__.outE().count().is(0)).iterate();
fail("This traversal should have timed out");
} catch (Exception ex) {
final Throwable t = ex.getCause();
@@ -938,22 +904,6 @@ public class GremlinServerIntegrateTest extends AbstractGremlinServerIntegration
@Test
@SuppressWarnings("unchecked")
- public void shouldReceiveFailureTimeOutOnScriptEvalUsingOverride() throws Exception {
- try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
- final RequestMessage msg = RequestMessage.build("eval")
- .addArg(ARGS_SCRIPT_EVAL_TIMEOUT, 100L)
- .addArg(Tokens.ARGS_GREMLIN, "Thread.sleep(3000);'some-stuff-that-should not return'")
- .create();
- final List<ResponseMessage> responses = client.submit(msg);
- assertThat(responses.get(0).getStatus().getMessage(), startsWith("Evaluation exceeded the configured 'evaluationTimeout' threshold of 100 ms"));
-
- // validate that we can still send messages to the server
- assertEquals(2, ((List<Integer>) client.submit("1+1").get(0).getResult().getData()).get(0).intValue());
- }
- }
-
- @Test
- @SuppressWarnings("unchecked")
public void shouldReceiveFailureTimeOutOnEvalUsingOverride() throws Exception {
try (SimpleClient client = TestClientFactory.createWebSocketClient()) {
final RequestMessage msg = RequestMessage.build("eval")