ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sboi...@apache.org
Subject [2/3] incubator-ignite git commit: #ignite-758: rename CacheProjectionContext to CacheOperationContext.
Date Thu, 16 Apr 2015 13:45:53 GMT
#ignite-758: rename CacheProjectionContext to CacheOperationContext.


Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0ea5f8ef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0ea5f8ef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0ea5f8ef

Branch: refs/heads/ignite-758
Commit: 0ea5f8ef5e9c25ef4bf134ea49fe35cbedd0a528
Parents: b98f669
Author: ivasilinets <ivasilinets@gridgain.com>
Authored: Thu Apr 16 16:42:51 2015 +0300
Committer: ivasilinets <ivasilinets@gridgain.com>
Committed: Thu Apr 16 16:42:51 2015 +0300

----------------------------------------------------------------------
 .../processors/cache/CacheLockImpl.java         |  12 +-
 .../processors/cache/CacheOperationContext.java | 162 +++++++++++++
 .../cache/CacheProjectionContext.java           | 162 -------------
 .../processors/cache/GridCacheAdapter.java      |  30 +--
 .../cache/GridCacheConcurrentMap.java           |  18 +-
 .../processors/cache/GridCacheContext.java      |  52 ++--
 .../processors/cache/GridCacheGateway.java      |  10 +-
 .../processors/cache/GridCacheProcessor.java    |   4 +-
 .../processors/cache/GridCacheProxyImpl.java    | 238 +++++++++----------
 .../processors/cache/IgniteCacheProxy.java      | 114 ++++-----
 .../cache/affinity/GridCacheAffinityProxy.java  |  30 +--
 .../distributed/dht/GridDhtCacheAdapter.java    |   4 +-
 .../dht/atomic/GridDhtAtomicCache.java          |  18 +-
 .../dht/colocated/GridDhtColocatedCache.java    |   6 +-
 .../distributed/near/GridNearAtomicCache.java   |   6 +-
 .../near/GridNearTransactionalCache.java        |   6 +-
 .../local/atomic/GridLocalAtomicCache.java      |  10 +-
 .../cache/query/CacheQueriesProxy.java          |  26 +-
 .../transactions/IgniteTxLocalAdapter.java      |  16 +-
 19 files changed, 462 insertions(+), 462 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea5f8ef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
index b22befb..0090640 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheLockImpl.java
@@ -38,7 +38,7 @@ class CacheLockImpl<K, V> implements Lock {
     private final IgniteInternalCache<K, V> delegate;
 
     /** Projection. */
-    private final CacheProjectionContext prj;
+    private final CacheOperationContext prj;
 
     /** */
     private final Collection<? extends K> keys;
@@ -55,7 +55,7 @@ class CacheLockImpl<K, V> implements Lock {
      * @param prj Projection.
      * @param keys Keys.
      */
-    CacheLockImpl(GridCacheGateway<K, V> gate, IgniteInternalCache<K, V> delegate, CacheProjectionContext prj,
+    CacheLockImpl(GridCacheGateway<K, V> gate, IgniteInternalCache<K, V> delegate, CacheOperationContext prj,
         Collection<? extends K> keys) {
         this.gate = gate;
         this.delegate = delegate;
@@ -65,7 +65,7 @@ class CacheLockImpl<K, V> implements Lock {
 
     /** {@inheritDoc} */
     @Override public void lock() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.lockAll(keys, 0);
@@ -98,7 +98,7 @@ class CacheLockImpl<K, V> implements Lock {
 
     /** {@inheritDoc} */
     @Override public boolean tryLock() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             boolean res = delegate.lockAll(keys, -1);
@@ -124,7 +124,7 @@ class CacheLockImpl<K, V> implements Lock {
         if (time <= 0)
             return tryLock();
 
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             IgniteInternalFuture<Boolean> fut = delegate.lockAllAsync(keys, unit.toMillis(time));
@@ -167,7 +167,7 @@ class CacheLockImpl<K, V> implements Lock {
 
     /** {@inheritDoc} */
     @Override public void unlock() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             if (lockedThread != Thread.currentThread()) {

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea5f8ef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
new file mode 100644
index 0000000..b9ee1c9
--- /dev/null
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheOperationContext.java
@@ -0,0 +1,162 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.ignite.internal.processors.cache;
+
+import org.apache.ignite.internal.util.tostring.*;
+import org.apache.ignite.internal.util.typedef.internal.*;
+import org.jetbrains.annotations.*;
+
+import javax.cache.expiry.*;
+import java.io.*;
+import java.util.*;
+
+/**
+ * Cache operation context.
+ */
+public class CacheOperationContext implements Serializable {
+    /** */
+    private static final long serialVersionUID = 0L;
+
+    /** Skip store. */
+    @GridToStringInclude
+    private final boolean skipStore;
+
+    /** Client ID which operates over this projection, if any, */
+    private final UUID subjId;
+
+    /** */
+    private final boolean keepPortable;
+
+    /** */
+    private final ExpiryPolicy expiryPlc;
+
+    /**
+     * @param skipStore Skip store flag.
+     * @param subjId Subject ID.
+     * @param keepPortable Keep portable flag.
+     * @param expiryPlc Expiry policy.
+     */
+    public CacheOperationContext(
+        boolean skipStore,
+        @Nullable UUID subjId,
+        boolean keepPortable,
+        @Nullable ExpiryPolicy expiryPlc) {
+        this.skipStore = skipStore;
+
+        this.subjId = subjId;
+
+        this.keepPortable = keepPortable;
+
+        this.expiryPlc = expiryPlc;
+    }
+
+    /**
+     * @return Keep portable flag.
+     */
+    public boolean isKeepPortable() {
+        return keepPortable;
+    }
+
+    /**
+     * @return {@code True} if portables should be deserialized.
+     */
+    public boolean deserializePortables() {
+        return !keepPortable;
+    }
+
+    /**
+     * See {@link IgniteInternalCache#keepPortable()}.
+     *
+     * @return New instance of CacheOperationContext with keep portable flag.
+     */
+    public CacheOperationContext keepPortable() {
+        return new CacheOperationContext(
+            skipStore,
+            subjId,
+            true,
+            expiryPlc);
+    }
+
+    /**
+     * Gets client ID for which this projection was created.
+     *
+     * @return Client ID.
+     */
+    @Nullable public UUID subjectId() {
+        return subjId;
+    }
+
+    /**
+     * See {@link IgniteInternalCache#forSubjectId(UUID)}.
+     *
+     * @return New instance of CacheOperationContext with specific subject id.
+     */
+    public CacheOperationContext forSubjectId(UUID subjId) {
+        return new CacheOperationContext(
+            skipStore,
+            subjId,
+            keepPortable,
+            expiryPlc);
+    }
+
+    /**
+     * @return Skip store.
+     */
+    public boolean skipStore() {
+        return skipStore;
+    }
+
+    /**
+     * See {@link IgniteInternalCache#setSkipStore(boolean)}.
+     *
+     * @return New instance of CacheOperationContext with skip store flag.
+     */
+    public CacheOperationContext setSkipStore(boolean skipStore) {
+        return new CacheOperationContext(
+            skipStore,
+            subjId,
+            keepPortable,
+            expiryPlc);
+    }
+
+    /**
+     * @return {@link ExpiryPolicy} associated with this projection.
+     */
+    @Nullable public ExpiryPolicy expiry() {
+        return expiryPlc;
+    }
+
+    /**
+     * See {@link IgniteInternalCache#withExpiryPolicy(ExpiryPolicy)}.
+     *
+     * @param plc {@link ExpiryPolicy} to associate with this projection.
+     * @return New instance of CacheOperationContext with skip store flag.
+     */
+    public CacheOperationContext withExpiryPolicy(ExpiryPolicy plc) {
+        return new CacheOperationContext(
+            skipStore,
+            subjId,
+            true,
+            plc);
+    }
+
+    /** {@inheritDoc} */
+    @Override public String toString() {
+        return S.toString(CacheOperationContext.class, this);
+    }
+}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea5f8ef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java
deleted file mode 100644
index 7d355a6..0000000
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheProjectionContext.java
+++ /dev/null
@@ -1,162 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements.  See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.ignite.internal.processors.cache;
-
-import org.apache.ignite.internal.util.tostring.*;
-import org.apache.ignite.internal.util.typedef.internal.*;
-import org.jetbrains.annotations.*;
-
-import javax.cache.expiry.*;
-import java.io.*;
-import java.util.*;
-
-/**
- * Cache projection context.
- */
-public class CacheProjectionContext implements Serializable {
-    /** */
-    private static final long serialVersionUID = 0L;
-
-    /** Skip store. */
-    @GridToStringInclude
-    private final boolean skipStore;
-
-    /** Client ID which operates over this projection, if any, */
-    private final UUID subjId;
-
-    /** */
-    private final boolean keepPortable;
-
-    /** */
-    private final ExpiryPolicy expiryPlc;
-
-    /**
-     * @param skipStore Skip store flag.
-     * @param subjId Subject ID.
-     * @param keepPortable Keep portable flag.
-     * @param expiryPlc Expiry policy.
-     */
-    public CacheProjectionContext(
-        boolean skipStore,
-        @Nullable UUID subjId,
-        boolean keepPortable,
-        @Nullable ExpiryPolicy expiryPlc) {
-        this.skipStore = skipStore;
-
-        this.subjId = subjId;
-
-        this.keepPortable = keepPortable;
-
-        this.expiryPlc = expiryPlc;
-    }
-
-    /**
-     * @return Keep portable flag.
-     */
-    public boolean isKeepPortable() {
-        return keepPortable;
-    }
-
-    /**
-     * @return {@code True} if portables should be deserialized.
-     */
-    public boolean deserializePortables() {
-        return !keepPortable;
-    }
-
-    /**
-     * See {@link IgniteInternalCache#keepPortable()}.
-     *
-     * @return New instance of CacheProjectionContext with keep portable flag.
-     */
-    public CacheProjectionContext keepPortable() {
-        return new CacheProjectionContext(
-            skipStore,
-            subjId,
-            true,
-            expiryPlc);
-    }
-
-    /**
-     * Gets client ID for which this projection was created.
-     *
-     * @return Client ID.
-     */
-    @Nullable public UUID subjectId() {
-        return subjId;
-    }
-
-    /**
-     * See {@link IgniteInternalCache#forSubjectId(UUID)}.
-     *
-     * @return New instance of CacheProjectionContext with specific subject id.
-     */
-    public CacheProjectionContext forSubjectId(UUID subjId) {
-        return new CacheProjectionContext(
-            skipStore,
-            subjId,
-            keepPortable,
-            expiryPlc);
-    }
-
-    /**
-     * @return Skip store.
-     */
-    public boolean skipStore() {
-        return skipStore;
-    }
-
-    /**
-     * See {@link IgniteInternalCache#setSkipStore(boolean)}.
-     *
-     * @return New instance of CacheProjectionContext with skip store flag.
-     */
-    public CacheProjectionContext setSkipStore(boolean skipStore) {
-        return new CacheProjectionContext(
-            skipStore,
-            subjId,
-            keepPortable,
-            expiryPlc);
-    }
-
-    /**
-     * @return {@link ExpiryPolicy} associated with this projection.
-     */
-    @Nullable public ExpiryPolicy expiry() {
-        return expiryPlc;
-    }
-
-    /**
-     * See {@link IgniteInternalCache#withExpiryPolicy(ExpiryPolicy)}.
-     *
-     * @param plc {@link ExpiryPolicy} to associate with this projection.
-     * @return New instance of CacheProjectionContext with skip store flag.
-     */
-    public CacheProjectionContext withExpiryPolicy(ExpiryPolicy plc) {
-        return new CacheProjectionContext(
-            skipStore,
-            subjId,
-            true,
-            plc);
-    }
-
-    /** {@inheritDoc} */
-    @Override public String toString() {
-        return S.toString(CacheProjectionContext.class, this);
-    }
-}

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea5f8ef/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 3a12e4d..3266cff 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
@@ -377,7 +377,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
     /** {@inheritDoc} */
     @Override public GridCacheProxyImpl<K, V> forSubjectId(UUID subjId) {
-        CacheProjectionContext prj = new CacheProjectionContext(false, subjId, false, null);
+        CacheOperationContext prj = new CacheOperationContext(false, subjId, false, null);
 
         return new GridCacheProxyImpl<>(ctx, this, prj);
     }
@@ -389,14 +389,14 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
     /** {@inheritDoc} */
     @Override public GridCacheProxyImpl<K, V> setSkipStore(boolean skipStore) {
-        CacheProjectionContext prj = new CacheProjectionContext(true, null, false, null);
+        CacheOperationContext prj = new CacheOperationContext(true, null, false, null);
 
         return new GridCacheProxyImpl<>(ctx, this, prj);
     }
 
     /** {@inheritDoc} */
     @Override public <K1, V1> GridCacheProxyImpl<K1, V1> keepPortable() {
-        CacheProjectionContext prj = new CacheProjectionContext(false, null, true, null);
+        CacheOperationContext prj = new CacheOperationContext(false, null, true, null);
 
         return new GridCacheProxyImpl<>((GridCacheContext<K1, V1>)ctx, (GridCacheAdapter<K1, V1>)this, prj);
     }
@@ -409,7 +409,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
     /** {@inheritDoc} */
     @Override public GridCacheProxyImpl<K, V> withExpiryPolicy(ExpiryPolicy plc) {
-        CacheProjectionContext prj = new CacheProjectionContext(false, null, false, plc);
+        CacheOperationContext prj = new CacheOperationContext(false, null, false, plc);
 
         return new GridCacheProxyImpl<>(ctx, this, prj);
     }
@@ -1565,9 +1565,9 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
         boolean deserializePortable,
         boolean skipVals
     ) {
-        CacheProjectionContext prj = ctx.projectionPerCall();
+        CacheOperationContext opCtx = ctx.operationContextPerCall();
 
-        subjId = ctx.subjectIdPerCall(subjId, prj);
+        subjId = ctx.subjectIdPerCall(subjId, opCtx);
 
         return getAllAsync(keys,
             true,
@@ -1577,7 +1577,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             taskName,
             deserializePortable,
             forcePrimary,
-            skipVals ? null : expiryPolicy(prj != null ? prj.expiry() : null),
+            skipVals ? null : expiryPolicy(opCtx != null ? opCtx.expiry() : null),
             skipVals);
     }
 
@@ -3255,9 +3255,9 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
         final boolean replicate = ctx.isDrEnabled();
         final AffinityTopologyVersion topVer = ctx.affinity().affinityTopologyVersion();
 
-        CacheProjectionContext prj = ctx.projectionPerCall();
+        CacheOperationContext opCtx = ctx.operationContextPerCall();
 
-        ExpiryPolicy plc0 = prj != null ? prj.expiry() : null;
+        ExpiryPolicy plc0 = opCtx != null ? opCtx.expiry() : null;
 
         final ExpiryPolicy plc = plc0 != null ? plc0 : ctx.expiry();
 
@@ -3378,9 +3378,9 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
         if (!ctx.store().configured())
             return new GridFinishedFuture<>();
 
-        CacheProjectionContext prj = ctx.projectionPerCall();
+        CacheOperationContext opCtx = ctx.operationContextPerCall();
 
-        ExpiryPolicy plc = prj != null ? prj.expiry() : null;
+        ExpiryPolicy plc = opCtx != null ? opCtx.expiry() : null;
 
         if (replaceExisting) {
             if (ctx.store().isLocal()) {
@@ -3518,9 +3518,9 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
 
         ctx.kernalContext().task().setThreadContext(TC_NO_FAILOVER, true);
 
-        CacheProjectionContext prj = ctx.projectionPerCall();
+        CacheOperationContext opCtx = ctx.operationContextPerCall();
 
-        ExpiryPolicy plc = prj != null ? prj.expiry() : null;
+        ExpiryPolicy plc = opCtx != null ? opCtx.expiry() : null;
 
         return ctx.kernalContext().closure().callAsync(BROADCAST,
             Arrays.asList(new LoadCacheClosure<>(ctx.name(), p, args, plc)),
@@ -3680,7 +3680,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
         if (!ctx0.isSwapOrOffheapEnabled() && ctx0.kernalContext().discovery().size() == 1)
             return localIteratorHonorExpirePolicy();
 
-        final CacheProjectionContext prj = ctx.projectionPerCall();
+        final CacheOperationContext opCtx = ctx.operationContextPerCall();
 
         CacheQueryFuture<Map.Entry<K, V>> fut = queries().createScanQuery(null)
             .keepAll(false)
@@ -3692,7 +3692,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V
             }
 
             @Override protected void remove(Cache.Entry<K, V> item) {
-                CacheProjectionContext prev = ctx.gate().enter(prj);
+                CacheOperationContext prev = ctx.gate().enter(opCtx);
 
                 try {
                     GridCacheAdapter.this.remove(item.getKey());

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea5f8ef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
index 0827730..6b3d7ad 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheConcurrentMap.java
@@ -1791,7 +1791,7 @@ public class GridCacheConcurrentMap {
         private GridCacheContext<K, V> ctx;
 
         /** */
-        private CacheProjectionContext prjPerCall;
+        private CacheOperationContext opCtxPerCall;
 
         /**
          * Empty constructor required for {@link Externalizable}.
@@ -1812,7 +1812,7 @@ public class GridCacheConcurrentMap {
 
             ctx = map.ctx;
 
-            prjPerCall = ctx.projectionPerCall();
+            opCtxPerCall = ctx.operationContextPerCall();
         }
 
         /** {@inheritDoc} */
@@ -1824,7 +1824,7 @@ public class GridCacheConcurrentMap {
          * @return Entry iterator.
          */
         Iterator<Cache.Entry<K, V>> entryIterator() {
-            return new EntryIterator<>(map, filter, ctx, prjPerCall);
+            return new EntryIterator<>(map, filter, ctx, opCtxPerCall);
         }
 
         /**
@@ -1963,7 +1963,7 @@ public class GridCacheConcurrentMap {
         private GridCacheContext<K, V> ctx;
 
         /** */
-        private CacheProjectionContext prjPerCall;
+        private CacheOperationContext prjPerCall;
 
         /**
          * Empty constructor required for {@link Externalizable}.
@@ -1982,7 +1982,7 @@ public class GridCacheConcurrentMap {
             GridCacheConcurrentMap map,
             CacheEntryPredicate[] filter,
             GridCacheContext<K, V> ctx,
-            CacheProjectionContext prjPerCall) {
+            CacheOperationContext prjPerCall) {
             it = new Iterator0<>(map, false, filter, -1, -1);
 
             this.ctx = ctx;
@@ -1996,15 +1996,15 @@ public class GridCacheConcurrentMap {
 
         /** {@inheritDoc} */
         @Override public Cache.Entry<K, V> next() {
-            CacheProjectionContext oldPrj = ctx.projectionPerCall();
+            CacheOperationContext old = ctx.operationContextPerCall();
 
-            ctx.projectionPerCall(prjPerCall);
+            ctx.operationContextPerCall(prjPerCall);
 
             try {
                 return it.next().wrapLazyValue();
             }
             finally {
-                ctx.projectionPerCall(oldPrj);
+                ctx.operationContextPerCall(old);
             }
         }
 
@@ -2025,7 +2025,7 @@ public class GridCacheConcurrentMap {
         @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
             it = (Iterator0<K, V>)in.readObject();
             ctx = (GridCacheContext<K, V>)in.readObject();
-            prjPerCall = (CacheProjectionContext)in.readObject();
+            prjPerCall = (CacheOperationContext)in.readObject();
         }
     }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea5f8ef/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 0d059a9..382d599 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
@@ -158,7 +158,7 @@ public class GridCacheContext<K, V> implements Externalizable {
      * Thread local projection. If it's set it means that method call was initiated
      * by child projection of initial cache.
      */
-    private ThreadLocal<CacheProjectionContext> prjPerCall = new ThreadLocal<>();
+    private ThreadLocal<CacheOperationContext> prjPerCall = new ThreadLocal<>();
 
     /** Cache name. */
     private String cacheName;
@@ -1201,23 +1201,23 @@ public class GridCacheContext<K, V> implements Externalizable {
     }
 
     /**
-     * Sets thread local projection.
+     * Sets thread local cache operation context.
      *
-     * @param prj Flags to set.
+     * @param opCtx Flags to set.
      */
-    public void projectionPerCall(@Nullable CacheProjectionContext prj) {
+    public void operationContextPerCall(@Nullable CacheOperationContext opCtx) {
         if (nearContext())
-            dht().near().context().prjPerCall.set(prj);
+            dht().near().context().prjPerCall.set(opCtx);
         else
-            prjPerCall.set(prj);
+            prjPerCall.set(opCtx);
     }
 
     /**
      * Gets thread local projection.
      *
-     * @return Projection per call.
+     * @return Operation context per call.
      */
-    public CacheProjectionContext projectionPerCall() {
+    public CacheOperationContext operationContextPerCall() {
         return nearContext() ? dht().near().context().prjPerCall.get() : prjPerCall.get();
     }
 
@@ -1231,19 +1231,19 @@ public class GridCacheContext<K, V> implements Externalizable {
         if (subjId != null)
             return subjId;
 
-        return subjectIdPerCall(subjId, projectionPerCall());
+        return subjectIdPerCall(subjId, operationContextPerCall());
     }
 
     /**
      * Gets subject ID per call.
      *
      * @param subjId Optional already existing subject ID.
-     * @param prj Optional thread local projection.
+     * @param opCtx Optional thread local operation context.
      * @return Subject ID per call.
      */
-    public UUID subjectIdPerCall(@Nullable UUID subjId, @Nullable CacheProjectionContext prj) {
-        if (prj != null)
-            subjId = prj.subjectId();
+    public UUID subjectIdPerCall(@Nullable UUID subjId, @Nullable CacheOperationContext opCtx) {
+        if (opCtx != null)
+            subjId = opCtx.subjectId();
 
         if (subjId == null)
             subjId = ctx.localNodeId();
@@ -1258,7 +1258,7 @@ public class GridCacheContext<K, V> implements Externalizable {
         if (nearContext())
             return dht().near().context().skipStore();
 
-        CacheProjectionContext prj = prjPerCall.get();
+        CacheOperationContext prj = prjPerCall.get();
 
         return (prj != null && prj.skipStore());
     }
@@ -1286,22 +1286,22 @@ public class GridCacheContext<K, V> implements Externalizable {
         assert r != null;
 
         // Have to get projection per call used by calling thread to use it in a new thread.
-        final CacheProjectionContext prj = projectionPerCall();
+        final CacheOperationContext opCtx = operationContextPerCall();
 
-        if (prj == null)
+        if (opCtx == null)
             return r;
 
         return new GPR() {
             @Override public void run() {
-                CacheProjectionContext oldPrj = projectionPerCall();
+                CacheOperationContext old = operationContextPerCall();
 
-                projectionPerCall(prj);
+                operationContextPerCall(opCtx);
 
                 try {
                     r.run();
                 }
                 finally {
-                    projectionPerCall(oldPrj);
+                    operationContextPerCall(old);
                 }
             }
         };
@@ -1321,22 +1321,22 @@ public class GridCacheContext<K, V> implements Externalizable {
         assert r != null;
 
         // Have to get projection per call used by calling thread to use it in a new thread.
-        final CacheProjectionContext prj = projectionPerCall();
+        final CacheOperationContext opCtx = operationContextPerCall();
 
-        if (prj == null)
+        if (opCtx == null)
             return r;
 
         return new GPC<T>() {
             @Override public T call() throws Exception {
-                CacheProjectionContext oldPrj = projectionPerCall();
+                CacheOperationContext old = operationContextPerCall();
 
-                projectionPerCall(prj);
+                operationContextPerCall(opCtx);
 
                 try {
                     return r.call();
                 }
                 finally {
-                    projectionPerCall(oldPrj);
+                    operationContextPerCall(old);
                 }
             }
         };
@@ -1642,9 +1642,9 @@ public class GridCacheContext<K, V> implements Externalizable {
      * @return Keep portable flag.
      */
     public boolean keepPortable() {
-        CacheProjectionContext prj = projectionPerCall();
+        CacheOperationContext opCtx = operationContextPerCall();
 
-        return prj != null && prj.isKeepPortable();
+        return opCtx != null && opCtx.isKeepPortable();
     }
 
     /**

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea5f8ef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
index b43d92d..a1c9dcd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheGateway.java
@@ -106,7 +106,7 @@ public class GridCacheGateway<K, V> {
      * @param prj Projection to guard.
      * @return Previous projection set on this thread.
      */
-    @Nullable public CacheProjectionContext enter(@Nullable CacheProjectionContext prj) {
+    @Nullable public CacheOperationContext enter(@Nullable CacheOperationContext prj) {
         try {
             ctx.itHolder().checkWeakQueue();
 
@@ -140,10 +140,10 @@ public class GridCacheGateway<K, V> {
         // deadlocks during kernal stop.
         try {
             // Set thread local projection per call.
-            CacheProjectionContext prev = ctx.projectionPerCall();
+            CacheOperationContext prev = ctx.operationContextPerCall();
 
             if (prev != null || prj != null)
-                ctx.projectionPerCall(prj);
+                ctx.operationContextPerCall(prj);
 
             return prev;
         }
@@ -157,7 +157,7 @@ public class GridCacheGateway<K, V> {
     /**
      * @param prev Previous.
      */
-    public void leave(CacheProjectionContext prev) {
+    public void leave(CacheOperationContext prev) {
         try {
             ctx.tm().resetContext();
             ctx.mvcc().contextReset();
@@ -166,7 +166,7 @@ public class GridCacheGateway<K, V> {
             CU.unwindEvicts(ctx);
 
             // Return back previous thread local projection per call.
-            ctx.projectionPerCall(prev);
+            ctx.operationContextPerCall(prev);
         }
         finally {
             rwLock.readUnlock();

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea5f8ef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 9b064ae..7f33e85 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -736,7 +736,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                 startCache(cache);
 
                 jCacheProxies.put(maskNull(name), new IgniteCacheProxy(ctx, cache,
-                    new CacheProjectionContext(false, null, false, null), false));
+                    new CacheOperationContext(false, null, false, null), false));
             }
         }
 
@@ -1519,7 +1519,7 @@ public class GridCacheProcessor extends GridProcessorAdapter {
                 String masked = maskNull(cacheCtx.name());
 
                 jCacheProxies.put(masked, new IgniteCacheProxy(cache.context(), cache,
-                    new CacheProjectionContext(false, null, false, null), false));
+                    new CacheOperationContext(false, null, false, null), false));
             }
         }
 

http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0ea5f8ef/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
index ab237bf..2edd656 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java
@@ -63,7 +63,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** Projection. */
     @GridToStringExclude
-    private CacheProjectionContext prj;
+    private CacheOperationContext prj;
 
     /** Cache queries. */
     private CacheQueries<K, V> qry;
@@ -84,7 +84,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
      * @param prj Optional projection which will be passed to gateway.
      */
     public GridCacheProxyImpl(GridCacheContext<K, V> ctx, IgniteInternalCache<K, V> delegate,
-        @Nullable CacheProjectionContext prj) {
+        @Nullable CacheOperationContext prj) {
         assert ctx != null;
         assert delegate != null;
 
@@ -116,7 +116,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     /**
      * @return Gateway projection.
      */
-    public CacheProjectionContext gateProjection() {
+    public CacheOperationContext gateProjection() {
         return prj;
     }
 
@@ -132,7 +132,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean skipStore() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return prj.skipStore();
@@ -164,7 +164,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public CacheMetrics metrics() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return cache.metrics();
@@ -176,7 +176,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public CacheMetricsMXBean mxBean() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return cache.mxBean();
@@ -188,7 +188,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public long overflowSize() throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return cache.overflowSize();
@@ -200,7 +200,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public void localLoadCache(IgniteBiPredicate<K, V> p, @Nullable Object[] args) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             cache.localLoadCache(p, args);
@@ -212,7 +212,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<?> localLoadCacheAsync(IgniteBiPredicate<K, V> p, @Nullable Object[] args) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return cache.localLoadCacheAsync(p, args);
@@ -229,7 +229,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public GridCacheProxyImpl<K, V> setSkipStore(boolean skipStore) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return new GridCacheProxyImpl<>(ctx, delegate, prj.setSkipStore(skipStore));
@@ -254,7 +254,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean containsKey(K key) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.containsKey(key);
@@ -266,7 +266,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean containsKeys(Collection<? extends K> keys) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.containsKeys(keys);
@@ -278,7 +278,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Boolean> containsKeyAsync(K key) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.containsKeyAsync(key);
@@ -290,7 +290,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Boolean> containsKeysAsync(Collection<? extends K> keys) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.containsKeysAsync(keys);
@@ -302,7 +302,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Nullable @Override public V get(K key) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.get(key);
@@ -314,7 +314,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Nullable @Override public V get(K key, boolean deserializePortable) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.get(key, deserializePortable && prj.deserializePortables());
@@ -326,7 +326,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<V> getAsync(K key) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAsync(key);
@@ -338,7 +338,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<V> getAsync(K key, boolean deserializePortable) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAsync(key, deserializePortable && prj.deserializePortables());
@@ -350,7 +350,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public V getForcePrimary(K key) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getForcePrimary(key);
@@ -362,7 +362,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<V> getForcePrimaryAsync(K key) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getForcePrimaryAsync(key);
@@ -374,7 +374,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Nullable @Override public Map<K, V> getAllOutTx(List<K> keys) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAllOutTx(keys);
@@ -386,7 +386,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean isIgfsDataCache() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.isIgfsDataCache();
@@ -398,7 +398,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public long igfsDataSpaceUsed() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.igfsDataSpaceUsed();
@@ -410,7 +410,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public long igfsDataSpaceMax() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.igfsDataSpaceMax();
@@ -422,7 +422,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean isMongoDataCache() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.isMongoDataCache();
@@ -434,7 +434,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean isMongoMetaCache() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.isMongoMetaCache();
@@ -446,7 +446,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public Map<K, V> getAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAll(keys);
@@ -459,7 +459,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     /** {@inheritDoc} */
     @Override public Map<K, V> getAll(Collection<? extends K> keys, boolean deserializePortable)
         throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAll(keys, deserializePortable && prj.deserializePortables());
@@ -471,7 +471,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAllAsync(keys);
@@ -484,7 +484,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Map<K, V>> getAllAsync(@Nullable Collection<? extends K> keys,
         boolean deserializePortable) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAllAsync(keys, deserializePortable && prj.deserializePortables());
@@ -497,7 +497,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     /** {@inheritDoc} */
     @Nullable @Override public V getAndPut(K key, V val)
         throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAndPut(key, val);
@@ -509,7 +509,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<V> getAndPutAsync(K key, V val) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAndPutAsync(key, val);
@@ -522,7 +522,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     /** {@inheritDoc} */
     @Override public boolean put(K key, V val)
         throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.put(key, val);
@@ -534,7 +534,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public void putAllConflict(Map<KeyCacheObject, GridCacheDrInfo> drMap) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.putAllConflict(drMap);
@@ -547,7 +547,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<?> putAllConflictAsync(Map<KeyCacheObject, GridCacheDrInfo> drMap)
         throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.putAllConflictAsync(drMap);
@@ -561,7 +561,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     @Override public <T> EntryProcessorResult<T> invoke(K key,
         EntryProcessor<K, V, T> entryProcessor,
         Object... args) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.invoke(key, entryProcessor, args);
@@ -575,7 +575,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     @Override public <T> IgniteInternalFuture<EntryProcessorResult<T>> invokeAsync(K key,
         EntryProcessor<K, V, T> entryProcessor,
         Object... args) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.invokeAsync(key, entryProcessor, args);
@@ -589,7 +589,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     @Override public <T> Map<K, EntryProcessorResult<T>> invokeAll(Set<? extends K> keys,
         EntryProcessor<K, V, T> entryProcessor,
         Object... args) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.invokeAll(keys, entryProcessor, args);
@@ -604,7 +604,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
         Set<? extends K> keys,
         EntryProcessor<K, V, T> entryProcessor,
         Object... args) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.invokeAllAsync(keys, entryProcessor, args);
@@ -618,7 +618,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     @Override public <T> Map<K, EntryProcessorResult<T>> invokeAll(
         Map<? extends K, ? extends EntryProcessor<K, V, T>> map,
         Object... args) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.invokeAll(map, args);
@@ -632,7 +632,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     @Override public <T> IgniteInternalFuture<Map<K, EntryProcessorResult<T>>> invokeAllAsync(
         Map<? extends K, ? extends EntryProcessor<K, V, T>> map,
         Object... args) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.invokeAllAsync(map, args);
@@ -644,7 +644,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Boolean> putAsync(K key, V val) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.putAsync(key, val);
@@ -656,7 +656,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Nullable @Override public V getAndPutIfAbsent(K key, V val) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAndPutIfAbsent(key, val);
@@ -668,7 +668,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<V> getAndPutIfAbsentAsync(K key, V val) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAndPutIfAbsentAsync(key, val);
@@ -680,7 +680,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean putIfAbsent(K key, V val) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.putIfAbsent(key, val);
@@ -692,7 +692,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Boolean> putIfAbsentAsync(K key, V val) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.putIfAbsentAsync(key, val);
@@ -704,7 +704,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Nullable @Override public V getAndReplace(K key, V val) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAndReplace(key, val);
@@ -716,7 +716,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<V> getAndReplaceAsync(K key, V val) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAndReplaceAsync(key, val);
@@ -728,7 +728,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean replace(K key, V val) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.replace(key, val);
@@ -740,7 +740,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Boolean> replaceAsync(K key, V val) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.replaceAsync(key, val);
@@ -752,7 +752,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean replace(K key, V oldVal, V newVal) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.replace(key, oldVal, newVal);
@@ -764,7 +764,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Boolean> replaceAsync(K key, V oldVal, V newVal) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.replaceAsync(key, oldVal, newVal);
@@ -776,7 +776,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public void putAll(@Nullable Map<? extends K, ? extends V> m) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.putAll(m);
@@ -788,7 +788,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<?> putAllAsync(@Nullable Map<? extends K, ? extends V> m) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.putAllAsync(m);
@@ -800,7 +800,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public Set<K> keySet() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.keySet();
@@ -812,7 +812,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public Set<K> primaryKeySet() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.primaryKeySet();
@@ -824,7 +824,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public Collection<V> values() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.values();
@@ -836,7 +836,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public Set<Cache.Entry<K, V>> entrySet() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.entrySet();
@@ -848,7 +848,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public Set<Cache.Entry<K, V>> entrySet(int part) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.entrySet(part);
@@ -860,7 +860,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public Set<Cache.Entry<K, V>> entrySetx(CacheEntryPredicate... filter) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.entrySetx(filter);
@@ -872,7 +872,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalTx txStartEx(TransactionConcurrency concurrency, TransactionIsolation isolation) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.txStartEx(concurrency, isolation);
@@ -884,7 +884,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public Transaction txStart(TransactionConcurrency concurrency, TransactionIsolation isolation) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.txStart(concurrency, isolation);
@@ -898,7 +898,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     /** {@inheritDoc} */
     @Override public Transaction txStart(TransactionConcurrency concurrency, TransactionIsolation isolation,
         long timeout, int txSize) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.txStart(concurrency, isolation, timeout, txSize);
@@ -910,7 +910,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public Transaction tx() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.tx();
@@ -926,7 +926,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
         @Nullable IgniteCacheExpiryPolicy plc)
         throws IgniteCheckedException
     {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.localPeek(key, peekModes, plc);
@@ -938,7 +938,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public Iterable<Cache.Entry<K, V>> localEntries(CachePeekMode[] peekModes) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.localEntries(peekModes);
@@ -950,7 +950,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean evict(K key) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.evict(key);
@@ -962,7 +962,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public void evictAll(@Nullable Collection<? extends K> keys) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.evictAll(keys);
@@ -974,7 +974,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public void clearLocally() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.clearLocally();
@@ -986,7 +986,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public void clear() throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.clear();
@@ -998,7 +998,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<?> clearAsync() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.clearAsync();
@@ -1010,7 +1010,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<?> clearAsync(K key) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.clearAsync(key);
@@ -1022,7 +1022,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<?> clearAsync(Set<? extends K> keys) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.clearAsync(keys);
@@ -1034,7 +1034,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean clearLocally(K key) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.clearLocally(key);
@@ -1046,7 +1046,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public void clearLocallyAll(Set<? extends K> keys) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.clearLocallyAll(keys);
@@ -1058,7 +1058,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public void clear(K key) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.clear(key);
@@ -1070,7 +1070,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public void clearAll(Set<? extends K> keys) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.clearAll(keys);
@@ -1083,7 +1083,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     /** {@inheritDoc} */
     @Nullable @Override public V getAndRemove(K key)
         throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAndRemove(key);
@@ -1095,7 +1095,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<V> getAndRemoveAsync(K key) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.getAndRemoveAsync(key);
@@ -1108,7 +1108,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     /** {@inheritDoc} */
     @Override public boolean remove(K key)
         throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.remove(key);
@@ -1121,7 +1121,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     /** {@inheritDoc} */
     @Override public void removeAllConflict(Map<KeyCacheObject, GridCacheVersion> drMap)
         throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.removeAllConflict(drMap);
@@ -1135,7 +1135,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     @Override public IgniteInternalFuture<?> removeAllConflictAsync(Map<KeyCacheObject, GridCacheVersion> drMap)
         throws IgniteCheckedException
     {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.removeAllConflictAsync(drMap);
@@ -1147,7 +1147,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Boolean> removeAsync(K key) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.removeAsync(key);
@@ -1159,7 +1159,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<GridCacheReturn> replacexAsync(K key, V oldVal, V newVal) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.replacexAsync(key, oldVal, newVal);
@@ -1171,7 +1171,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public GridCacheReturn replacex(K key, V oldVal, V newVal) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.replacex(key, oldVal, newVal);
@@ -1183,7 +1183,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public GridCacheReturn removex(K key, V val) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.removex(key, val);
@@ -1195,7 +1195,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<GridCacheReturn> removexAsync(K key, V val) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.removexAsync(key, val);
@@ -1207,7 +1207,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean remove(K key, V val) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.remove(key, val);
@@ -1219,7 +1219,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Boolean> removeAsync(K key, V val) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.removeAsync(key, val);
@@ -1231,7 +1231,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public void removeAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.removeAll(keys);
@@ -1243,7 +1243,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<?> removeAllAsync(@Nullable Collection<? extends K> keys) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.removeAllAsync(keys);
@@ -1256,7 +1256,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     /** {@inheritDoc} */
     @Override public void removeAll()
         throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.removeAll();
@@ -1268,7 +1268,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<?> removeAllAsync() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.removeAllAsync();
@@ -1281,7 +1281,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     /** {@inheritDoc} */
     @Override public boolean lock(K key, long timeout)
         throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.lock(key, timeout);
@@ -1293,7 +1293,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Boolean> lockAsync(K key, long timeout) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.lockAsync(key, timeout);
@@ -1305,7 +1305,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean lockAll(@Nullable Collection<? extends K> keys, long timeout) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.lockAll(keys, timeout);
@@ -1317,7 +1317,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Boolean> lockAllAsync(@Nullable Collection<? extends K> keys, long timeout) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.lockAllAsync(keys, timeout);
@@ -1329,7 +1329,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public void unlock(K key) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.unlock(key);
@@ -1341,7 +1341,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public void unlockAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.unlockAll(keys);
@@ -1353,7 +1353,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean isLocked(K key) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.isLocked(key);
@@ -1365,7 +1365,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public boolean isLockedByThread(K key) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.isLockedByThread(key);
@@ -1377,7 +1377,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public int size() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.size();
@@ -1389,7 +1389,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public int size(CachePeekMode[] peekModes) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.size(peekModes);
@@ -1401,7 +1401,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<Integer> sizeAsync(CachePeekMode[] peekModes) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.sizeAsync(peekModes);
@@ -1413,7 +1413,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public int localSize(CachePeekMode[] peekModes) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.localSize(peekModes);
@@ -1425,7 +1425,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public int nearSize() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.nearSize();
@@ -1437,7 +1437,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public int primarySize() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.primarySize();
@@ -1449,7 +1449,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public void promoteAll(@Nullable Collection<? extends K> keys) throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             delegate.promoteAll(keys);
@@ -1461,7 +1461,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public Iterator<Map.Entry<K, V>> swapIterator() throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return cache.swapIterator();
@@ -1473,7 +1473,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public Iterator<Map.Entry<K, V>> offHeapIterator() throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return cache.offHeapIterator();
@@ -1485,7 +1485,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public long offHeapEntriesCount() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return cache.offHeapEntriesCount();
@@ -1497,7 +1497,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public long offHeapAllocatedSize() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return cache.offHeapAllocatedSize();
@@ -1509,7 +1509,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public long swapSize() throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return cache.swapSize();
@@ -1521,7 +1521,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public long swapKeys() throws IgniteCheckedException {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return cache.swapKeys();
@@ -1533,7 +1533,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public Iterator<Cache.Entry<K, V>> iterator() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return delegate.iterator();
@@ -1545,7 +1545,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public IgniteInternalFuture<?> forceRepartition() {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
             return cache.forceRepartition();
@@ -1567,7 +1567,7 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
     @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
         ctx = (GridCacheContext<K, V>)in.readObject();
         delegate = (GridCacheAdapter<K, V>)in.readObject();
-        prj = (CacheProjectionContext)in.readObject();
+        prj = (CacheOperationContext)in.readObject();
 
         gate = ctx.gate();
         cache = ctx.cache();
@@ -1586,10 +1586,10 @@ public class GridCacheProxyImpl<K, V> implements IgniteInternalCache<K, V>, Exte
 
     /** {@inheritDoc} */
     @Override public GridCacheProxyImpl<K, V> withExpiryPolicy(ExpiryPolicy plc) {
-        CacheProjectionContext prev = gate.enter(prj);
+        CacheOperationContext prev = gate.enter(prj);
 
         try {
-            CacheProjectionContext prj0 = prj.withExpiryPolicy(plc);
+            CacheOperationContext prj0 = prj.withExpiryPolicy(plc);
 
             return new GridCacheProxyImpl<>(ctx, delegate, prj0);
         }


Mime
View raw message