#ignite-629: remove CacheFlag.FORCE_TRANSFORM_BACKUP
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/748ddb65 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/748ddb65 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/748ddb65 Branch: refs/heads/gg-9998 Commit: 748ddb65e80ae164e3ce2f257acb50a4ad557c7d Parents: 128c82e Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Mar 27 16:10:03 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Mar 27 16:10:03 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/CacheFlag.java | 14 +------------- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 ++-- .../cache/GridCacheReturnValueTransferSelfTest.java | 3 --- .../cache/IgniteCacheInvokeAbstractTest.java | 4 ---- .../GridCacheValueConsistencyAtomicSelfTest.java | 2 -- 5 files changed, 3 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/748ddb65/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java index af27016..67332ff 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheFlag.java @@ -70,19 +70,7 @@ public enum CacheFlag { * @see Transaction#isInvalidate() * @see org.apache.ignite.configuration.CacheConfiguration#isInvalidate() */ - INVALIDATE, - - /** - * Skips version check during {@link IgniteCache#invoke(Object, EntryProcessor, Object[])} writes in - * {@link org.apache.ignite.cache.CacheAtomicityMode#ATOMIC} mode. By default, in {@code ATOMIC} mode, whenever - * {@code transform(...)} is called, cache values (and not the {@code transform} closure) are sent from primary - * node to backup nodes to ensure proper update ordering. - * <p> - * By setting this flag, version check is skipped, and the {@code transform} closure is applied on both, primary - * and backup nodes. Use this flag for better performance if you are sure that there are no - * concurrent updates happening for the same key when {@code transform(...)} method is called. - */ - FORCE_TRANSFORM_BACKUP; + INVALIDATE; /** */ private static final CacheFlag[] VALS = values(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/748ddb65/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java index 79d1779..edf3eaa 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java @@ -582,7 +582,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> syncMode, op, retval, - op == TRANSFORM && cctx.hasFlag(FORCE_TRANSFORM_BACKUP), + op == TRANSFORM, expiryPlc, invokeArgs, filter, @@ -705,7 +705,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> syncMode, op, retval, - op == TRANSFORM && cctx.hasFlag(FORCE_TRANSFORM_BACKUP), + op == TRANSFORM, expiryPlc, invokeArgs, filter, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/748ddb65/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java index 2b81711..9771376 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheReturnValueTransferSelfTest.java @@ -142,9 +142,6 @@ public class GridCacheReturnValueTransferSelfTest extends GridCommonAbstractTest // Get client grid. IgniteCache<Integer, TestObject> cache = grid(2).cache(null); - if (backups > 0 && atomicityMode == ATOMIC) - cache = ((IgniteCacheProxy<Integer, TestObject>)cache).flagOn(FORCE_TRANSFORM_BACKUP); - for (int i = 0; i < 100; i++) cache.put(i, new TestObject()); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/748ddb65/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java index e39d9bb..b5af288 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheInvokeAbstractTest.java @@ -57,8 +57,6 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT invoke(cache, OPTIMISTIC); } else if (gridCount() > 1) { - cache = ((IgniteCacheProxy<Integer, Integer>)cache).flagOn(FORCE_TRANSFORM_BACKUP); - invoke(cache, null); } } @@ -186,8 +184,6 @@ public abstract class IgniteCacheInvokeAbstractTest extends IgniteCacheAbstractT invokeAll(cache, OPTIMISTIC); } else if (gridCount() > 1) { - cache = ((IgniteCacheProxy<Integer, Integer>)cache).flagOn(FORCE_TRANSFORM_BACKUP); - invokeAll(cache, null); } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/748ddb65/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java index ee60143..a77e78c 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridCacheValueConsistencyAtomicSelfTest.java @@ -74,8 +74,6 @@ public class GridCacheValueConsistencyAtomicSelfTest extends GridCacheValueConsi IgniteCache<Integer, Integer> cache = grid(idx).cache(null); - cache = ((IgniteCacheProxy<Integer, Integer>)cache).flagOn(FORCE_TRANSFORM_BACKUP); - cache.invoke(i, new Transformer(i)); } }
