#ignite-629: remove CacheFlag.INVALIDATE
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/94c6cc53 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/94c6cc53 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/94c6cc53 Branch: refs/heads/ignite-sprint-3 Commit: 94c6cc53f71ac39c7694e89fc07e936763bd7fb0 Parents: 8de9a2d Author: ivasilinets <ivasilin...@gridgain.com> Authored: Fri Mar 27 17:04:24 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Fri Mar 27 17:04:24 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/cache/GridCacheAdapter.java | 4 ++-- .../ignite/internal/processors/cache/GridCacheContext.java | 2 +- .../ignite/internal/processors/cache/GridCacheSharedContext.java | 3 --- .../processors/rest/handlers/cache/GridCacheCommandHandler.java | 3 --- 4 files changed, 3 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/94c6cc53/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index e68447f..7f6be72 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java @@ -4448,7 +4448,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, OPTIMISTIC, READ_COMMITTED, tCfg.getDefaultTxTimeout(), - ctx.hasFlag(INVALIDATE), + false, !ctx.hasFlag(SKIP_STORE), 0, /** group lock keys */null, @@ -4520,7 +4520,7 @@ public abstract class GridCacheAdapter<K, V> implements GridCache<K, V>, OPTIMISTIC, READ_COMMITTED, ctx.kernalContext().config().getTransactionConfiguration().getDefaultTxTimeout(), - ctx.hasFlag(INVALIDATE), + false, !ctx.hasFlag(SKIP_STORE), 0, null, http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/94c6cc53/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java index 8aede80..fe836be 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java @@ -1524,7 +1524,7 @@ public class GridCacheContext<K, V> implements Externalizable { * @return {@code True} if invalidation is enabled. */ public boolean isInvalidate() { - return cacheCfg.isInvalidate() || hasFlag(INVALIDATE); + return cacheCfg.isInvalidate(); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/94c6cc53/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java index 6bc5f5d..449dc63 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java @@ -463,9 +463,6 @@ public class GridCacheSharedContext<K, V> { return; assert flags != null; - - if (flags.contains(INVALIDATE) && !tx.isInvalidate()) - throw new CacheFlagException(INVALIDATE); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/94c6cc53/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java index cbee8c2..d9330b0 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java @@ -114,9 +114,6 @@ public class GridCacheCommandHandler extends GridRestCommandHandlerAdapter { if ((cacheFlagsBits & (1 << 1)) != 0) flagSet.add(CacheFlag.SKIP_SWAP); - if ((cacheFlagsBits & (1 << 4)) != 0) - flagSet.add(CacheFlag.INVALIDATE); - return flagSet.toArray(new CacheFlag[flagSet.size()]); }
