Repository: incubator-ignite Updated Branches: refs/heads/ignite-973-2 108788b97 -> 211ad65cf
ignite-1022 do not need to start new thread inside tx on utility cache Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/74dc6d5a Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/74dc6d5a Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/74dc6d5a Branch: refs/heads/ignite-973-2 Commit: 74dc6d5a23c7a40841cbb41357e1e3bb2404a93c Parents: 1c66078 Author: sboikov <sboi...@gridgain.com> Authored: Tue Jun 23 10:54:37 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Tue Jun 23 10:54:37 2015 +0300 ---------------------------------------------------------------------- .../datastructures/DataStructuresProcessor.java | 64 +++++++------------- ...GridCacheQueueMultiNodeAbstractSelfTest.java | 4 +- .../GridCacheSetAbstractSelfTest.java | 8 +-- 3 files changed, 27 insertions(+), 49 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74dc6d5a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java index 473a2ac..e6335b6 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/datastructures/DataStructuresProcessor.java @@ -297,8 +297,8 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { checkAtomicsConfiguration(); - removeDataStructure(new IgniteCallable<Void>() { - @Override public Void call() throws Exception { + removeDataStructure(new IgniteOutClosureX<Void>() { + @Override public Void applyx() throws IgniteCheckedException { dsCacheCtx.gate().enter(); try { @@ -306,9 +306,6 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { removeInternal(key, GridCacheAtomicSequenceValue.class); } - catch (Exception e) { - throw new IgniteCheckedException("Failed to remove sequence by name: " + name, e); - } finally { dsCacheCtx.gate().leave(); } @@ -429,11 +426,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { if (err != null) throw err; - dataStructure = ctx.closure().callLocalSafe(new Callable<T>() { - @Override public T call() throws Exception { - return c.applyx(); - } - }, false).get(); + dataStructure = c.applyx(); tx.commit(); } @@ -453,16 +446,13 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { awaitInitialization(); - removeDataStructure(new IgniteCallable<Void>() { - @Override public Void call() throws Exception { + removeDataStructure(new IgniteOutClosureX<Void>() { + @Override public Void applyx() throws IgniteCheckedException { dsCacheCtx.gate().enter(); try { removeInternal(new GridCacheInternalKeyImpl(name), GridCacheAtomicLongValue.class); } - catch (Exception e) { - throw new IgniteCheckedException("Failed to remove atomic long by name: " + name, e); - } finally { dsCacheCtx.gate().leave(); } @@ -479,7 +469,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { * @param afterRmv Optional closure to run after data structure removed. * @throws IgniteCheckedException If failed. */ - private <T> void removeDataStructure(IgniteCallable<T> c, + private <T> void removeDataStructure(IgniteOutClosureX<T> c, String name, DataStructureType type, @Nullable IgniteInClosureX<T> afterRmv) @@ -515,7 +505,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { if (!exists) return; - rmvInfo = ctx.closure().callLocalSafe(c, false).get(); + rmvInfo = c.applyx(); tx.commit(); } @@ -611,8 +601,8 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { awaitInitialization(); - removeDataStructure(new IgniteCallable<Void>() { - @Override public Void call() throws Exception { + removeDataStructure(new IgniteOutClosureX<Void>() { + @Override public Void applyx() throws IgniteCheckedException { dsCacheCtx.gate().enter(); try { @@ -620,9 +610,6 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { removeInternal(key, GridCacheAtomicReferenceValue.class); } - catch (Exception e) { - throw new IgniteCheckedException("Failed to remove atomic reference by name: " + name, e); - } finally { dsCacheCtx.gate().leave(); } @@ -718,8 +705,8 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { awaitInitialization(); - removeDataStructure(new IgniteCallable<Void>() { - @Override public Void call() throws Exception { + removeDataStructure(new IgniteOutClosureX<Void>() { + @Override public Void applyx() throws IgniteCheckedException { dsCacheCtx.gate().enter(); try { @@ -727,9 +714,6 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { removeInternal(key, GridCacheAtomicStampedValue.class); } - catch (Exception e) { - throw new IgniteCheckedException("Failed to remove atomic stamped by name: " + name, e); - } finally { dsCacheCtx.gate().leave(); } @@ -806,6 +790,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { /** * @param cfg Collection configuration. * @return Cache name. + * @throws IgniteCheckedException If failed. */ private String compatibleConfiguration(CollectionConfiguration cfg) throws IgniteCheckedException { List<CacheCollectionInfo> caches = utilityDataCache.localPeek(DATA_STRUCTURES_CACHE_KEY, null, null); @@ -835,8 +820,8 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { awaitInitialization(); - IgniteCallable<GridCacheQueueHeader> rmv = new IgniteCallable<GridCacheQueueHeader>() { - @Override public GridCacheQueueHeader call() throws Exception { + IgniteOutClosureX<GridCacheQueueHeader> rmv = new IgniteOutClosureX<GridCacheQueueHeader>() { + @Override public GridCacheQueueHeader applyx() throws IgniteCheckedException { return (GridCacheQueueHeader)retryRemove(cctx.cache(), new GridCacheQueueHeaderKey(name)); } }; @@ -910,11 +895,7 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { final GridCacheContext cacheCtx = ctx.cache().internalCache(cacheName).context(); - col = ctx.closure().callLocalSafe(new Callable<T>() { - @Override public T call() throws Exception { - return c.applyx(cacheCtx); - } - }, false).get(); + col = c.applyx(cacheCtx); tx.commit(); } @@ -1055,8 +1036,8 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { awaitInitialization(); - removeDataStructure(new IgniteCallable<Void>() { - @Override public Void call() throws Exception { + removeDataStructure(new IgniteOutClosureX<Void>() { + @Override public Void applyx() throws IgniteCheckedException { GridCacheInternal key = new GridCacheInternalKeyImpl(name); dsCacheCtx.gate().enter(); @@ -1079,11 +1060,8 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { tx.setRollbackOnly(); return null; - } catch (Error | Exception e) { - U.error(log, "Failed to remove data structure: " + key, e); - - throw e; - } finally { + } + finally { dsCacheCtx.gate().leave(); } } @@ -1257,8 +1235,8 @@ public final class DataStructuresProcessor extends GridProcessorAdapter { awaitInitialization(); - IgniteCallable<GridCacheSetHeader> rmv = new IgniteCallable<GridCacheSetHeader>() { - @Override public GridCacheSetHeader call() throws Exception { + IgniteOutClosureX<GridCacheSetHeader> rmv = new IgniteOutClosureX<GridCacheSetHeader>() { + @Override public GridCacheSetHeader applyx() throws IgniteCheckedException { return (GridCacheSetHeader)retryRemove(cctx.cache(), new GridCacheSetHeaderKey(name)); } }; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74dc6d5a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java index 33fe127..49ee641 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheQueueMultiNodeAbstractSelfTest.java @@ -455,11 +455,11 @@ public abstract class GridCacheQueueMultiNodeAbstractSelfTest extends IgniteColl } /** - * TODO: IGNITE-583. - * * @throws Exception If failed. */ public void testIterator() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-583";); + final String queueName = UUID.randomUUID().toString(); info("Queue name: " + queueName); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/74dc6d5a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java index 6383f91..74114d9 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/datastructures/GridCacheSetAbstractSelfTest.java @@ -553,20 +553,20 @@ public abstract class GridCacheSetAbstractSelfTest extends IgniteCollectionAbstr } /** - * TODO: IGNITE-584. - * * @throws Exception If failed. */ public void testNodeJoinsAndLeaves() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-584";); + testNodeJoinsAndLeaves(false); } /** - * TODO: IGNITE-584. - * * @throws Exception If failed. */ public void testNodeJoinsAndLeavesCollocated() throws Exception { + fail("https://issues.apache.org/jira/browse/IGNITE-584";); + testNodeJoinsAndLeaves(true); }
