#ignite-629: Remove CacheFlag.Local

apache · Mar 27, 2015 · 4bc5b22 · 4bc5b22
1 parent 71ecef2
commit 4bc5b22
Show file tree

Hide file tree

Showing 11 changed files with 52 additions and 101 deletions.
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
@@ -30,19 +30,11 @@
  * <li>{@link CacheProjection#flagsOn(CacheFlag...)}</li>
  * <li>{@link CacheProjection#flagsOff(CacheFlag...)}</li>
  * </ul>
- * Also, some flags, like {@link #LOCAL}, or {@link #READ} may be implicitly set whenever
+ * Also, some flags, like {@link #READ} may be implicitly set whenever
  * creating new projections and passing entries to predicate filters.
  */
 public enum CacheFlag {
-    /**
-     * Only operations that don't require any communication with
-     * other cache nodes are allowed. This flag is automatically set
-     * on underlying projection for all the entries that are given to
-     * predicate filters to make sure that no distribution happens
-     * from inside of predicate evaluation.
-     */
     LOCAL,
-
     /**
      * Only operations that don't change cached data are allowed.
      * This flag is automatically set on underlying projection for

diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjection.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
@@ -1597,8 +1597,6 @@ private boolean evictx(K key, GridCacheVersion ver,
 
     /** {@inheritDoc} */
     @Override public V getForcePrimary(K key) throws IgniteCheckedException {
-        ctx.denyOnFlag(LOCAL);
-
         String taskName = ctx.kernalContext().job().currentTaskName();
 
         return getAllAsync(F.asList(key), /*force primary*/true, /*skip tx*/false, null, null, taskName, true, false)
@@ -1607,8 +1605,6 @@ private boolean evictx(K key, GridCacheVersion ver,
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<V> getForcePrimaryAsync(final K key) {
-        ctx.denyOnFlag(LOCAL);
-
         String taskName = ctx.kernalContext().job().currentTaskName();
 
         return getAllAsync(Collections.singletonList(key), /*force primary*/true, /*skip tx*/false, null, null,
@@ -2040,9 +2036,7 @@ public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable final Collection<?
     ) {
         ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
 
-        ctx.denyOnFlag(LOCAL);
+       if (keyCheck)
-
-        if (keyCheck)
             validateCacheKeys(keys);
 
         return getAllAsync0(ctx.cacheKeysView(keys),
@@ -5023,8 +5017,6 @@ public Collection<V> primaryValues(@Nullable CacheEntryPredicate... filter) {
      * @return Read operation future.
      */
     public final IgniteInternalFuture<V> getAsync(final K key, boolean deserializePortable) {
-        ctx.denyOnFlag(LOCAL);
-
         try {
             checkJta();
         }
@@ -5051,8 +5043,6 @@ public final IgniteInternalFuture<V> getAsync(final K key, boolean deserializePo
      * @throws IgniteCheckedException If read failed.
      */
     public Map<K, V> getAll(Collection<? extends K> keys, boolean deserializePortable) throws IgniteCheckedException {
-        ctx.denyOnFlag(LOCAL);
-
         checkJta();
 
         return getAllAsync(keys, deserializePortable).get();
@@ -5064,7 +5054,7 @@ public Map<K, V> getAll(Collection<? extends K> keys, boolean deserializePortabl
      * @throws IgniteCheckedException If failed.
      */
     @Override @Nullable public V reload(K key) throws IgniteCheckedException {
-        ctx.denyOnFlags(F.asList(LOCAL, READ));
+        ctx.denyOnFlags(F.asList(READ));
 
         A.notNull(key, "key");
 
@@ -5097,7 +5087,7 @@ public Map<K, V> getAll(Collection<? extends K> keys, boolean deserializePortabl
      * @return Reload future.
      */
     @Override public IgniteInternalFuture<V> reloadAsync(final K key) {
-        ctx.denyOnFlags(F.asList(LOCAL, READ));
+        ctx.denyOnFlags(F.asList(READ));
 
         return ctx.closures().callLocalSafe(ctx.projectSafe(new Callable<V>() {
             @Nullable @Override public V call() throws IgniteCheckedException {

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
@@ -157,10 +157,7 @@ public class GridCacheContext<K, V> implements Externalizable {
     private ThreadLocal<CacheFlag[]> forcedFlags = new ThreadLocal<>();
 
     /** Constant array to avoid recreation. */
-    private static final CacheFlag[] FLAG_LOCAL_READ = new CacheFlag[]{LOCAL, READ};
+    private static final CacheFlag[] FLAG_READ = new CacheFlag[]{READ};
-
-    /** Local flag array. */
-    private static final CacheFlag[] FLAG_LOCAL = new CacheFlag[]{LOCAL};
 
     /** Cache name. */
     private String cacheName;
@@ -1114,7 +1111,7 @@ public <E> boolean isAll(E e, @Nullable IgnitePredicate<? super E>[] p) throws I
             return true;
 
         // We should allow only local read-only operations within filter checking.
-        CacheFlag[] oldFlags = forceFlags(FLAG_LOCAL_READ);
+        CacheFlag[] oldFlags = forceFlags(FLAG_READ);
 
         try {
             boolean pass = F.isAll(e, p);
@@ -1189,22 +1186,13 @@ public boolean isAllLocked(GridCacheEntryEx e, CacheEntryPredicate[] p) throws I
         return true;
     }
 
-    /**
-     * Forces LOCAL flag.
-     *
-     * @return Previously forced flags.
-     */
-    @Nullable public CacheFlag[] forceLocal() {
-        return forceFlags(FLAG_LOCAL);
-    }
-
     /**
      * Forces LOCAL and READ flags.
      *
      * @return Forced flags that were set prior to method call.
      */
     @Nullable public CacheFlag[] forceLocalRead() {
-        return forceFlags(FLAG_LOCAL_READ);
+        return forceFlags(FLAG_READ);
     }
 
     /**
@@ -1381,7 +1369,7 @@ public void denyOnFlag(CacheFlag flag) {
      *
      */
     public void denyOnLocalRead() {
-        denyOnFlags(FLAG_LOCAL_READ);
+        denyOnFlags(FLAG_READ);
     }
 
     /**

diff --git a/...les/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/...les/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java
@@ -609,8 +609,6 @@ protected final void releaseSwap() throws IgniteCheckedException {
         String taskName,
         @Nullable IgniteCacheExpiryPolicy expirePlc)
         throws IgniteCheckedException, GridCacheEntryRemovedException {
-        cctx.denyOnFlag(LOCAL);
-
         return innerGet0(tx,
             readSwap,
             readThrough,

diff --git a/...core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java b/...core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProjectionEx.java
@@ -203,7 +203,7 @@ public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntr
      * if there is one.
      * <h2 class="header">Cache Flags</h2>
      * This method is not available if any of the following flags are set on projection:
-     * {@link CacheFlag#LOCAL}, {@link CacheFlag#READ}.
+     * {@link CacheFlag#READ}.
      *
      * @param key Key to store in cache.
      * @param oldVal Old value to match.
@@ -228,7 +228,7 @@ public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntr
      * if there is one.
      * <h2 class="header">Cache Flags</h2>
      * This method is not available if any of the following flags are set on projection:
-     * {@link CacheFlag#LOCAL}, {@link CacheFlag#READ}.
+     * {@link CacheFlag#READ}.
      *
      * @param key Key to store in cache.
      * @param oldVal Old value to match.
@@ -250,7 +250,7 @@ public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntr
      * if there is one.
      * <h2 class="header">Cache Flags</h2>
      * This method is not available if any of the following flags are set on projection:
-     * {@link CacheFlag#LOCAL}, {@link CacheFlag#READ}.
+     * {@link CacheFlag#READ}.
      *
      * @param key Key whose mapping is to be removed from cache.
      * @param val Value to match against currently cached value.
@@ -274,7 +274,7 @@ public IgniteInternalFuture<Boolean> removexAsync(K key, @Nullable GridCacheEntr
      * if there is one.
      * <h2 class="header">Cache Flags</h2>
      * This method is not available if any of the following flags are set on projection:
-     * {@link CacheFlag#LOCAL}, {@link CacheFlag#READ}.
+     * {@link CacheFlag#READ}.
      *
      * @param key Key whose mapping is to be removed from cache.
      * @param val Value to match against currently cached value.

diff --git a/...che/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java b/...che/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -178,7 +178,6 @@ public GridDistributedCacheEntry entryExx(
         final boolean deserializePortable,
         final boolean skipVals
     ) {
-        ctx.denyOnFlag(LOCAL);
         ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
 
         if (F.isEmpty(keys))

diff --git a/...ava/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/...ava/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java
@@ -364,7 +364,6 @@ public void processDhtAtomicUpdateRequest(
         boolean deserializePortable,
         boolean skipVals
     ) {
-        ctx.denyOnFlag(LOCAL);
         ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
 
         if (F.isEmpty(keys))

diff --git a/.../apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java b/.../apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
@@ -104,7 +104,6 @@ public void dht(GridDhtCache<K, V> dht) {
         final boolean deserializePortable,
         final boolean skipVals
     ) {
-        ctx.denyOnFlag(LOCAL);
         ctx.checkSecurity(GridSecurityPermission.CACHE_READ);
 
         if (F.isEmpty(keys))

diff --git a/...n/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java b/...n/java/org/apache/ignite/internal/processors/cache/local/atomic/GridLocalAtomicCache.java
@@ -482,8 +482,6 @@ public GridLocalAtomicCache(GridCacheContext<K, V> ctx) {
 
     @SuppressWarnings("unchecked")
     @Override @Nullable public V get(K key, boolean deserializePortable) throws IgniteCheckedException {
-        ctx.denyOnFlag(LOCAL);
-
         String taskName = ctx.kernalContext().job().currentTaskName();
 
         Map<K, V> m = getAllInternal(Collections.singleton(key),
@@ -503,8 +501,6 @@ public GridLocalAtomicCache(GridCacheContext<K, V> ctx) {
     @SuppressWarnings("unchecked")
     @Override public final Map<K, V> getAll(Collection<? extends K> keys, boolean deserializePortable)
         throws IgniteCheckedException {
-        ctx.denyOnFlag(LOCAL);
-
         A.notNull(keys, "keys");
 
         String taskName = ctx.kernalContext().job().currentTaskName();
@@ -531,8 +527,6 @@ public GridLocalAtomicCache(GridCacheContext<K, V> ctx) {
         final boolean deserializePortable,
         final boolean skipVals
     ) {
-        ctx.denyOnFlag(LOCAL);
-
         A.notNull(keys, "keys");
 
         final boolean swapOrOffheap = ctx.isSwapOrOffheapEnabled();

diff --git a/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala b/modules/scalar/src/main/scala/org/apache/ignite/scalar/pimps/ScalarCachePimp.scala
@@ -215,7 +215,7 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] {
      *
      * ===Cache Flags===
      * This method is not available if any of the following flags are set on projection:
-     * `CacheFlag#LOCAL`, `CacheFlag#READ`.
+     * `CacheFlag#READ`.
      *
      * @param kv Key-Value pair to store in cache.
      * @return `True` if value was stored in cache, `false` otherwise.
@@ -237,7 +237,7 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] {
      *
      * ===Cache Flags===
      * This method is not available if any of the following flags are set on projection:
-     * `CacheFlag#LOCAL`, `CacheFlag#READ`.
+     * `CacheFlag#READ`.
      *
      * @param kv Key-Value pair to store in cache.
      * @return Previous value associated with specified key, or `null`
@@ -261,7 +261,7 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] {
      *
      * ===Cache Flags===
      * This method is not available if any of the following flags are set on projection:
-     * `CacheFlag#LOCAL`, `CacheFlag#READ`.
+     * `CacheFlag#READ`.
      *
      * @param kv Key-Value pair to store in cache.
      * @return Previous value associated with specified key as an option.
@@ -291,7 +291,7 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] {
      *
      * ===Cache Flags===
      * This method is not available if any of the following flags are set on projection:
-     * `CacheFlag#LOCAL`, `CacheFlag#READ`.
+     * `CacheFlag#READ`.
      *
      * @param kv1 Key-value pair to store in cache.
      * @param kv2 Key-value pair to store in cache.
@@ -321,7 +321,7 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] {
      *
      * ===Cache Flags===
      * This method is not available if any of the following flags are set on projection:
-     * `CacheFlag#LOCAL`, `CacheFlag#READ`.
+     * `CacheFlag#READ`.
      *
      * @param kvs Key-value pairs to store in cache. If `null` this function is no-op.
      * @see `IgniteCache#putAll(...)`
@@ -343,7 +343,7 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] {
      *
      * ===Cache Flags===
      * This method is not available if any of the following flags are set on projection:
-     * `CacheFlag#LOCAL`, `CacheFlag#READ`.
+     * `CacheFlag#READ`.
      *
      * @param ks Sequence of additional keys to remove. If `null` - this function is no-op.
      * @see `IgniteCache#removeAll(...)`
@@ -388,7 +388,7 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] {
      *
      * ===Cache Flags===
      * This method is not available if any of the following flags are set on projection:
-     * `CacheFlag#LOCAL`, `CacheFlag#READ`.
+     * `CacheFlag#READ`.
      *
      * @param k Key whose mapping is to be removed from cache.
      * @return Previous value associated with specified key, or `null`
@@ -420,7 +420,7 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] {
      *
      * ===Cache Flags===
      * This method is not available if any of the following flags are set on projection:
-     * `CacheFlag#LOCAL`, `CacheFlag#READ`.
+     * `CacheFlag#READ`.
      *
      * @param k Key whose mapping is to be removed from cache.
      * @return Previous value associated with specified key as an option.
@@ -451,7 +451,7 @@ with Iterable[Cache.Entry[K, V]] with Ordered[IgniteCache[K, V]] {
      *
      * ===Cache Flags===
      * This method is not available if any of the following flags are set on projection:
-     * `CacheFlag#LOCAL`, `CacheFlag#READ`.
+     * `CacheFlag#READ`.
      *
      * @param k1 1st key to remove.
      * @param k2 2nd key to remove.