You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by dp...@apache.org on 2018/10/30 14:55:50 UTC
ignite git commit: IGNITE-9673 Fix for Timeout in Java Client suite.
- Fixes #4894.
Repository: ignite
Updated Branches:
refs/heads/master b424ef815 -> 4e628a912
IGNITE-9673 Fix for Timeout in Java Client suite. - Fixes #4894.
Signed-off-by: Dmitriy Pavlov <dp...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4e628a91
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4e628a91
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4e628a91
Branch: refs/heads/master
Commit: 4e628a912442e05297b40f555b29f5ae7efad6df
Parents: b424ef8
Author: NSAmelchev <ns...@gmail.com>
Authored: Tue Oct 30 17:55:34 2018 +0300
Committer: Dmitriy Pavlov <dp...@apache.org>
Committed: Tue Oct 30 17:55:34 2018 +0300
----------------------------------------------------------------------
.../client/suite/IgniteClientTestSuite.java | 2 +
...tocolStringAtomicDatastructuresSelfTest.java | 44 ++++++++++++++++++++
.../redis/GridRedisRestCommandHandler.java | 10 ++++-
.../redis/key/GridRedisDelCommandHandler.java | 6 ++-
.../key/GridRedisExistsCommandHandler.java | 6 ++-
.../key/GridRedisExpireCommandHandler.java | 6 ++-
.../server/GridRedisDbSizeCommandHandler.java | 6 ++-
.../server/GridRedisFlushCommandHandler.java | 12 ++----
.../string/GridRedisAppendCommandHandler.java | 6 ++-
.../string/GridRedisGetCommandHandler.java | 12 ++----
.../string/GridRedisGetRangeCommandHandler.java | 6 ++-
.../string/GridRedisGetSetCommandHandler.java | 6 ++-
.../string/GridRedisIncrDecrCommandHandler.java | 6 ++-
.../string/GridRedisMGetCommandHandler.java | 6 ++-
.../string/GridRedisMSetCommandHandler.java | 6 ++-
.../string/GridRedisSetCommandHandler.java | 12 ++----
.../string/GridRedisSetRangeCommandHandler.java | 6 ++-
.../string/GridRedisStrlenCommandHandler.java | 6 ++-
.../tcp/redis/GridRedisNioListener.java | 24 +++++------
19 files changed, 123 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
index 657fda4..d08c9a1 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/client/suite/IgniteClientTestSuite.java
@@ -66,6 +66,7 @@ import org.apache.ignite.internal.processors.rest.protocols.tcp.TcpRestParserSel
import org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolConnectSelfTest;
import org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolGetAllAsArrayTest;
import org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolServerSelfTest;
+import org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolStringAtomicDatastructuresSelfTest;
import org.apache.ignite.internal.processors.rest.protocols.tcp.redis.RedisProtocolStringSelfTest;
import org.apache.ignite.testframework.IgniteTestSuite;
@@ -106,6 +107,7 @@ public class IgniteClientTestSuite extends TestSuite {
suite.addTestSuite(RedisProtocolGetAllAsArrayTest.class);
suite.addTestSuite(RedisProtocolConnectSelfTest.class);
suite.addTestSuite(RedisProtocolServerSelfTest.class);
+ suite.addTestSuite(RedisProtocolStringAtomicDatastructuresSelfTest.class);
suite.addTestSuite(RestProcessorStartSelfTest.class);
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringAtomicDatastructuresSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringAtomicDatastructuresSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringAtomicDatastructuresSelfTest.java
new file mode 100644
index 0000000..2e983f4
--- /dev/null
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolStringAtomicDatastructuresSelfTest.java
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.rest.protocols.tcp.redis;
+
+import redis.clients.jedis.Jedis;
+
+/**
+ * Tests for String atomic datastructures commands of Redis protocol.
+ */
+public class RedisProtocolStringAtomicDatastructuresSelfTest extends RedisCommonAbstractTest {
+ /**
+ * Test that threads with datastructures commands wasn't deadlocked when PME happens.
+ *
+ * @throws Exception If failed.
+ */
+ public void testAtomicCommandsTopologyChange() throws Exception {
+ try (Jedis jedis = pool.getResource()) {
+ int size = grid(0).cachesx().size();
+
+ jedis.incr("key1");
+
+ // Expect that datastructures cache was created and init PME.
+ assertTrue("Topology wasn't changed.", grid(0).cachesx().size() > size);
+
+ for (int i = 0; i < 1000; i++)
+ jedis.get("nonExistKey");
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/GridRedisRestCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/GridRedisRestCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/GridRedisRestCommandHandler.java
index 7f743a3..7b27481 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/GridRedisRestCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/GridRedisRestCommandHandler.java
@@ -22,6 +22,7 @@ import java.util.Iterator;
import java.util.List;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.IgniteInternalFuture;
import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
import org.apache.ignite.internal.processors.rest.GridRestResponse;
@@ -45,15 +46,20 @@ public abstract class GridRedisRestCommandHandler implements GridRedisCommandHan
/** REST protocol handler. */
protected final GridRestProtocolHandler hnd;
+ /** Kernel context. */
+ protected final GridKernalContext ctx;
+
/**
* Constructor.
*
* @param log Logger.
* @param hnd REST protocol handler.
+ * @param ctx Kernal context.
*/
- public GridRedisRestCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
+ protected GridRedisRestCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
this.log = log;
this.hnd = hnd;
+ this.ctx = ctx;
}
/** {@inheritDoc} */
@@ -75,7 +81,7 @@ public abstract class GridRedisRestCommandHandler implements GridRedisCommandHan
return msg;
}
- });
+ }, ctx.getRestExecutorService());
}
catch (IgniteCheckedException e) {
if (e instanceof GridRedisTypeException)
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisDelCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisDelCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisDelCommandHandler.java
index f60b46f..e3fbab1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisDelCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisDelCommandHandler.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
import org.apache.ignite.internal.processors.rest.GridRestResponse;
import org.apache.ignite.internal.processors.rest.handlers.redis.GridRedisRestCommandHandler;
@@ -51,9 +52,10 @@ public class GridRedisDelCommandHandler extends GridRedisRestCommandHandler {
*
* @param log Logger to use.
* @param hnd Rest handler.
+ * @param ctx Kernal context.
*/
- public GridRedisDelCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
- super(log, hnd);
+ public GridRedisDelCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExistsCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExistsCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExistsCommandHandler.java
index c0e0996..5caf199 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExistsCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExistsCommandHandler.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
import org.apache.ignite.internal.processors.rest.GridRestResponse;
import org.apache.ignite.internal.processors.rest.handlers.redis.GridRedisRestCommandHandler;
@@ -51,9 +52,10 @@ public class GridRedisExistsCommandHandler extends GridRedisRestCommandHandler {
*
* @param log Logger to use.
* @param hnd Rest handler.
+ * @param ctx Kernal context.
*/
- public GridRedisExistsCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
- super(log, hnd);
+ public GridRedisExistsCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExpireCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExpireCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExpireCommandHandler.java
index 70ca504..5891e96 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExpireCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/key/GridRedisExpireCommandHandler.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.List;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
import org.apache.ignite.internal.processors.rest.GridRestResponse;
import org.apache.ignite.internal.processors.rest.handlers.redis.GridRedisRestCommandHandler;
@@ -55,9 +56,10 @@ public class GridRedisExpireCommandHandler extends GridRedisRestCommandHandler {
*
* @param log Logger to use.
* @param hnd Rest handler.
+ * @param ctx Kernal context.
*/
- public GridRedisExpireCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
- super(log, hnd);
+ public GridRedisExpireCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisDbSizeCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisDbSizeCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisDbSizeCommandHandler.java
index 371503a..7533fb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisDbSizeCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisDbSizeCommandHandler.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.List;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
import org.apache.ignite.internal.processors.rest.GridRestResponse;
import org.apache.ignite.internal.processors.rest.handlers.redis.GridRedisRestCommandHandler;
@@ -49,9 +50,10 @@ public class GridRedisDbSizeCommandHandler extends GridRedisRestCommandHandler {
*
* @param log Logger to use.
* @param hnd Rest handler.
+ * @param ctx Kernal context.
*/
- public GridRedisDbSizeCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
- super(log, hnd);
+ public GridRedisDbSizeCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisFlushCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisFlushCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisFlushCommandHandler.java
index 9e48b6b..d9104d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisFlushCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/server/GridRedisFlushCommandHandler.java
@@ -53,21 +53,15 @@ public class GridRedisFlushCommandHandler extends GridRedisRestCommandHandler {
FLUSHALL
);
- /** Grid context. */
- private final GridKernalContext ctx;
-
/**
* Handler constructor.
*
* @param log Logger to use.
* @param hnd Rest handler.
- * @param ctx Context.
+ * @param ctx Kernal context.
*/
- public GridRedisFlushCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd,
- GridKernalContext ctx) {
- super(log, hnd);
-
- this.ctx = ctx;
+ public GridRedisFlushCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisAppendCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisAppendCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisAppendCommandHandler.java
index dd39506..93504c2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisAppendCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisAppendCommandHandler.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.List;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
import org.apache.ignite.internal.processors.rest.GridRestResponse;
import org.apache.ignite.internal.processors.rest.handlers.redis.GridRedisRestCommandHandler;
@@ -55,9 +56,10 @@ public class GridRedisAppendCommandHandler extends GridRedisRestCommandHandler {
*
* @param log Logger to use.
* @param hnd Rest handler.
+ * @param ctx Kernal context.
*/
- public GridRedisAppendCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
- super(log, hnd);
+ public GridRedisAppendCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetCommandHandler.java
index bd206c9..1192162 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetCommandHandler.java
@@ -46,21 +46,15 @@ public class GridRedisGetCommandHandler extends GridRedisRestCommandHandler {
GET
);
- /** Grid context. */
- private final GridKernalContext ctx;
-
/**
* Handler constructor.
*
* @param log Logger to use.
* @param hnd Rest handler.
- * @param ctx Context.
+ * @param ctx Kernal context.
*/
- public GridRedisGetCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd,
- GridKernalContext ctx) {
- super(log, hnd);
-
- this.ctx = ctx;
+ public GridRedisGetCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetRangeCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetRangeCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetRangeCommandHandler.java
index 828fe3b..7636a56 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetRangeCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetRangeCommandHandler.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.List;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
import org.apache.ignite.internal.processors.rest.GridRestResponse;
import org.apache.ignite.internal.processors.rest.handlers.redis.GridRedisRestCommandHandler;
@@ -56,9 +57,10 @@ public class GridRedisGetRangeCommandHandler extends GridRedisRestCommandHandler
*
* @param log Logger to use.
* @param hnd Rest handler.
+ * @param ctx Kernal context.
*/
- public GridRedisGetRangeCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
- super(log, hnd);
+ public GridRedisGetRangeCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetSetCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetSetCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetSetCommandHandler.java
index feeb7d6..c531d1c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetSetCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisGetSetCommandHandler.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.List;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
import org.apache.ignite.internal.processors.rest.GridRestResponse;
import org.apache.ignite.internal.processors.rest.handlers.redis.GridRedisRestCommandHandler;
@@ -53,9 +54,10 @@ public class GridRedisGetSetCommandHandler extends GridRedisRestCommandHandler {
*
* @param log Logger to use.
* @param hnd Rest handler.
+ * @param ctx Kernal context.
*/
- public GridRedisGetSetCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
- super(log, hnd);
+ public GridRedisGetSetCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisIncrDecrCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisIncrDecrCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisIncrDecrCommandHandler.java
index 99453aa..ebaf87e 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisIncrDecrCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisIncrDecrCommandHandler.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.List;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
import org.apache.ignite.internal.processors.rest.GridRestResponse;
import org.apache.ignite.internal.processors.rest.handlers.redis.GridRedisRestCommandHandler;
@@ -64,9 +65,10 @@ public class GridRedisIncrDecrCommandHandler extends GridRedisRestCommandHandler
*
* @param log Logger to use.
* @param hnd Rest handler.
+ * @param ctx Kernal context.
*/
- public GridRedisIncrDecrCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
- super(log, hnd);
+ public GridRedisIncrDecrCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisMGetCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisMGetCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisMGetCommandHandler.java
index 7a3acb3..82b507a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisMGetCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisMGetCommandHandler.java
@@ -23,6 +23,7 @@ import java.util.List;
import java.util.Map;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
import org.apache.ignite.internal.processors.rest.GridRestResponse;
import org.apache.ignite.internal.processors.rest.handlers.redis.GridRedisRestCommandHandler;
@@ -51,9 +52,10 @@ public class GridRedisMGetCommandHandler extends GridRedisRestCommandHandler {
*
* @param log Logger to use.
* @param hnd Rest handler.
+ * @param ctx Kernal context.
*/
- public GridRedisMGetCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
- super(log, hnd);
+ public GridRedisMGetCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisMSetCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisMSetCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisMSetCommandHandler.java
index 9a2a9a6..74c6ec3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisMSetCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisMSetCommandHandler.java
@@ -24,6 +24,7 @@ import java.util.List;
import java.util.Map;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
import org.apache.ignite.internal.processors.rest.GridRestResponse;
import org.apache.ignite.internal.processors.rest.handlers.redis.GridRedisRestCommandHandler;
@@ -51,9 +52,10 @@ public class GridRedisMSetCommandHandler extends GridRedisRestCommandHandler {
*
* @param log Logger to use.
* @param hnd Rest handler.
+ * @param ctx Kernal context.
*/
- public GridRedisMSetCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
- super(log, hnd);
+ public GridRedisMSetCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java
index f97f59a..8b25fb0 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetCommandHandler.java
@@ -55,21 +55,15 @@ public class GridRedisSetCommandHandler extends GridRedisRestCommandHandler {
/** Value position in Redis message. */
private static final int VAL_POS = 2;
- /** Grid context. */
- private final GridKernalContext ctx;
-
/**
* Handler constructor.
*
* @param log Logger to use.
* @param hnd Rest handler.
- * @param ctx Context.
+ * @param ctx Kernal context.
*/
- public GridRedisSetCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd,
- GridKernalContext ctx) {
- super(log, hnd);
-
- this.ctx = ctx;
+ public GridRedisSetCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetRangeCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetRangeCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetRangeCommandHandler.java
index 7c7f195..f7ca797 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetRangeCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisSetRangeCommandHandler.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.List;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
import org.apache.ignite.internal.processors.rest.GridRestResponse;
import org.apache.ignite.internal.processors.rest.handlers.redis.GridRedisRestCommandHandler;
@@ -60,9 +61,10 @@ public class GridRedisSetRangeCommandHandler extends GridRedisRestCommandHandler
*
* @param log Logger to use.
* @param hnd Rest handler.
+ * @param ctx Kernal context.
*/
- public GridRedisSetRangeCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
- super(log, hnd);
+ public GridRedisSetRangeCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisStrlenCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisStrlenCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisStrlenCommandHandler.java
index 04ba96d..36b44ec 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisStrlenCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/string/GridRedisStrlenCommandHandler.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import java.util.List;
import org.apache.ignite.IgniteCheckedException;
import org.apache.ignite.IgniteLogger;
+import org.apache.ignite.internal.GridKernalContext;
import org.apache.ignite.internal.processors.rest.GridRestProtocolHandler;
import org.apache.ignite.internal.processors.rest.GridRestResponse;
import org.apache.ignite.internal.processors.rest.handlers.redis.GridRedisRestCommandHandler;
@@ -49,9 +50,10 @@ public class GridRedisStrlenCommandHandler extends GridRedisRestCommandHandler {
*
* @param log Logger to use.
* @param hnd Rest handler.
+ * @param ctx Kernal context.
*/
- public GridRedisStrlenCommandHandler(final IgniteLogger log, final GridRestProtocolHandler hnd) {
- super(log, hnd);
+ public GridRedisStrlenCommandHandler(IgniteLogger log, GridRestProtocolHandler hnd, GridKernalContext ctx) {
+ super(log, hnd, ctx);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/4e628a91/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisNioListener.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisNioListener.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisNioListener.java
index bc2daf2..9c0d085 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisNioListener.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisNioListener.java
@@ -76,22 +76,22 @@ public class GridRedisNioListener extends GridNioServerListenerAdapter<GridRedis
// string commands.
addCommandHandler(new GridRedisGetCommandHandler(log, hnd, ctx));
addCommandHandler(new GridRedisSetCommandHandler(log, hnd, ctx));
- addCommandHandler(new GridRedisMSetCommandHandler(log, hnd));
- addCommandHandler(new GridRedisMGetCommandHandler(log, hnd));
- addCommandHandler(new GridRedisIncrDecrCommandHandler(log, hnd));
- addCommandHandler(new GridRedisAppendCommandHandler(log, hnd));
- addCommandHandler(new GridRedisGetSetCommandHandler(log, hnd));
- addCommandHandler(new GridRedisStrlenCommandHandler(log, hnd));
- addCommandHandler(new GridRedisSetRangeCommandHandler(log, hnd));
- addCommandHandler(new GridRedisGetRangeCommandHandler(log, hnd));
+ addCommandHandler(new GridRedisMSetCommandHandler(log, hnd, ctx));
+ addCommandHandler(new GridRedisMGetCommandHandler(log, hnd, ctx));
+ addCommandHandler(new GridRedisIncrDecrCommandHandler(log, hnd, ctx));
+ addCommandHandler(new GridRedisAppendCommandHandler(log, hnd, ctx));
+ addCommandHandler(new GridRedisGetSetCommandHandler(log, hnd, ctx));
+ addCommandHandler(new GridRedisStrlenCommandHandler(log, hnd, ctx));
+ addCommandHandler(new GridRedisSetRangeCommandHandler(log, hnd, ctx));
+ addCommandHandler(new GridRedisGetRangeCommandHandler(log, hnd, ctx));
// key commands.
- addCommandHandler(new GridRedisDelCommandHandler(log, hnd));
- addCommandHandler(new GridRedisExistsCommandHandler(log, hnd));
- addCommandHandler(new GridRedisExpireCommandHandler(log, hnd));
+ addCommandHandler(new GridRedisDelCommandHandler(log, hnd, ctx));
+ addCommandHandler(new GridRedisExistsCommandHandler(log, hnd, ctx));
+ addCommandHandler(new GridRedisExpireCommandHandler(log, hnd, ctx));
// server commands.
- addCommandHandler(new GridRedisDbSizeCommandHandler(log, hnd));
+ addCommandHandler(new GridRedisDbSizeCommandHandler(log, hnd, ctx));
addCommandHandler(new GridRedisFlushCommandHandler(log, hnd, ctx));
}