TINKERPOP-1481 Removed previously deprecated reconnectInitialDelay
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/cd1b457c Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/cd1b457c Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/cd1b457c Branch: refs/heads/TINKERPOP-1603 Commit: cd1b457cb9c8df1bbd99076209bfaf636f6fab37 Parents: 7a29c6b Author: Stephen Mallette <[email protected]> Authored: Mon Jun 26 15:10:58 2017 -0400 Committer: Stephen Mallette <[email protected]> Committed: Thu Jun 29 14:51:11 2017 -0400 ---------------------------------------------------------------------- CHANGELOG.asciidoc | 1 + .../src/reference/gremlin-applications.asciidoc | 3 +-- docs/src/upgrade/release-3.3.x.asciidoc | 1 + .../tinkerpop/gremlin/driver/Cluster.java | 21 -------------------- .../tinkerpop/gremlin/driver/Connection.java | 5 ----- .../tinkerpop/gremlin/driver/Settings.java | 11 +--------- .../tinkerpop/gremlin/driver/SettingsTest.java | 2 -- .../server/GremlinDriverIntegrateTest.java | 1 - 8 files changed, 4 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/CHANGELOG.asciidoc ---------------------------------------------------------------------- diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index 3bb8347..24160b0 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -26,6 +26,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima TinkerPop 3.3.0 (Release Date: NOT OFFICIALLY RELEASED YET) ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +* Removed previously deprecated `reconnectInitialDelay` setting from the Java driver. * Removed support for passing a byte array on the `sasl` parameter. * Graphite and Ganglia are no longer packaged with the Gremlin Server distribution. * `TransactionException` is no longer a class of `AbstractTransaction` and it extends `RuntimeException`. http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/docs/src/reference/gremlin-applications.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/reference/gremlin-applications.asciidoc b/docs/src/reference/gremlin-applications.asciidoc index c2ba08f..589390b 100644 --- a/docs/src/reference/gremlin-applications.asciidoc +++ b/docs/src/reference/gremlin-applications.asciidoc @@ -732,8 +732,7 @@ The following table describes the various configuration options for the Gremlin |connectionPool.minInProcessPerConnection |The minimum number of in-flight requests that can occur on a connection. |1 |connectionPool.minSimultaneousUsagePerConnection |The maximum number of times that a connection can be borrowed from the pool simultaneously. |8 |connectionPool.minSize |The minimum size of a connection pool for a host. |2 -|connectionPool.reconnectInitialDelay |The amount of time in milliseconds to wait before trying to reconnect to a dead host for the first time. |1000 -|connectionPool.reconnectInterval |The amount of time in milliseconds to wait before trying to reconnect to a dead host. This interval occurs after the time specified by the `reconnectInitialDelay`. |1000 +|connectionPool.reconnectInterval |The amount of time in milliseconds to wait before trying to reconnect to a dead host. |1000 |connectionPool.resultIterationBatchSize |The override value for the size of the result batches to be returned from the server. |64 |connectionPool.trustCertChainFile |File location for a SSL Certificate Chain to use when SSL is enabled. If this value is not provided and SSL is enabled, the `TrustManager` will be established with a self-signed certificate which is NOT suitable for production purposes. |_none_ |hosts |The list of hosts that the driver will connect to. |localhost http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/docs/src/upgrade/release-3.3.x.asciidoc ---------------------------------------------------------------------- diff --git a/docs/src/upgrade/release-3.3.x.asciidoc b/docs/src/upgrade/release-3.3.x.asciidoc index 33ef7e0..a772fb4 100644 --- a/docs/src/upgrade/release-3.3.x.asciidoc +++ b/docs/src/upgrade/release-3.3.x.asciidoc @@ -211,6 +211,7 @@ The following deprecated classes, methods or fields have been removed in this ve ** `org.apache.tinkerpop.gremlin.structure.io.Io.Builder#registry(IoRegistry)` ** `org.apache.tinkerpop.gremlin.structure.Transaction.submit(Function)` * `gremlin-driver` +** `org.apache.tinkerpop.gremlin.driver.Cluster$Builder#reconnectIntialDelay(int)` ** `org.apache.tinkerpop.gremlin.driver.ser.GryoMessageSerializerV1d0(GryoMapper)` * `gremlin-groovy` ** `org.apache.tinkerpop.gremlin.groovy.AbstractImportCustomizerProvider` http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java index 567bfb4..fa59b22 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Cluster.java @@ -175,7 +175,6 @@ public final class Cluster { .nioPoolSize(settings.nioPoolSize) .workerPoolSize(settings.workerPoolSize) .reconnectInterval(settings.connectionPool.reconnectInterval) - .reconnectIntialDelay(settings.connectionPool.reconnectInitialDelay) .resultIterationBatchSize(settings.connectionPool.resultIterationBatchSize) .channelizer(settings.connectionPool.channelizer) .maxContentLength(settings.connectionPool.maxContentLength) @@ -380,13 +379,6 @@ public final class Cluster { } /** - * Gets time in milliseconds to wait before attempting to reconnect to a dead host after it has been marked dead. - */ - public int getReconnectIntialDelay() { - return manager.connectionPoolSettings.reconnectInitialDelay; - } - - /** * Gets time in milliseconds to wait between retries when attempting to reconnect to a dead host. */ public int getReconnectInterval() { @@ -489,7 +481,6 @@ public final class Cluster { private int maxWaitForConnection = Connection.MAX_WAIT_FOR_CONNECTION; private int maxWaitForSessionClose = Connection.MAX_WAIT_FOR_SESSION_CLOSE; private int maxContentLength = Connection.MAX_CONTENT_LENGTH; - private int reconnectInitialDelay = Connection.RECONNECT_INITIAL_DELAY; private int reconnectInterval = Connection.RECONNECT_INTERVAL; private int resultIterationBatchSize = Connection.RESULT_ITERATION_BATCH_SIZE; private long keepAliveInterval = Connection.KEEP_ALIVE_INTERVAL; @@ -734,17 +725,6 @@ public final class Cluster { } /** - * Time in milliseconds to wait before attempting to reconnect to a dead host after it has been marked dead. - * - * @deprecated As of release 3.2.3, the value of the initial delay is now the same as the {@link #reconnectInterval}. - */ - @Deprecated - public Builder reconnectIntialDelay(final int initialDelay) { - this.reconnectInitialDelay = initialDelay; - return this; - } - - /** * Time in milliseconds to wait between retries when attempting to reconnect to a dead host. */ public Builder reconnectInterval(final int interval) { @@ -893,7 +873,6 @@ public final class Cluster { connectionPoolSettings.maxWaitForConnection = builder.maxWaitForConnection; connectionPoolSettings.maxWaitForSessionClose = builder.maxWaitForSessionClose; connectionPoolSettings.maxContentLength = builder.maxContentLength; - connectionPoolSettings.reconnectInitialDelay = builder.reconnectInitialDelay; connectionPoolSettings.reconnectInterval = builder.reconnectInterval; connectionPoolSettings.resultIterationBatchSize = builder.resultIterationBatchSize; connectionPoolSettings.enableSsl = builder.enableSsl; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java index 9a2180e..30725cc 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Connection.java @@ -65,11 +65,6 @@ final class Connection { public static final int MAX_WAIT_FOR_SESSION_CLOSE = 3000; public static final int MAX_CONTENT_LENGTH = 65536; - /** - * @deprecated As of release 3.2.3, replaced by {@link #RECONNECT_INTERVAL}. - */ - @Deprecated - public static final int RECONNECT_INITIAL_DELAY = 1000; public static final int RECONNECT_INTERVAL = 1000; public static final int RESULT_ITERATION_BATCH_SIZE = 64; public static final long KEEP_ALIVE_INTERVAL = 1800000; http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java index 41a697c..3da08b8 100644 --- a/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java +++ b/gremlin-driver/src/main/java/org/apache/tinkerpop/gremlin/driver/Settings.java @@ -199,9 +199,6 @@ final class Settings { if (connectionPoolConf.containsKey("reconnectInterval")) cpSettings.reconnectInterval = connectionPoolConf.getInt("reconnectInterval"); - if (connectionPoolConf.containsKey("reconnectInitialDelay")) - cpSettings.reconnectInitialDelay = connectionPoolConf.getInt("reconnectInitialDelay"); - if (connectionPoolConf.containsKey("resultIterationBatchSize")) cpSettings.resultIterationBatchSize = connectionPoolConf.getInt("resultIterationBatchSize"); @@ -304,17 +301,11 @@ final class Settings { /** * The amount of time in milliseconds to wait before trying to reconnect to a dead host. The default value is - * 1000. This interval occurs after the time specified by the {@link #reconnectInitialDelay}. + * 1000. */ public int reconnectInterval = Connection.RECONNECT_INTERVAL; /** - * The amount of time in milliseconds to wait before trying to reconnect to a dead host for the first time. - * The default value is 1000. - */ - public int reconnectInitialDelay = Connection.RECONNECT_INITIAL_DELAY; - - /** * The override value for the size of the result batches to be returned from the server. This value is set to * 64 by default. */ http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java ---------------------------------------------------------------------- diff --git a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java index a6a2298..038353b 100644 --- a/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java +++ b/gremlin-driver/src/test/java/org/apache/tinkerpop/gremlin/driver/SettingsTest.java @@ -55,7 +55,6 @@ public class SettingsTest { conf.setProperty("connectionPool.maxWaitForConnection", 700); conf.setProperty("connectionPool.maxContentLength", 800); conf.setProperty("connectionPool.reconnectInterval", 900); - conf.setProperty("connectionPool.reconnectInitialDelay", 1000); conf.setProperty("connectionPool.resultIterationBatchSize", 1100); conf.setProperty("connectionPool.channelizer", "channelizer0"); @@ -81,7 +80,6 @@ public class SettingsTest { assertEquals(700, settings.connectionPool.maxWaitForConnection); assertEquals(800, settings.connectionPool.maxContentLength); assertEquals(900, settings.connectionPool.reconnectInterval); - assertEquals(1000, settings.connectionPool.reconnectInitialDelay); assertEquals(1100, settings.connectionPool.resultIterationBatchSize); assertEquals("channelizer0", settings.connectionPool.channelizer); } http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/cd1b457c/gremlin-server/src/test/java/org/apache/tinkerpop/gremlin/server/GremlinDriverIntegrateTest.java ---------------------------------------------------------------------- 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 41daf5b..746c6f8 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 @@ -212,7 +212,6 @@ public class GremlinDriverIntegrateTest extends AbstractGremlinServerIntegration @Test public void shouldEventuallySucceedAfterChannelLevelError() throws Exception { final Cluster cluster = TestClientFactory.build() - .reconnectIntialDelay(500) .reconnectInterval(500) .maxContentLength(1024).create(); final Client client = cluster.connect();
