Repository: ignite Updated Branches: refs/heads/ignite-2004 e97718427 -> 33931a968
IGNITE-2004 WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/33931a96 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/33931a96 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/33931a96 Branch: refs/heads/ignite-2004 Commit: 33931a968bf28222289c29bff5d9d72c7c3250b7 Parents: e977184 Author: nikolay_tikhonov <[email protected]> Authored: Wed Apr 13 17:53:54 2016 +0300 Committer: nikolay_tikhonov <[email protected]> Committed: Wed Apr 13 17:53:54 2016 +0300 ---------------------------------------------------------------------- .../org/apache/ignite/internal/GridKernalContextImpl.java | 8 ++++---- .../main/java/org/apache/ignite/internal/IgniteKernal.java | 4 ++-- .../src/main/java/org/apache/ignite/internal/IgnitionEx.java | 2 +- .../ignite/thread/IgniteStripedThreadPoolExecutor.java | 4 ---- .../CacheContinuousQueryAsyncFilterListenerTest.java | 6 +++--- ...ContinuousQueryFactoryAsyncFilterRandomOperationTest.java | 4 ++-- 6 files changed, 12 insertions(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/33931a96/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index e6541eb..79d67df 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@ -306,7 +306,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable /** */ @GridToStringExclude - protected IgniteStripedThreadPoolExecutor conQryExecSvc; + protected IgniteStripedThreadPoolExecutor callbackExecSvc; /** */ @GridToStringExclude @@ -384,7 +384,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable ExecutorService mgmtExecSvc, ExecutorService igfsExecSvc, ExecutorService restExecSvc, - IgniteStripedThreadPoolExecutor conQryExecSvc, + IgniteStripedThreadPoolExecutor callbackExecSvc, List<PluginProvider> plugins) throws IgniteCheckedException { assert grid != null; assert cfg != null; @@ -401,7 +401,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable this.mgmtExecSvc = mgmtExecSvc; this.igfsExecSvc = igfsExecSvc; this.restExecSvc = restExecSvc; - this.conQryExecSvc = conQryExecSvc; + this.callbackExecSvc = callbackExecSvc; marshCtx = new MarshallerContextImpl(plugins); @@ -754,7 +754,7 @@ public class GridKernalContextImpl implements GridKernalContext, Externalizable /** {@inheritDoc} */ @Override public IgniteStripedThreadPoolExecutor asyncCallbackPool() { - return conQryExecSvc; + return callbackExecSvc; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/33931a96/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java index d5acb6e..d6655d9 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java @@ -668,7 +668,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { ExecutorService mgmtExecSvc, ExecutorService igfsExecSvc, ExecutorService restExecSvc, - IgniteStripedThreadPoolExecutor conQryExecSvc, + IgniteStripedThreadPoolExecutor callbackExecSvc, GridAbsClosure errHnd) throws IgniteCheckedException { @@ -773,7 +773,7 @@ public class IgniteKernal implements IgniteEx, IgniteMXBean, Externalizable { mgmtExecSvc, igfsExecSvc, restExecSvc, - conQryExecSvc, + callbackExecSvc, plugins); cfg.getMarshaller().setContext(ctx.marshallerContext()); http://git-wip-us.apache.org/repos/asf/ignite/blob/33931a96/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index 5d2a820..c8ad3cd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@ -1656,7 +1656,7 @@ public class IgnitionEx { cfg.getAsyncCallbackPoolSize(), 1, cfg.getGridName(), - "contQry"); + "callback"); if (myCfg.getConnectorConfiguration() != null) { restExecSvc = new IgniteThreadPoolExecutor( http://git-wip-us.apache.org/repos/asf/ignite/blob/33931a96/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java b/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java index 0dc5588..44ea823 100644 --- a/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java +++ b/modules/core/src/main/java/org/apache/ignite/thread/IgniteStripedThreadPoolExecutor.java @@ -21,8 +21,6 @@ import java.util.Collection; import java.util.LinkedList; import java.util.List; import java.util.concurrent.Callable; -import java.util.concurrent.ConcurrentHashMap; -import java.util.concurrent.ConcurrentMap; import java.util.concurrent.ExecutionException; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; @@ -31,9 +29,7 @@ import java.util.concurrent.RejectedExecutionException; import java.util.concurrent.ThreadFactory; import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeoutException; -import java.util.concurrent.atomic.AtomicLong; import org.apache.ignite.internal.util.typedef.internal.S; -import org.jsr166.ThreadLocalRandom8; /** * An {@link ExecutorService} that executes submitted tasks using pooled grid threads. http://git-wip-us.apache.org/repos/asf/ignite/blob/33931a96/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java index b1ed6cd..0605bc8 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryAsyncFilterListenerTest.java @@ -464,7 +464,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr Thread.currentThread().getName().contains("sys-")); assertTrue("Failed: " + Thread.currentThread().getName(), - Thread.currentThread().getName().contains("contQry-")); + Thread.currentThread().getName().contains("callback-")); } } }; @@ -619,7 +619,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr Thread.currentThread().getName().contains("sys-")); assertTrue("Failed: " + Thread.currentThread().getName(), - Thread.currentThread().getName().contains("contQry-")); + Thread.currentThread().getName().contains("callback-")); } IgniteCache<Object, Object> cache0 = ignite.cache(cache.getName()); @@ -673,7 +673,7 @@ public class CacheContinuousQueryAsyncFilterListenerTest extends GridCommonAbstr Thread.currentThread().getName().contains("sys-")); assertTrue("Failed: " + Thread.currentThread().getName(), - Thread.currentThread().getName().contains("contQry-")); + Thread.currentThread().getName().contains("callback-")); } QueryTestValue val = e.getValue(); http://git-wip-us.apache.org/repos/asf/ignite/blob/33931a96/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.java index 37035d4..928cfda 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryFactoryAsyncFilterRandomOperationTest.java @@ -54,7 +54,7 @@ public class CacheContinuousQueryFactoryAsyncFilterRandomOperationTest /** {@inheritDoc} */ @Override public boolean evaluate(CacheEntryEvent<? extends QueryTestKey, ? extends QueryTestValue> evt) { assertTrue("Failed. Current thread name: " + Thread.currentThread().getName(), - Thread.currentThread().getName().contains("contQry-")); + Thread.currentThread().getName().contains("callback-")); assertFalse("Failed. Current thread name: " + Thread.currentThread().getName(), Thread.currentThread().getName().contains("sys-")); @@ -110,7 +110,7 @@ public class CacheContinuousQueryFactoryAsyncFilterRandomOperationTest /** {@inheritDoc} */ @Override public boolean evaluate(CacheEntryEvent<? extends QueryTestKey, ? extends QueryTestValue> evt) { assertTrue("Failed. Current thread name: " + Thread.currentThread().getName(), - Thread.currentThread().getName().contains("contQry-")); + Thread.currentThread().getName().contains("callback-")); assertFalse("Failed. Current thread name: " + Thread.currentThread().getName(), Thread.currentThread().getName().contains("sys-"));
