Repository: incubator-ignite Updated Branches: refs/heads/ignite-1161 6de1f082f -> fcc7e01e2
#ignite-1161: rename config parameter. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fcc7e01e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fcc7e01e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fcc7e01e Branch: refs/heads/ignite-1161 Commit: fcc7e01e22e236647c9536b663f924a96a243274 Parents: 6de1f08 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Jul 31 15:53:13 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Jul 31 15:53:13 2015 +0300 ---------------------------------------------------------------------- .../rest/AbstractRestProcessorSelfTest.java | 2 +- .../configuration/ConnectorConfiguration.java | 30 ++++++++++---------- .../handlers/query/QueryCommandHandler.java | 2 +- 3 files changed, 17 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fcc7e01e/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java index 9b26bd8..e39a7811 100644 --- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/AbstractRestProcessorSelfTest.java @@ -74,7 +74,7 @@ abstract class AbstractRestProcessorSelfTest extends GridCommonAbstractTest { clientCfg.setJettyPath("modules/clients/src/test/resources/jetty/rest-jetty.xml"); clientCfg.setIdleQueryCursorTimeout(5000); - clientCfg.setQueryCheckFrequency(5000); + clientCfg.setIdleQueryCursorCheckFrequency(5000); cfg.setConnectorConfiguration(clientCfg); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fcc7e01e/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java index e607767..9006440 100644 --- a/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/ConnectorConfiguration.java @@ -64,8 +64,8 @@ public class ConnectorConfiguration { /** Default REST idle timeout for query cursor. */ private static final long DFLT_IDLE_QRY_CUR_TIMEOUT = 10 * 60 * 1000; - /** Default REST check frequency for query cursor. */ - private static final long DFLT_QRY_CHECK_FRQ = 60 * 1000; + /** Default REST check frequency for idle query cursor. */ + private static final long DFLT_IDLE_QRY_CUR_CHECK_FRQ = 60 * 1000; /** Jetty XML configuration path. */ private String jettyPath; @@ -94,8 +94,8 @@ public class ConnectorConfiguration { /** REST idle timeout for query cursor. */ private long idleQryCurTimeout = DFLT_IDLE_QRY_CUR_TIMEOUT; - /** REST idle timeout for query cursor. */ - private long qryCheckFrq = DFLT_QRY_CHECK_FRQ; + /** REST idle check frequency for query cursor. */ + private long idleQryCurCheckFreq = DFLT_IDLE_QRY_CUR_CHECK_FRQ; /** REST TCP send queue limit. */ private int sndQueueLimit; @@ -161,7 +161,7 @@ public class ConnectorConfiguration { sslCtxFactory = cfg.getSslContextFactory(); sslEnabled = cfg.isSslEnabled(); idleQryCurTimeout = cfg.getIdleQueryCursorTimeout(); - qryCheckFrq = cfg.getQueryCheckFrequency(); + idleQryCurCheckFreq = cfg.getIdleQueryCursorCheckFrequency(); } /** @@ -577,7 +577,7 @@ public class ConnectorConfiguration { * <p> * This setting is used to reject open query cursors that is not used. If no fetch query request * come within idle timeout, it will be removed on next check for old query cursors - * (see {@link #getQueryCheckFrequency()}). + * (see {@link #getIdleQueryCursorCheckFrequency()}). * * @return Idle query cursors timeout in milliseconds */ @@ -586,24 +586,24 @@ public class ConnectorConfiguration { } /** - * Sets query check frequency. + * Sets idle query cursor check frequency. * - * @param qryCheckFrq Idle query check frequency in milliseconds. - * @see #getQueryCheckFrequency() + * @param idleQryCurCheckFreq Idle query check frequency in milliseconds. + * @see #getIdleQueryCursorCheckFrequency() */ - public void setQueryCheckFrequency(long qryCheckFrq) { - this.qryCheckFrq = qryCheckFrq; + public void setIdleQueryCursorCheckFrequency(long idleQryCurCheckFreq) { + this.idleQryCurCheckFreq = idleQryCurCheckFreq; } /** - * Gets query cursors check frequency. + * Gets idle query cursors check frequency. * This setting is used to reject open query cursors that is not used. * <p> * Scheduler tries with specified period to close queries' cursors that are overtime. * - * @return Query check frequency in milliseconds. + * @return Idle query cursor check frequency in milliseconds. */ - public long getQueryCheckFrequency() { - return qryCheckFrq; + public long getIdleQueryCursorCheckFrequency() { + return idleQryCurCheckFreq; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fcc7e01e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java index d992f23..337e85a 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java @@ -59,7 +59,7 @@ public class QueryCommandHandler extends GridRestCommandHandlerAdapter { final long idleQryCurTimeout = ctx.config().getConnectorConfiguration().getIdleQueryCursorTimeout(); - long qryCheckFrq = ctx.config().getConnectorConfiguration().getQueryCheckFrequency(); + long qryCheckFrq = ctx.config().getConnectorConfiguration().getIdleQueryCursorCheckFrequency(); ctx.timeout().schedule(new Runnable() { @Override public void run() {
