This is an automated email from the ASF dual-hosted git repository.
av pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/master by this push:
new 5892c2ce4b9 IGNITE-26571 Unused GridCacheContext#depEnabled (#12839)
5892c2ce4b9 is described below
commit 5892c2ce4b9c7942177e8ab34bcb54f9b38139e3
Author: Anton Vinogradov <[email protected]>
AuthorDate: Tue Mar 3 16:47:47 2026 +0300
IGNITE-26571 Unused GridCacheContext#depEnabled (#12839)
---
.../ignite/internal/GridEventConsumeHandler.java | 13 --
.../deployment/GridDeploymentPerLoaderStore.java | 2 -
.../deployment/GridDeploymentPerVersionStore.java | 2 -
.../processors/cache/CacheGroupContext.java | 22 ---
.../processors/cache/CacheObjectContext.java | 8 +-
.../processors/cache/GridCacheAdapter.java | 9 -
.../processors/cache/GridCacheContext.java | 12 --
.../cache/GridCacheDeploymentManager.java | 185 ---------------------
.../processors/cache/GridCacheGateway.java | 6 -
.../processors/cache/GridCacheIoManager.java | 20 +--
.../processors/cache/GridCacheProcessor.java | 15 --
.../processors/cache/GridCacheSharedContext.java | 3 -
.../internal/processors/cache/GridCacheUtils.java | 2 +-
.../cache/IgniteCacheOffheapManager.java | 6 -
.../cache/IgniteCacheOffheapManagerImpl.java | 6 -
.../binary/CacheObjectBinaryProcessorImpl.java | 3 +-
.../distributed/GridCacheTxRecoveryFuture.java | 9 +-
.../distributed/GridCacheTxRecoveryRequest.java | 6 +-
.../distributed/GridDistributedLockRequest.java | 6 +-
.../distributed/GridDistributedLockResponse.java | 18 +-
.../GridDistributedTxFinishRequest.java | 6 +-
.../GridDistributedTxPrepareRequest.java | 6 +-
.../GridDistributedTxRemoteAdapter.java | 10 --
.../cache/distributed/GridNearUnlockRequest.java | 5 +-
.../cache/distributed/dht/GridDhtCacheAdapter.java | 3 +-
.../cache/distributed/dht/GridDhtLockFuture.java | 1 -
.../cache/distributed/dht/GridDhtLockRequest.java | 5 +-
.../cache/distributed/dht/GridDhtLockResponse.java | 11 +-
.../dht/GridDhtTransactionalCacheAdapter.java | 19 +--
.../distributed/dht/GridDhtTxFinishFuture.java | 3 -
.../distributed/dht/GridDhtTxFinishRequest.java | 5 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 4 +-
.../distributed/dht/GridDhtTxPrepareRequest.java | 5 +-
.../distributed/dht/GridDhtUnlockRequest.java | 5 +-
.../distributed/dht/GridPartitionedGetFuture.java | 1 -
.../dht/GridPartitionedSingleGetFuture.java | 1 -
.../atomic/GridDhtAtomicAbstractUpdateRequest.java | 2 -
.../distributed/dht/atomic/GridDhtAtomicCache.java | 10 +-
.../atomic/GridDhtAtomicSingleUpdateFuture.java | 2 -
.../atomic/GridDhtAtomicSingleUpdateRequest.java | 3 -
.../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 -
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 3 -
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 4 +-
.../atomic/GridNearAtomicAbstractUpdateFuture.java | 9 +-
.../GridNearAtomicAbstractUpdateRequest.java | 5 +-
.../atomic/GridNearAtomicFullUpdateRequest.java | 5 +-
.../GridNearAtomicSingleUpdateFilterRequest.java | 7 +-
.../atomic/GridNearAtomicSingleUpdateFuture.java | 10 +-
.../GridNearAtomicSingleUpdateInvokeRequest.java | 7 +-
.../atomic/GridNearAtomicSingleUpdateRequest.java | 7 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 2 -
.../dht/atomic/GridNearAtomicUpdateResponse.java | 5 +-
.../dht/colocated/GridDhtColocatedCache.java | 6 +-
.../dht/colocated/GridDhtColocatedLockFuture.java | 1 -
.../dht/preloader/GridDhtForceKeysFuture.java | 3 +-
.../dht/preloader/GridDhtForceKeysRequest.java | 5 +-
.../dht/preloader/GridDhtForceKeysResponse.java | 4 +-
.../dht/preloader/GridDhtPartitionSupplier.java | 6 +-
.../preloader/GridDhtPartitionsExchangeFuture.java | 30 +---
.../cache/distributed/near/GridNearGetFuture.java | 1 -
.../cache/distributed/near/GridNearGetRequest.java | 3 -
.../cache/distributed/near/GridNearLockFuture.java | 1 -
.../distributed/near/GridNearLockRequest.java | 5 +-
.../distributed/near/GridNearLockResponse.java | 4 +-
...dNearOptimisticSerializableTxPrepareFuture.java | 1 -
.../near/GridNearOptimisticTxPrepareFuture.java | 1 -
.../near/GridNearPessimisticTxPrepareFuture.java | 1 -
.../distributed/near/GridNearSingleGetRequest.java | 3 -
.../near/GridNearTransactionalCache.java | 6 +-
.../distributed/near/GridNearTxFinishFuture.java | 4 +-
.../distributed/near/GridNearTxFinishRequest.java | 7 +-
.../distributed/near/GridNearTxPrepareRequest.java | 5 +-
.../snapshot/IgniteSnapshotManager.java | 2 +-
.../snapshot/dump/DumpEntrySerializer.java | 2 +-
.../wal/reader/StandaloneWalRecordsIterator.java | 2 +-
.../processors/cache/query/CacheQuery.java | 13 --
.../query/GridCacheDistributedQueryManager.java | 12 +-
.../cache/query/GridCacheQueryRequest.java | 12 +-
.../cache/query/GridCacheQueryResponse.java | 4 +-
.../cache/transactions/IgniteInternalTx.java | 11 --
.../IgniteTxImplicitSingleStateImpl.java | 2 -
.../cache/transactions/IgniteTxLocalAdapter.java | 13 --
.../cache/transactions/IgniteTxStateImpl.java | 3 -
.../apache/ignite/internal/util/IgniteUtils.java | 16 --
.../internal/binary/BinaryMarshallerSelfTest.java | 2 +-
.../GridCacheConditionalDeploymentSelfTest.java | 10 --
.../GridCacheReplicatedPreloadSelfTest.java | 73 --------
87 files changed, 95 insertions(+), 705 deletions(-)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
index 0ae0563dcc4..4b1ad612add 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/GridEventConsumeHandler.java
@@ -232,19 +232,6 @@ class GridEventConsumeHandler implements
GridContinuousHandler {
if (node == null)
continue;
-
- if
(ctx.config().isPeerClassLoadingEnabled() &&
-
ctx.discovery().cacheNode(node, cacheName)) {
- GridCacheAdapter cache
= ctx.cache().internalCache(cacheName);
-
- if (cache != null &&
cache.context().deploymentEnabled()) {
-
wrapper.p2pMarshal(ctx.marshaller());
-
- wrapper.cacheName
= cacheName;
-
-
cache.context().deploy().prepare(wrapper);
- }
- }
}
ctx.continuous().addNotification(t3.get1(), t3.get2(), wrapper, null,
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
index 32db7b82918..b73ad8c7520 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerLoaderStore.java
@@ -514,8 +514,6 @@ public class GridDeploymentPerLoaderStore extends
GridDeploymentStoreAdapter {
ClassLoader ldr = classLoader();
- ctx.cache().onUndeployed(ldr);
-
// Clear optimized marshaller's cache.
if (ctx.marshaller() instanceof AbstractMarshaller)
((AbstractMarshaller)ctx.marshaller()).onUndeploy(ldr);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
index 432e12e6a2b..0501b2d0772 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/managers/deployment/GridDeploymentPerVersionStore.java
@@ -1321,8 +1321,6 @@ public class GridDeploymentPerVersionStore extends
GridDeploymentStoreAdapter {
ClassLoader ldr = classLoader();
- ctx.cache().onUndeployed(ldr);
-
// Clear static class cache.
U.clearClassFromClassCache(ctx.cache().context().deploy().globalLoader(),
sampleClassName());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
index 41d5a27019f..723c66e5183 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheGroupContext.java
@@ -115,9 +115,6 @@ public class CacheGroupContext {
/** */
private final byte ioPlc;
- /** */
- private final boolean depEnabled;
-
/** */
private final boolean storeCacheId;
@@ -257,8 +254,6 @@ public class CacheGroupContext {
ioPlc = cacheType.ioPolicy();
- depEnabled = false;
-
storeCacheId = affNode && dataRegion.config().getPageEvictionMode() !=
DataPageEvictionMode.DISABLED;
log = ctx.kernalContext().log(getClass());
@@ -302,13 +297,6 @@ public class CacheGroupContext {
return storeCacheId;
}
- /**
- * @return {@code True} if deployment is enabled.
- */
- public boolean deploymentEnabled() {
- return depEnabled;
- }
-
/**
* @return Preloader.
*/
@@ -443,16 +431,6 @@ public class CacheGroupContext {
return caches.get(0);
}
- /**
- *
- */
- public void unwindUndeploys() {
- List<GridCacheContext<?, ?>> caches = this.caches;
-
- for (GridCacheContext<?, ?> cctx : caches)
- cctx.deploy().unwind(cctx);
- }
-
/**
* @param type Event type to check.
* @return {@code True} if given event type should be recorded.
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
index 9f78b6f87fd..6e88c6604fe 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/CacheObjectContext.java
@@ -41,9 +41,6 @@ public class CacheObjectContext extends
AbstractCacheObjectContext {
/** */
private final boolean storeVal;
- /** */
- private final boolean addDepInfo;
-
/** Binary enabled flag. */
private final boolean binaryEnabled;
@@ -52,7 +49,6 @@ public class CacheObjectContext extends
AbstractCacheObjectContext {
* @param dfltAffMapper Default affinity mapper.
* @param cpyOnGet Copy on get flag.
* @param storeVal {@code True} if should store unmarshalled value in
cache.
- * @param addDepInfo {@code true} if deployment info should be associated
with the objects of this cache.
* @param binaryEnabled Binary enabled flag.
*/
@SuppressWarnings("deprecation")
@@ -62,7 +58,6 @@ public class CacheObjectContext extends
AbstractCacheObjectContext {
boolean customAffMapper,
boolean cpyOnGet,
boolean storeVal,
- boolean addDepInfo,
boolean binaryEnabled) {
super(kernalCtx);
this.cacheName = cacheName;
@@ -70,7 +65,6 @@ public class CacheObjectContext extends
AbstractCacheObjectContext {
this.customAffMapper = customAffMapper;
this.cpyOnGet = cpyOnGet;
this.storeVal = storeVal;
- this.addDepInfo = addDepInfo;
this.binaryEnabled = binaryEnabled;
}
@@ -83,7 +77,7 @@ public class CacheObjectContext extends
AbstractCacheObjectContext {
/** {@inheritDoc} */
@Override public boolean addDeploymentInfo() {
- return addDepInfo;
+ return false;
}
/** {@inheritDoc} */
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 596b0e4a300..bb3ed8c4e82 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
@@ -892,15 +892,6 @@ public abstract class GridCacheAdapter<K, V> implements
IgniteInternalCache<K, V
return (V)val;
}
- /**
- * Undeploys and removes all entries for class loader.
- *
- * @param ldr Class loader to undeploy.
- */
- public final void onUndeploy(ClassLoader ldr) {
- ctx.deploy().onUndeploy(ldr, context());
- }
-
/**
*
* @param key Entry key.
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 dd5c1f51296..a01f0153814 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
@@ -260,10 +260,6 @@ public class GridCacheContext<K, V> implements
Externalizable {
/** Updates allowed flag. */
private boolean updatesAllowed;
- // TODO: IGNITE-26571, is always false.
- /** Deployment enabled flag for this specific cache */
- private boolean depEnabled;
-
/** */
private boolean deferredDel;
@@ -383,7 +379,6 @@ public class GridCacheContext<K, V> implements
Externalizable {
this.locStartTopVer = locStartTopVer;
this.affNode = affNode;
this.updatesAllowed = updatesAllowed;
- this.depEnabled = false;
/*
* Managers in starting order!
@@ -1428,13 +1423,6 @@ public class GridCacheContext<K, V> implements
Externalizable {
};
}
- /**
- * @return {@code True} if deployment is enabled.
- */
- public boolean deploymentEnabled() {
- return depEnabled;
- }
-
/**
* @return {@code True} if store read-through mode is enabled.
*/
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
index c4021a20e23..ce2ceaa5777 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheDeploymentManager.java
@@ -17,12 +17,7 @@
package org.apache.ignite.internal.processors.cache;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.List;
import java.util.Map;
-import java.util.Objects;
import java.util.UUID;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
@@ -30,8 +25,6 @@ import java.util.concurrent.atomic.AtomicReference;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
import org.apache.ignite.IgniteCheckedException;
-import org.apache.ignite.IgniteException;
-import org.apache.ignite.binary.BinaryInvalidTypeException;
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.configuration.DeploymentMode;
import org.apache.ignite.events.DiscoveryEvent;
@@ -39,13 +32,10 @@ import org.apache.ignite.events.Event;
import org.apache.ignite.internal.managers.deployment.GridDeployment;
import org.apache.ignite.internal.managers.deployment.GridDeploymentInfoBean;
import org.apache.ignite.internal.managers.eventstorage.GridLocalEventListener;
-import
org.apache.ignite.internal.processors.cache.distributed.near.GridNearCacheAdapter;
import org.apache.ignite.internal.util.lang.GridPeerDeployAware;
import org.apache.ignite.internal.util.tostring.GridToStringInclude;
-import org.apache.ignite.internal.util.typedef.CA;
import org.apache.ignite.internal.util.typedef.F;
import org.apache.ignite.internal.util.typedef.X;
-import org.apache.ignite.internal.util.typedef.internal.CU;
import org.apache.ignite.internal.util.typedef.internal.LT;
import org.apache.ignite.internal.util.typedef.internal.S;
import org.apache.ignite.internal.util.typedef.internal.U;
@@ -67,9 +57,6 @@ public class GridCacheDeploymentManager<K, V> extends
GridCacheSharedManagerAdap
/** Cache class loader */
private volatile ClassLoader globalLdr;
- /** Undeploys. */
- private final Map<String, List<CA>> undeploys = new HashMap<>();
-
/** Per-thread deployment context. */
private ConcurrentMap<IgniteUuid, CachedDeploymentInfo<K, V>> deps = new
ConcurrentHashMap<>();
@@ -173,177 +160,6 @@ public class GridCacheDeploymentManager<K, V> extends
GridCacheSharedManagerAdap
return old;
}
- /**
- * Undeploy all queued up closures.
- *
- * @param ctx Cache context.
- */
- public void unwind(GridCacheContext ctx) {
- List<CA> q;
-
- synchronized (undeploys) {
- q = undeploys.remove(ctx.name());
- }
-
- if (q == null)
- return;
-
- int cnt = 0;
-
- for (CA c : q) {
- c.apply();
-
- cnt++;
- }
-
- if (log.isDebugEnabled())
- log.debug("Unwound undeploys count: " + cnt);
- }
-
- /**
- * Undeploys given class loader.
- *
- * @param ldr Class loader to undeploy.
- * @param ctx Grid cache context.
- */
- public void onUndeploy(final ClassLoader ldr, final GridCacheContext<K, V>
ctx) {
- assert ldr != null;
-
- if (log.isDebugEnabled())
- log.debug("Received onUndeploy() request [ldr=" + ldr + ", cctx="
+ cctx + ']');
-
- synchronized (undeploys) {
- List<CA> queue = undeploys.get(ctx.name());
-
- if (queue == null)
- undeploys.put(ctx.name(), queue = new ArrayList<>());
-
- queue.add(new CA() {
- @Override public void apply() {
- onUndeploy0(ldr, ctx);
- }
- });
- }
- }
-
- /**
- * @param ldr Loader.
- * @param cacheCtx Cache context.
- */
- private void onUndeploy0(final ClassLoader ldr, final GridCacheContext<K,
V> cacheCtx) {
- GridCacheAdapter<K, V> cache = cacheCtx.cache();
-
- Collection<KeyCacheObject> keys = new ArrayList<>();
-
- addEntries(ldr, keys, cache);
-
- if (cache.isNear())
- addEntries(ldr, keys, (((GridNearCacheAdapter)cache).dht()));
-
- if (log.isDebugEnabled())
- log.debug("Finished searching keys for undeploy [keysCnt=" +
keys.size() + ']');
-
- cache.clearLocally(keys, true);
-
- if (cacheCtx.isNear())
- cacheCtx.near().dht().clearLocally(keys, true);
-
- // Examine swap for entries to undeploy.
- int swapUndeployCnt = cacheCtx.offheap().onUndeploy(ldr);
-
- if (cacheCtx.userCache() && (!keys.isEmpty() || swapUndeployCnt != 0))
{
- U.quietAndWarn(log, "");
- U.quietAndWarn(
- log,
- "Cleared all cache entries for undeployed class loader
[cacheName=" + cacheCtx.name() +
- ", undeployCnt=" + keys.size() + ", swapUndeployCnt=" +
swapUndeployCnt +
- ", clsLdr=" + ldr.getClass().getName() + ']');
- U.quietAndWarn(
- log,
- " ^-- Cache auto-undeployment happens in SHARED deployment
mode " +
- "(to turn off, switch to CONTINUOUS mode)");
- U.quietAndWarn(log, "");
- }
-
- // Avoid class caching issues inside classloader.
- globalLdr = new CacheClassLoader();
- }
-
- /**
- * @param ldr Class loader.
- * @param keys Keys.
- * @param cache Cache.
- */
- private void addEntries(ClassLoader ldr, Collection<KeyCacheObject> keys,
GridCacheAdapter cache) {
- GridCacheContext cacheCtx = cache.context();
-
- for (GridCacheEntryEx e : (Iterable<GridCacheEntryEx>)cache.entries())
{
- boolean undeploy = cacheCtx.isNear() ?
- undeploy(ldr, e, cacheCtx.near()) || undeploy(ldr, e,
cacheCtx.near().dht()) :
- undeploy(ldr, e, cacheCtx.cache());
-
- if (undeploy)
- keys.add(e.key());
- }
- }
-
- /**
- * @param ldr Class loader.
- * @param e Entry.
- * @param cache Cache.
- * @return {@code True} if need to undeploy.
- */
- private boolean undeploy(ClassLoader ldr, GridCacheEntryEx e,
GridCacheAdapter cache) {
- KeyCacheObject key = e.key();
-
- GridCacheEntryEx entry = cache.peekEx(key);
-
- if (entry == null)
- return false;
-
- Object key0;
- Object val0;
-
- try {
- CacheObject v = entry.peek();
-
- key0 = key.value(cache.context().cacheObjectContext(), false);
-
- assert key0 != null : "Key cannot be null for cache entry: " + e;
-
- val0 = CU.value(v, cache.context(), false);
- }
- catch (GridCacheEntryRemovedException ignore) {
- return false;
- }
- catch (BinaryInvalidTypeException ex) {
- log.error("An attempt to undeploy cache with binary objects.", ex);
-
- return false;
- }
- catch (IgniteCheckedException | IgniteException ignore) {
- // Peek can throw runtime exception if unmarshalling failed.
- return true;
- }
-
- ClassLoader keyLdr = U.detectObjectClassLoader(key0);
- ClassLoader valLdr = U.detectObjectClassLoader(val0);
-
- boolean res = Objects.equals(ldr, keyLdr) || Objects.equals(ldr,
valLdr);
-
- if (log.isDebugEnabled())
- log.debug(S.toString("Finished examining entry",
- "entryCls", e.getClass(), true,
- "key", key0, true,
- "keyCls", key0.getClass(), true,
- "valCls", (val0 != null ? val0.getClass() : "null"), true,
- "keyLdr", keyLdr, false,
- "valLdr", valLdr, false,
- "res", res, false));
-
- return res;
- }
-
/**
* @param sndId Sender node ID.
* @param ldrId Loader ID.
@@ -685,7 +501,6 @@ public class GridCacheDeploymentManager<K, V> extends
GridCacheSharedManagerAdap
@Override public void printMemoryStats() {
X.println(">>> ");
X.println(">>> Cache deployment manager memory stats
[igniteInstanceName=" + cctx.igniteInstanceName() + ']');
- X.println(">>> Undeploys: " + undeploys.size());
X.println(">>> Cached deployments: " + deps.size());
}
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 927ea22d3eb..4fe455c53e6 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
@@ -63,9 +63,6 @@ public class GridCacheGateway<K, V> {
* Enter a cache call.
*/
public void enter() {
- if (ctx.deploymentEnabled())
- ctx.deploy().onEnter();
-
rwLock.readLock().lock();
checkState(true, true);
@@ -255,9 +252,6 @@ public class GridCacheGateway<K, V> {
private void onEnter(boolean checkAtomicOpsInTx) {
ctx.itHolder().checkWeakQueue();
- if (ctx.deploymentEnabled())
- ctx.deploy().onEnter();
-
if (checkAtomicOpsInTx)
checkAtomicOpsInTx();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
index 6bd6c5cf443..1d50737d4f8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java
@@ -418,8 +418,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
GridDhtAtomicUpdateResponse dhtRes = new
GridDhtAtomicUpdateResponse(req.cacheId(),
req.partition(),
- req.futureId(),
- false);
+ req.futureId());
dhtRes.nearEvicted(nearEvicted);
@@ -757,8 +756,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
req.version(),
req.futureId(),
req.miniId(),
- 0,
- false);
+ 0);
sendResponseOnFailedMessage(nodeId, res, cctx, plc);
}
@@ -788,8 +786,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
GridDhtAtomicUpdateResponse res = new
GridDhtAtomicUpdateResponse(
req.cacheId(),
req.partition(),
- req.futureId(),
- false);
+ req.futureId());
res.onError(req.classError());
@@ -818,7 +815,6 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
nodeId,
req.futureId(),
req.partition(),
- false,
false);
res.error(req.classError());
@@ -834,8 +830,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
GridDhtForceKeysResponse res = new GridDhtForceKeysResponse(
req.cacheId(),
req.futureId(),
- req.miniId(),
- false
+ req.miniId()
);
res.error(req.classError());
@@ -893,7 +888,6 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
0,
req.classError(),
null,
- false,
false);
sendResponseOnFailedMessage(nodeId, res, cctx, plc);
@@ -1004,7 +998,6 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
nodeId,
req.futureId(),
req.partition(),
- false,
false);
res.error(req.classError());
@@ -1022,7 +1015,6 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
nodeId,
req.futureId(),
req.partition(),
- false,
false);
res.error(req.classError());
@@ -1040,7 +1032,6 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
nodeId,
req.futureId(),
req.partition(),
- false,
false);
res.error(req.classError());
@@ -1056,8 +1047,7 @@ public class GridCacheIoManager extends
GridCacheSharedManagerAdapter {
GridDhtAtomicUpdateResponse res = new
GridDhtAtomicUpdateResponse(
req.cacheId(),
req.partition(),
- req.futureId(),
- false);
+ req.futureId());
res.onError(req.classError());
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 7ddc2bb8fda..d6fdf2b2485 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
@@ -4844,21 +4844,6 @@ public class GridCacheProcessor extends
GridProcessorAdapter {
}
}
- /**
- * Callback invoked by deployment manager for whenever a class loader gets
undeployed.
- *
- * @param ldr Class loader.
- */
- public void onUndeployed(ClassLoader ldr) {
- if (!ctx.isStopping()) {
- for (GridCacheAdapter<?, ?> cache : caches.values()) {
- // Do not notify system caches and caches for which deployment
is disabled.
- if (cache.context().userCache() &&
cache.context().deploymentEnabled())
- cache.onUndeploy(ldr);
- }
- }
- }
-
/**
* @return Shared context.
*/
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
index 2859130241a..50e969677b4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSharedContext.java
@@ -1017,9 +1017,6 @@ public class GridCacheSharedContext<K, V> {
if (store.isWriteBehind() != activeStore.isWriteBehind())
return "caches with different write-behind setting can't be
enlisted in one transaction";
- if (activeCacheCtx.deploymentEnabled() !=
cacheCtx.deploymentEnabled())
- return "caches with enabled and disabled deployment modes
can't be enlisted in one transaction";
-
// If local and write-behind validations passed, this must be true.
assert store.isWriteToStoreFromDht() ==
activeStore.isWriteToStoreFromDht();
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
index 4da8e1acd91..67b50a82466 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java
@@ -716,7 +716,7 @@ public class GridCacheUtils {
throws IgniteCheckedException {
assert ctx != null;
- return marshal(ctx.shared(), ctx.deploymentEnabled(), obj);
+ return marshal(ctx.shared(), false, obj);
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
index d437b179769..3247e718ad6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManager.java
@@ -222,12 +222,6 @@ public interface IgniteCacheOffheapManager {
GridDhtLocalPartition part
) throws IgniteCheckedException;
- /**
- * @param ldr Class loader.
- * @return Number of undeployed entries.
- */
- public int onUndeploy(ClassLoader ldr);
-
/**
* @param cacheId Cache ID.
* @param primary Primary entries flag.
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
index 923eb153bef..47671d01a46 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheOffheapManagerImpl.java
@@ -494,12 +494,6 @@ public class IgniteCacheOffheapManagerImpl implements
IgniteCacheOffheapManager
}
}
- /** {@inheritDoc} */
- @Override public int onUndeploy(ClassLoader ldr) {
- // TODO: GG-11141.
- return 0;
- }
-
/** {@inheritDoc} */
@Override public long offHeapAllocatedSize() {
// TODO GG-10884.
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
index 3e874b0c9e4..a0682d41b41 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/binary/CacheObjectBinaryProcessorImpl.java
@@ -306,7 +306,7 @@ public class CacheObjectBinaryProcessorImpl extends
GridProcessorAdapter impleme
if (!ctx.clientNode())
metadataFileStore.restoreMetadata(meta ->
metadataLocCache.put(meta.typeId(), new BinaryMetadataVersionInfo(meta)));
- fakeCacheObjCtx = new CacheObjectContext(ctx, null, null, false,
false, false, false, false);
+ fakeCacheObjCtx = new CacheObjectContext(ctx, null, null, false,
false, false, false);
}
/** {@inheritDoc} */
@@ -1111,7 +1111,6 @@ public class CacheObjectBinaryProcessorImpl extends
GridProcessorAdapter impleme
QueryUtils.isCustomAffinityMapper(ccfg.getAffinityMapper()),
ccfg.isCopyOnRead(),
storeVal,
- false,
notSysCache
);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
index a1a7de9aea2..607f83ab0bf 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryFuture.java
@@ -158,8 +158,7 @@ public class GridCacheTxRecoveryFuture extends
GridCacheCompoundIdentityFuture<B
0,
true,
futureId(),
- fut.futureId(),
- tx.activeCachesDeploymentEnabled());
+ fut.futureId());
try {
cctx.io().send(nearNodeId, req, tx.ioPolicy());
@@ -275,8 +274,7 @@ public class GridCacheTxRecoveryFuture extends
GridCacheCompoundIdentityFuture<B
nodeTransactions(id),
false,
futureId(),
- fut.futureId(),
- tx.activeCachesDeploymentEnabled());
+ fut.futureId());
try {
cctx.io().send(id, req, tx.ioPolicy());
@@ -314,8 +312,7 @@ public class GridCacheTxRecoveryFuture extends
GridCacheCompoundIdentityFuture<B
nodeTransactions(nodeId),
false,
futureId(),
- fut.futureId(),
- tx.activeCachesDeploymentEnabled());
+ fut.futureId());
try {
cctx.io().send(nodeId, req, tx.ioPolicy());
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
index 8d19a32c894..ffd3ca50b47 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
@@ -66,16 +66,14 @@ public class GridCacheTxRecoveryRequest extends
GridDistributedBaseMessage {
* @param nearTxCheck {@code True} if should check only tx on near node.
* @param futId Future ID.
* @param miniId Mini future ID.
- * @param addDepInfo Deployment info flag.
*/
public GridCacheTxRecoveryRequest(IgniteInternalTx tx,
int txNum,
boolean nearTxCheck,
IgniteUuid futId,
- IgniteUuid miniId,
- boolean addDepInfo
+ IgniteUuid miniId
) {
- super(tx.xidVersion(), 0, addDepInfo);
+ super(tx.xidVersion(), 0, false);
nearXidVer = tx.nearXidVersion();
sys = tx.system();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
index 22fd4d654f2..5b412ad4b13 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
@@ -127,7 +127,6 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
* @param keyCnt Number of keys.
* @param txSize Expected transaction size.
* @param skipStore Skip store flag.
- * @param addDepInfo Deployment info flag.
*/
public GridDistributedLockRequest(
int cacheId,
@@ -145,10 +144,9 @@ public class GridDistributedLockRequest extends
GridDistributedBaseMessage {
int txSize,
boolean skipStore,
boolean skipReadThrough,
- boolean keepBinary,
- boolean addDepInfo
+ boolean keepBinary
) {
- super(lockVer, keyCnt, addDepInfo);
+ super(lockVer, keyCnt, false);
assert keyCnt > 0;
assert futId != null;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
index a8b0bfa7b31..64da50ca22b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
@@ -62,14 +62,12 @@ public class GridDistributedLockResponse extends
GridDistributedBaseMessage {
* @param lockVer Lock version.
* @param futId Future ID.
* @param cnt Key count.
- * @param addDepInfo Deployment info.
*/
public GridDistributedLockResponse(int cacheId,
GridCacheVersion lockVer,
IgniteUuid futId,
- int cnt,
- boolean addDepInfo) {
- super(lockVer, cnt, addDepInfo);
+ int cnt) {
+ super(lockVer, cnt, false);
assert futId != null;
@@ -84,14 +82,12 @@ public class GridDistributedLockResponse extends
GridDistributedBaseMessage {
* @param lockVer Lock ID.
* @param futId Future ID.
* @param err Error.
- * @param addDepInfo Deployment info.
*/
public GridDistributedLockResponse(int cacheId,
GridCacheVersion lockVer,
IgniteUuid futId,
- Throwable err,
- boolean addDepInfo) {
- super(lockVer, 0, addDepInfo);
+ Throwable err) {
+ super(lockVer, 0, false);
assert futId != null;
@@ -106,15 +102,13 @@ public class GridDistributedLockResponse extends
GridDistributedBaseMessage {
* @param futId Future ID.
* @param cnt Count.
* @param err Error.
- * @param addDepInfo Deployment info.
*/
public GridDistributedLockResponse(int cacheId,
GridCacheVersion lockVer,
IgniteUuid futId,
int cnt,
- Throwable err,
- boolean addDepInfo) {
- super(lockVer, cnt, addDepInfo);
+ Throwable err) {
+ super(lockVer, cnt, false);
assert futId != null;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
index ca3e276dd39..4a621ec5915 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
@@ -121,7 +121,6 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
* @param baseVer Base version.
* @param committedVers Committed versions.
* @param rolledbackVers Rolled back versions.
- * @param addDepInfo Deployment info flag.
*/
public GridDistributedTxFinishRequest(
GridCacheVersion xidVer,
@@ -136,10 +135,9 @@ public class GridDistributedTxFinishRequest extends
GridDistributedBaseMessage i
GridCacheVersion baseVer,
Collection<GridCacheVersion> committedVers,
Collection<GridCacheVersion> rolledbackVers,
- int taskNameHash,
- boolean addDepInfo
+ int taskNameHash
) {
- super(xidVer, 0, addDepInfo);
+ super(xidVer, 0, false);
assert xidVer != null;
assert syncMode != null;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
index bfe5bdda3aa..f59d7fd6543 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
@@ -164,7 +164,6 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
* @param retVal Return value flag.
* @param last Last request flag.
* @param onePhaseCommit One phase commit flag.
- * @param addDepInfo Deployment info flag.
*/
public GridDistributedTxPrepareRequest(
IgniteInternalTx tx,
@@ -174,10 +173,9 @@ public class GridDistributedTxPrepareRequest extends
GridDistributedBaseMessage
Map<UUID, Collection<UUID>> txNodes,
boolean retVal,
boolean last,
- boolean onePhaseCommit,
- boolean addDepInfo
+ boolean onePhaseCommit
) {
- super(tx.xidVersion(), 0, addDepInfo);
+ super(tx.xidVersion(), 0, false);
writeVer = tx.writeVersion();
threadId = tx.threadId();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
index 258bf5211cf..7c83c0cc3a9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxRemoteAdapter.java
@@ -194,16 +194,6 @@ public abstract class GridDistributedTxRemoteAdapter
extends IgniteTxAdapter imp
return nodeId;
}
- /** {@inheritDoc} */
- @Override public boolean activeCachesDeploymentEnabled() {
- return false;
- }
-
- /** {@inheritDoc} */
- @Override public void activeCachesDeploymentEnabled(boolean depEnabled) {
- throw new UnsupportedOperationException("Remote tx doesn't support
deployment.");
- }
-
/** {@inheritDoc} */
@Override public void addActiveCache(GridCacheContext<?, ?> cacheCtx,
boolean recovery) throws IgniteCheckedException {
txState.addActiveCache(cacheCtx, recovery, this);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java
index 1dfb0dc0ae4..ca13107e930 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridNearUnlockRequest.java
@@ -46,10 +46,9 @@ public class GridNearUnlockRequest extends
GridDistributedBaseMessage {
/**
* @param cacheId Cache ID.
* @param keyCnt Key count.
- * @param addDepInfo Deployment info flag.
*/
- public GridNearUnlockRequest(int cacheId, int keyCnt, boolean addDepInfo) {
- super(keyCnt, addDepInfo);
+ public GridNearUnlockRequest(int cacheId, int keyCnt) {
+ super(keyCnt, false);
this.cacheId = cacheId;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
index a8c9a8cb936..a44bebc0d8d 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheAdapter.java
@@ -214,8 +214,7 @@ public abstract class GridDhtCacheAdapter<K, V> extends
GridDistributedCacheAdap
GridDhtForceKeysResponse res = new GridDhtForceKeysResponse(
ctx.cacheId(),
msg.futureId(),
- msg.miniId(),
- ctx.deploymentEnabled());
+ msg.miniId());
GridDhtPartitionTopology top = ctx.topology();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
index 3da4ef43ed5..7cba44d7ef5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java
@@ -924,7 +924,6 @@ public final class GridDhtLockFuture extends
GridCacheCompoundIdentityFuture<Boo
skipReadThrough,
cctx.store().configured(),
keepBinary,
- cctx.deploymentEnabled(),
inTx() ? tx.label() : null);
try {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
index 56fe1d807e8..1e862a71061 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
@@ -110,7 +110,6 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
* @param skipStore Skip store flag.
* @param storeUsed Cache store used flag.
* @param keepBinary Keep binary flag.
- * @param addDepInfo Deployment info flag.
* @param txLbl Transaction label.
*/
public GridDhtLockRequest(
@@ -135,7 +134,6 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
boolean skipReadThrough,
boolean storeUsed,
boolean keepBinary,
- boolean addDepInfo,
String txLbl
) {
super(cacheId,
@@ -153,8 +151,7 @@ public class GridDhtLockRequest extends
GridDistributedLockRequest {
txSize,
skipStore,
skipReadThrough,
- keepBinary,
- addDepInfo);
+ keepBinary);
this.topVer = topVer;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
index 04412f4e577..2e9a46f8708 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
@@ -62,11 +62,9 @@ public class GridDhtLockResponse extends
GridDistributedLockResponse {
* @param futId Future ID.
* @param miniId Mini future ID.
* @param cnt Key count.
- * @param addDepInfo Deployment info.
*/
- public GridDhtLockResponse(int cacheId, GridCacheVersion lockVer,
IgniteUuid futId, IgniteUuid miniId, int cnt,
- boolean addDepInfo) {
- super(cacheId, lockVer, futId, cnt, addDepInfo);
+ public GridDhtLockResponse(int cacheId, GridCacheVersion lockVer,
IgniteUuid futId, IgniteUuid miniId, int cnt) {
+ super(cacheId, lockVer, futId, cnt);
assert miniId != null;
@@ -78,11 +76,10 @@ public class GridDhtLockResponse extends
GridDistributedLockResponse {
* @param futId Future ID.
* @param miniId Mini future ID.
* @param err Error.
- * @param addDepInfo Deployment info.
*/
public GridDhtLockResponse(int cacheId, GridCacheVersion lockVer,
IgniteUuid futId, IgniteUuid miniId,
- Throwable err, boolean addDepInfo) {
- super(cacheId, lockVer, futId, err, addDepInfo);
+ Throwable err) {
+ super(cacheId, lockVer, futId, err);
assert miniId != null;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
index 9a813db7180..c500bc9fcf7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTransactionalCacheAdapter.java
@@ -431,8 +431,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K,
V> extends GridDhtCach
req.version(),
req.futureId(),
req.miniId(),
- e,
- ctx.deploymentEnabled());
+ e);
try {
ctx.io().send(nodeId, res, ctx.ioPolicy());
@@ -465,8 +464,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K,
V> extends GridDhtCach
boolean cancelled = false;
try {
- res = new GridDhtLockResponse(ctx.cacheId(), req.version(),
req.futureId(), req.miniId(), cnt,
- ctx.deploymentEnabled());
+ res = new GridDhtLockResponse(ctx.cacheId(), req.version(),
req.futureId(), req.miniId(), cnt);
dhtTx = startRemoteTx(nodeId, req, res);
}
@@ -476,7 +474,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K,
V> extends GridDhtCach
U.error(log, err, e);
res = new GridDhtLockResponse(ctx.cacheId(), req.version(),
req.futureId(), req.miniId(),
- new IgniteTxRollbackCheckedException(err, e),
ctx.deploymentEnabled());
+ new IgniteTxRollbackCheckedException(err, e));
fail = true;
}
@@ -489,7 +487,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K,
V> extends GridDhtCach
req.version(),
req.futureId(),
req.miniId(),
- new IgniteCheckedException(err, e), ctx.deploymentEnabled());
+ new IgniteCheckedException(err, e));
fail = true;
}
@@ -1165,7 +1163,6 @@ public abstract class GridDhtTransactionalCacheAdapter<K,
V> extends GridDhtCach
0,
null,
topVer,
- ctx.deploymentEnabled(),
false);
try {
@@ -1218,7 +1215,6 @@ public abstract class GridDhtTransactionalCacheAdapter<K,
V> extends GridDhtCach
entries.size(),
err,
clienRemapVer,
- ctx.deploymentEnabled(),
clienRemapVer != null);
if (err == null) {
@@ -1329,7 +1325,6 @@ public abstract class GridDhtTransactionalCacheAdapter<K,
V> extends GridDhtCach
entries.size(),
e,
null,
- ctx.deploymentEnabled(),
false);
}
}
@@ -1676,8 +1671,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K,
V> extends GridDhtCach
List<KeyCacheObject> keyBytes = entry.getValue();
- GridDhtUnlockRequest req = new GridDhtUnlockRequest(ctx.cacheId(),
keyBytes.size(),
- ctx.deploymentEnabled());
+ GridDhtUnlockRequest req = new GridDhtUnlockRequest(ctx.cacheId(),
keyBytes.size());
req.version(dhtVer);
@@ -1711,8 +1705,7 @@ public abstract class GridDhtTransactionalCacheAdapter<K,
V> extends GridDhtCach
if (!dhtMap.containsKey(n)) {
List<KeyCacheObject> keyBytes = entry.getValue();
- GridDhtUnlockRequest req = new
GridDhtUnlockRequest(ctx.cacheId(), keyBytes.size(),
- ctx.deploymentEnabled());
+ GridDhtUnlockRequest req = new
GridDhtUnlockRequest(ctx.cacheId(), keyBytes.size());
req.version(dhtVer);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
index af067a452a5..98c580203c2 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishFuture.java
@@ -373,7 +373,6 @@ public final class GridDhtTxFinishFuture<K, V> extends
GridCacheCompoundIdentity
tx.committedVersions(),
tx.rolledbackVersions(),
tx.taskNameHash(),
- tx.activeCachesDeploymentEnabled(),
false,
false,
cctx.tm().txHandler().filterUpdateCountersForBackupNode(tx,
n));
@@ -466,7 +465,6 @@ public final class GridDhtTxFinishFuture<K, V> extends
GridCacheCompoundIdentity
tx.committedVersions(),
tx.rolledbackVersions(),
tx.taskNameHash(),
- tx.activeCachesDeploymentEnabled(),
false,
false,
commit ? null :
cctx.tm().txHandler().filterUpdateCountersForBackupNode(tx, n));
@@ -536,7 +534,6 @@ public final class GridDhtTxFinishFuture<K, V> extends
GridCacheCompoundIdentity
tx.committedVersions(),
tx.rolledbackVersions(),
tx.taskNameHash(),
- tx.activeCachesDeploymentEnabled(),
false,
false,
null);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
index dc4007c21cc..36e56f57418 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
@@ -69,7 +69,6 @@ public class GridDhtTxFinishRequest extends
GridDistributedTxFinishRequest {
* @param committedVers Committed versions.
* @param rolledbackVers Rolled back versions.
* @param taskNameHash Task name hash.
- * @param addDepInfo Deployment info flag.
* @param retVal Need return value
* @param waitRemoteTxs Wait remote transactions flag
* @param updCntrs Update counters for Tx.
@@ -91,7 +90,6 @@ public class GridDhtTxFinishRequest extends
GridDistributedTxFinishRequest {
Collection<GridCacheVersion> committedVers,
Collection<GridCacheVersion> rolledbackVers,
int taskNameHash,
- boolean addDepInfo,
boolean retVal,
boolean waitRemoteTxs,
Collection<PartitionUpdateCountersMessage> updCntrs
@@ -109,8 +107,7 @@ public class GridDhtTxFinishRequest extends
GridDistributedTxFinishRequest {
baseVer,
committedVers,
rolledbackVers,
- taskNameHash,
- addDepInfo);
+ taskNameHash);
assert miniId != 0;
assert nearNodeId != null;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
index 36cfb822380..7af5629a668 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
@@ -920,7 +920,7 @@ public final class GridDhtTxPrepareFuture extends
GridCacheCompoundFuture<Ignite
prepErr,
null,
tx.onePhaseCommit(),
- tx.activeCachesDeploymentEnabled());
+ false);
if (prepErr == null) {
if (tx.needReturnValue() || tx.nearOnOriginatingNode() ||
tx.hasInterceptor())
@@ -1428,7 +1428,6 @@ public final class GridDhtTxPrepareFuture extends
GridCacheCompoundFuture<Ignite
true,
tx.onePhaseCommit(),
tx.taskNameHash(),
- tx.activeCachesDeploymentEnabled(),
tx.storeWriteThrough(),
retVal,
cctx.tm().txHandler().filterUpdateCountersForBackupNode(tx,
n));
@@ -1539,7 +1538,6 @@ public final class GridDhtTxPrepareFuture extends
GridCacheCompoundFuture<Ignite
true,
tx.onePhaseCommit(),
tx.taskNameHash(),
- tx.activeCachesDeploymentEnabled(),
tx.storeWriteThrough(),
retVal,
null);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
index e3b1ef448ce..1688bc69e5f 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
@@ -128,7 +128,6 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
* @param txNodes Transaction nodes mapping.
* @param nearXidVer Near transaction ID.
* @param last {@code True} if this is last prepare request for node.
- * @param addDepInfo Deployment info flag.
* @param storeWriteThrough Cache store write through flag.
* @param retVal Need return value flag
* @param updCntrs Update counters for Tx.
@@ -146,7 +145,6 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
boolean last,
boolean onePhaseCommit,
int taskNameHash,
- boolean addDepInfo,
boolean storeWriteThrough,
boolean retVal,
Collection<PartitionUpdateCountersMessage> updCntrs) {
@@ -157,8 +155,7 @@ public class GridDhtTxPrepareRequest extends
GridDistributedTxPrepareRequest {
txNodes,
retVal,
last,
- onePhaseCommit,
- addDepInfo);
+ onePhaseCommit);
assert futId != null;
assert miniId != 0;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
index 2aaa04b4328..fdcab75034c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
@@ -44,10 +44,9 @@ public class GridDhtUnlockRequest extends
GridNearUnlockRequest {
/**
* @param cacheId Cache ID.
* @param dhtCnt Key count.
- * @param addDepInfo Deployment info flag.
*/
- public GridDhtUnlockRequest(int cacheId, int dhtCnt, boolean addDepInfo) {
- super(cacheId, dhtCnt, addDepInfo);
+ public GridDhtUnlockRequest(int cacheId, int dhtCnt) {
+ super(cacheId, dhtCnt);
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
index 18a01af2050..ef5c6f14ebd 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedGetFuture.java
@@ -662,7 +662,6 @@ public class GridPartitionedGetFuture<K, V> extends
CacheDistributedGetFutureAda
expiryPlc != null ? expiryPlc.forAccess() : -1L,
false,
skipVals,
- cctx.deploymentEnabled(),
recovery,
txLbl
);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
index 75f76296d84..9e36e9691f0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridPartitionedSingleGetFuture.java
@@ -355,7 +355,6 @@ public class GridPartitionedSingleGetFuture extends
GridCacheFutureAdapter<Objec
skipVals,
/*add reader*/false,
needVer,
- cctx.deploymentEnabled(),
recovery,
txLbl
);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
index c9b55fcbc0a..5ed0e22d39e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicAbstractUpdateRequest.java
@@ -114,7 +114,6 @@ public abstract class GridDhtAtomicAbstractUpdateRequest
extends GridCacheIdMess
GridCacheVersion writeVer,
@NotNull AffinityTopologyVersion topVer,
int taskNameHash,
- boolean addDepInfo,
boolean keepBinary,
boolean skipStore,
boolean readRepairRecovery
@@ -127,7 +126,6 @@ public abstract class GridDhtAtomicAbstractUpdateRequest
extends GridCacheIdMess
this.writeVer = writeVer;
this.topVer = topVer;
this.taskNameHash = taskNameHash;
- this.addDepInfo = addDepInfo;
if (skipStore)
setFlag(true, DHT_ATOMIC_SKIP_STORE_FLAG_MASK);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
index 5876bdb50b3..919199ec48c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java
@@ -1761,8 +1761,7 @@ public class GridDhtAtomicCache<K, V> extends
GridDhtCacheAdapter<K, V> {
nodeId,
req.futureId(),
req.partition(),
- false,
- ctx.deploymentEnabled());
+ false);
res.addFailedKeys(req.keys(), e);
@@ -1785,8 +1784,7 @@ public class GridDhtAtomicCache<K, V> extends
GridDhtCacheAdapter<K, V> {
node.id(),
req.futureId(),
req.partition(),
- false,
- ctx.deploymentEnabled());
+ false);
assert !req.returnValue() || (req.operation() == TRANSFORM ||
req.size() == 1);
@@ -3254,7 +3252,6 @@ public class GridDhtAtomicCache<K, V> extends
GridDhtCacheAdapter<K, V> {
nodeId,
checkReq.futureId(),
checkReq.partition(),
- false,
false);
GridCacheReturn ret = new GridCacheReturn(false, true);
@@ -3424,8 +3421,7 @@ public class GridDhtAtomicCache<K, V> extends
GridDhtCacheAdapter<K, V> {
if (nearEvicted != null) {
dhtRes = new GridDhtAtomicUpdateResponse(ctx.cacheId(),
req.partition(),
- req.futureId(),
- ctx.deploymentEnabled());
+ req.futureId());
dhtRes.nearEvicted(nearEvicted);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java
index 538759cd3aa..f212c95b8a3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateFuture.java
@@ -90,7 +90,6 @@ class GridDhtAtomicSingleUpdateFuture extends
GridDhtAtomicAbstractUpdateFuture
writeVer,
topVer,
updateReq.taskNameHash(),
- cctx.deploymentEnabled(),
updateReq.keepBinary(),
updateReq.skipStore(),
readRepairRecovery);
@@ -104,7 +103,6 @@ class GridDhtAtomicSingleUpdateFuture extends
GridDhtAtomicAbstractUpdateFuture
topVer,
updateReq.taskNameHash(),
null,
- cctx.deploymentEnabled(),
updateReq.keepBinary(),
updateReq.skipStore(),
false,
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
index 98fb9ca58a9..f970473338a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicSingleUpdateRequest.java
@@ -75,7 +75,6 @@ public class GridDhtAtomicSingleUpdateRequest extends
GridDhtAtomicAbstractUpdat
* @param writeVer Write version for cache values.
* @param topVer Topology version.
* @param taskNameHash Task name hash code.
- * @param addDepInfo Deployment info.
* @param keepBinary Keep binary flag.
* @param skipStore Skip store flag.
* @param readRepairRecovery Recovery on Read Repair flag.
@@ -87,7 +86,6 @@ public class GridDhtAtomicSingleUpdateRequest extends
GridDhtAtomicAbstractUpdat
GridCacheVersion writeVer,
@NotNull AffinityTopologyVersion topVer,
int taskNameHash,
- boolean addDepInfo,
boolean keepBinary,
boolean skipStore,
boolean readRepairRecovery
@@ -98,7 +96,6 @@ public class GridDhtAtomicSingleUpdateRequest extends
GridDhtAtomicAbstractUpdat
writeVer,
topVer,
taskNameHash,
- addDepInfo,
keepBinary,
skipStore,
readRepairRecovery);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
index 7debeffa16f..a2814d0a9ad 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java
@@ -19,7 +19,6 @@ package
org.apache.ignite.internal.processors.cache.distributed.dht.atomic;
import java.util.List;
import java.util.UUID;
-
import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.cache.GridCacheContext;
@@ -89,7 +88,6 @@ class GridDhtAtomicUpdateFuture extends
GridDhtAtomicAbstractUpdateFuture {
topVer,
updateReq.taskNameHash(),
null,
- cctx.deploymentEnabled(),
updateReq.keepBinary(),
updateReq.skipStore(),
false,
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
index f26873a89a8..76309e6e207 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateRequest.java
@@ -142,7 +142,6 @@ public class GridDhtAtomicUpdateRequest extends
GridDhtAtomicAbstractUpdateReque
* @param skipStore Skip store flag.
* @param forceTransformBackups Force transform backups flag.
* @param taskNameHash Task name hash code.
- * @param addDepInfo Deployment info.
* @param readRepairRecovery Recovery on Read Repair flag.
*/
public GridDhtAtomicUpdateRequest(
@@ -153,7 +152,6 @@ public class GridDhtAtomicUpdateRequest extends
GridDhtAtomicAbstractUpdateReque
@NotNull AffinityTopologyVersion topVer,
int taskNameHash,
Object[] invokeArgs,
- boolean addDepInfo,
boolean keepBinary,
boolean skipStore,
boolean forceTransformBackups,
@@ -165,7 +163,6 @@ public class GridDhtAtomicUpdateRequest extends
GridDhtAtomicAbstractUpdateReque
writeVer,
topVer,
taskNameHash,
- addDepInfo,
keepBinary,
skipStore,
readRepairRecovery);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
index 0e937db5e58..4787ca83b19 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java
@@ -65,13 +65,11 @@ public class GridDhtAtomicUpdateResponse extends
GridCacheIdMessage implements G
* @param cacheId Cache ID.
* @param partId Partition.
* @param futId Future ID.
- * @param addDepInfo Deployment info.
*/
- public GridDhtAtomicUpdateResponse(int cacheId, int partId, long futId,
boolean addDepInfo) {
+ public GridDhtAtomicUpdateResponse(int cacheId, int partId, long futId) {
this.cacheId = cacheId;
this.partId = partId;
this.futId = futId;
- this.addDepInfo = addDepInfo;
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
index 6c941ae6869..a9b194b10e0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java
@@ -476,8 +476,7 @@ public abstract class GridNearAtomicAbstractUpdateFuture
extends GridCacheFuture
req.nodeId(),
req.futureId(),
req.partition(),
- true,
- cctx.deploymentEnabled());
+ true);
ClusterTopologyCheckedException e = new
ClusterTopologyCheckedException("Primary node left grid " +
"before response is received: " + req.nodeId());
@@ -498,8 +497,7 @@ public abstract class GridNearAtomicAbstractUpdateFuture
extends GridCacheFuture
req.nodeId(),
req.futureId(),
req.partition(),
- e instanceof ClusterTopologyCheckedException,
- cctx.deploymentEnabled());
+ e instanceof ClusterTopologyCheckedException);
res.addFailedKeys(req.keys(), e);
@@ -515,8 +513,7 @@ public abstract class GridNearAtomicAbstractUpdateFuture
extends GridCacheFuture
req.updateRequest().nodeId(),
req.futureId(),
req.partition(),
- e instanceof ClusterTopologyCheckedException,
- cctx.deploymentEnabled());
+ e instanceof ClusterTopologyCheckedException);
res.addFailedKeys(req.updateRequest().keys(), e);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
index 368ffe41676..73a75435a59 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateRequest.java
@@ -121,7 +121,6 @@ public abstract class GridNearAtomicAbstractUpdateRequest
extends GridCacheIdMes
* @param op Cache update operation.
* @param taskNameHash Task name hash code.
* @param flags Flags.
- * @param addDepInfo Deployment info flag.
*/
protected GridNearAtomicAbstractUpdateRequest(
int cacheId,
@@ -131,8 +130,7 @@ public abstract class GridNearAtomicAbstractUpdateRequest
extends GridCacheIdMes
CacheWriteSynchronizationMode syncMode,
GridCacheOperation op,
int taskNameHash,
- short flags,
- boolean addDepInfo
+ short flags
) {
this.cacheId = cacheId;
this.nodeId = nodeId;
@@ -142,7 +140,6 @@ public abstract class GridNearAtomicAbstractUpdateRequest
extends GridCacheIdMes
this.syncMode = syncMode;
this.taskNameHash = taskNameHash;
this.flags = flags;
- this.addDepInfo = addDepInfo;
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
index 6a3bab524e7..952f1f79561 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicFullUpdateRequest.java
@@ -122,7 +122,6 @@ public class GridNearAtomicFullUpdateRequest extends
GridNearAtomicAbstractUpdat
* @param filter Optional filter for atomic check.
* @param taskNameHash Task name hash code.
* @param flags Flags.
- * @param addDepInfo Deployment info flag.
* @param maxEntryCnt Maximum entries count.
*/
GridNearAtomicFullUpdateRequest(
@@ -137,7 +136,6 @@ public class GridNearAtomicFullUpdateRequest extends
GridNearAtomicAbstractUpdat
@Nullable CacheEntryPredicate[] filter,
int taskNameHash,
short flags,
- boolean addDepInfo,
int maxEntryCnt
) {
super(cacheId,
@@ -147,8 +145,7 @@ public class GridNearAtomicFullUpdateRequest extends
GridNearAtomicAbstractUpdat
syncMode,
op,
taskNameHash,
- flags,
- addDepInfo);
+ flags);
this.expiryPlc = expiryPlc;
this.invokeArgs = invokeArgs;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
index 6ed17f45b45..3d64a0d3f6e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFilterRequest.java
@@ -58,7 +58,6 @@ public class GridNearAtomicSingleUpdateFilterRequest extends
GridNearAtomicSingl
* @param filter Optional filter for atomic check.
* @param taskNameHash Task name hash code.
* @param flags Flags.
- * @param addDepInfo Deployment info flag.
*/
GridNearAtomicSingleUpdateFilterRequest(
int cacheId,
@@ -69,8 +68,7 @@ public class GridNearAtomicSingleUpdateFilterRequest extends
GridNearAtomicSingl
GridCacheOperation op,
@Nullable CacheEntryPredicate[] filter,
int taskNameHash,
- short flags,
- boolean addDepInfo
+ short flags
) {
super(
cacheId,
@@ -80,8 +78,7 @@ public class GridNearAtomicSingleUpdateFilterRequest extends
GridNearAtomicSingl
syncMode,
op,
taskNameHash,
- flags,
- addDepInfo
+ flags
);
assert filter != null && filter.length > 0;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
index e5a6352de9a..e4ea94e5c80 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java
@@ -566,8 +566,7 @@ public class GridNearAtomicSingleUpdateFuture extends
GridNearAtomicAbstractUpda
op,
invokeArgs,
taskNameHash,
- flags,
- cctx.deploymentEnabled());
+ flags);
}
else {
if (filter == null || filter.length == 0) {
@@ -579,8 +578,7 @@ public class GridNearAtomicSingleUpdateFuture extends
GridNearAtomicAbstractUpda
syncMode,
op,
taskNameHash,
- flags,
- cctx.deploymentEnabled());
+ flags);
}
else {
req = new GridNearAtomicSingleUpdateFilterRequest(
@@ -592,8 +590,7 @@ public class GridNearAtomicSingleUpdateFuture extends
GridNearAtomicAbstractUpda
op,
filter,
taskNameHash,
- flags,
- cctx.deploymentEnabled());
+ flags);
}
}
}
@@ -610,7 +607,6 @@ public class GridNearAtomicSingleUpdateFuture extends
GridNearAtomicAbstractUpda
filter,
taskNameHash,
flags,
- cctx.deploymentEnabled(),
1);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
index 90a70b2daed..2399bc8b162 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateInvokeRequest.java
@@ -78,7 +78,6 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends
GridNearAtomicSingl
* @param invokeArgs Optional arguments for entry processor.
* @param taskNameHash Task name hash code.
* @param flags Flags.
- * @param addDepInfo Deployment info flag.
*/
GridNearAtomicSingleUpdateInvokeRequest(
int cacheId,
@@ -89,8 +88,7 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends
GridNearAtomicSingl
GridCacheOperation op,
@Nullable Object[] invokeArgs,
int taskNameHash,
- short flags,
- boolean addDepInfo
+ short flags
) {
super(
cacheId,
@@ -100,8 +98,7 @@ public class GridNearAtomicSingleUpdateInvokeRequest extends
GridNearAtomicSingl
syncMode,
op,
taskNameHash,
- flags,
- addDepInfo
+ flags
);
assert op == TRANSFORM : op;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
index 80e6102e630..362ec935b11 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateRequest.java
@@ -74,7 +74,6 @@ public class GridNearAtomicSingleUpdateRequest extends
GridNearAtomicAbstractUpd
* @param op Cache update operation.
* @param taskNameHash Task name hash code.
* @param flags Flags.
- * @param addDepInfo Deployment info flag.
*/
GridNearAtomicSingleUpdateRequest(
int cacheId,
@@ -84,8 +83,7 @@ public class GridNearAtomicSingleUpdateRequest extends
GridNearAtomicAbstractUpd
CacheWriteSynchronizationMode syncMode,
GridCacheOperation op,
int taskNameHash,
- short flags,
- boolean addDepInfo
+ short flags
) {
super(cacheId,
nodeId,
@@ -94,8 +92,7 @@ public class GridNearAtomicSingleUpdateRequest extends
GridNearAtomicAbstractUpd
syncMode,
op,
taskNameHash,
- flags,
- addDepInfo
+ flags
);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
index 8c2bb97940a..9a062e60fc7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java
@@ -1015,7 +1015,6 @@ public class GridNearAtomicUpdateFuture extends
GridNearAtomicAbstractUpdateFutu
filter,
taskNameHash,
flags,
- cctx.deploymentEnabled(),
keys.size());
mapped = new PrimaryRequestState(req, nodes, false);
@@ -1129,7 +1128,6 @@ public class GridNearAtomicUpdateFuture extends
GridNearAtomicAbstractUpdateFutu
filter,
taskNameHash,
flags,
- cctx.deploymentEnabled(),
1);
req.addUpdateEntry(cacheKey,
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
index 41faec1130e..8cf63149612 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java
@@ -92,20 +92,17 @@ public class GridNearAtomicUpdateResponse extends
GridCacheIdMessage implements
* @param futId Future ID.
* @param partId Partition.
* @param nodeLeft {@code True} if primary node failed.
- * @param addDepInfo Deployment info flag.
*/
public GridNearAtomicUpdateResponse(int cacheId,
UUID nodeId,
long futId,
int partId,
- boolean nodeLeft,
- boolean addDepInfo) {
+ boolean nodeLeft) {
this.cacheId = cacheId;
this.nodeId = nodeId;
this.futId = futId;
this.partId = partId;
this.nodeLeft = nodeLeft;
- this.addDepInfo = addDepInfo;
assert partId >= 0;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
index 85f2066f040..9109e5b49a5 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
@@ -735,8 +735,7 @@ public class GridDhtColocatedCache<K, V> extends
GridDhtTransactionalCacheAdapte
GridNearUnlockRequest req = map.get(primary);
if (req == null) {
- map.put(primary, req = new
GridNearUnlockRequest(ctx.cacheId(), keyCnt,
- ctx.deploymentEnabled()));
+ map.put(primary, req = new
GridNearUnlockRequest(ctx.cacheId(), keyCnt));
req.version(ver);
}
@@ -839,8 +838,7 @@ public class GridDhtColocatedCache<K, V> extends
GridDhtTransactionalCacheAdapte
GridNearUnlockRequest req = map.get(primary);
if (req == null) {
- map.put(primary, req = new
GridNearUnlockRequest(ctx.cacheId(), keyCnt,
- ctx.deploymentEnabled()));
+ map.put(primary, req = new
GridNearUnlockRequest(ctx.cacheId(), keyCnt));
req.version(ver);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
index 6ffdec36725..6bf6c13aedc 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedLockFuture.java
@@ -1089,7 +1089,6 @@ public final class GridDhtColocatedLockFuture extends
GridCacheCompoundIdentityF
keepBinary,
clientFirst,
false,
- cctx.deploymentEnabled(),
inTx() ? tx.label() : null);
mapping.request(req);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
index 5ee3ff03684..57349256f54 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java
@@ -262,8 +262,7 @@ public final class GridDhtForceKeysFuture<K, V> extends
GridCompoundFuture<Objec
futId,
fut.miniId(),
mappedKeys,
- topVer,
- cctx.deploymentEnabled());
+ topVer);
try {
add(fut); // Append new future.
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
index dba2560c6f3..b9409dc804b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysRequest.java
@@ -66,15 +66,13 @@ public class GridDhtForceKeysRequest extends
GridCacheIdMessage implements GridC
* @param miniId Mini-future ID.
* @param keys Keys.
* @param topVer Topology version.
- * @param addDepInfo Deployment info.
*/
GridDhtForceKeysRequest(
int cacheId,
IgniteUuid futId,
IgniteUuid miniId,
Collection<KeyCacheObject> keys,
- AffinityTopologyVersion topVer,
- boolean addDepInfo
+ AffinityTopologyVersion topVer
) {
assert futId != null;
assert miniId != null;
@@ -85,7 +83,6 @@ public class GridDhtForceKeysRequest extends
GridCacheIdMessage implements GridC
this.miniId = miniId;
this.keys = keys;
this.topVer = topVer;
- this.addDepInfo = addDepInfo;
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
index ec8de445dbc..2b739c38877 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysResponse.java
@@ -72,16 +72,14 @@ public class GridDhtForceKeysResponse extends
GridCacheIdMessage implements Grid
* @param cacheId Cache ID.
* @param futId Request id.
* @param miniId Mini-future ID.
- * @param addDepInfo Deployment info flag.
*/
- public GridDhtForceKeysResponse(int cacheId, IgniteUuid futId, IgniteUuid
miniId, boolean addDepInfo) {
+ public GridDhtForceKeysResponse(int cacheId, IgniteUuid futId, IgniteUuid
miniId) {
assert futId != null;
assert miniId != null;
this.cacheId = cacheId;
this.futId = futId;
this.miniId = miniId;
- this.addDepInfo = addDepInfo;
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
index 3c4a09e6718..25157306343 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionSupplier.java
@@ -228,7 +228,7 @@ public class GridDhtPartitionSupplier {
demandMsg.rebalanceId(),
grp.groupId(),
demandMsg.topologyVersion(),
- grp.deploymentEnabled()
+ false
);
try {
@@ -318,7 +318,7 @@ public class GridDhtPartitionSupplier {
supplyMsg = new
GridDhtPartitionSupplyMessage(demandMsg.rebalanceId(),
grp.groupId(),
demandMsg.topologyVersion(),
- grp.deploymentEnabled());
+ false);
}
}
@@ -471,7 +471,7 @@ public class GridDhtPartitionSupplier {
demandMsg.rebalanceId(),
grp.groupId(),
demandMsg.topologyVersion(),
- grp.deploymentEnabled(),
+ false,
t
);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
index abf0d704c73..a5f24c5e238 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsExchangeFuture.java
@@ -1023,9 +1023,6 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
else
exchange = cctx.kernalContext().clientNode() ?
ExchangeType.CLIENT : ExchangeType.ALL;
}
-
- if (exchId.isLeft())
- onLeft();
}
else {
exchange = firstDiscoEvt.eventNode().isClient() ?
onClientNodeEvent() :
@@ -1499,11 +1496,8 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
private ExchangeType onClientNodeEvent() throws IgniteCheckedException {
assert firstDiscoEvt.eventNode().isClient() : this;
- if (firstDiscoEvt.type() == EVT_NODE_LEFT || firstDiscoEvt.type() ==
EVT_NODE_FAILED) {
- onLeft();
-
+ if (firstDiscoEvt.type() == EVT_NODE_LEFT || firstDiscoEvt.type() ==
EVT_NODE_FAILED)
assert !firstDiscoEvt.eventNode().isLocal() : firstDiscoEvt;
- }
else
assert firstDiscoEvt.type() == EVT_NODE_JOINED ||
firstDiscoEvt.type() == EVT_DISCOVERY_CUSTOM_EVT : firstDiscoEvt;
@@ -1528,8 +1522,6 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
assert !firstDiscoEvt.eventNode().isClient() : this;
if (firstDiscoEvt.type() == EVT_NODE_LEFT || firstDiscoEvt.type() ==
EVT_NODE_FAILED) {
- onLeft();
-
exchCtx.events().warnNoAffinityNodes(cctx);
centralizedAff = cctx.affinity().onCentralizedAffinityChange(this,
crd);
@@ -1552,8 +1544,6 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
keepRebalanced(); // Still rebalanced.
- onLeft();
-
exchCtx.events().warnNoAffinityNodes(cctx);
cctx.affinity().onExchangeFreeSwitch(this);
@@ -2027,24 +2017,6 @@ public class GridDhtPartitionsExchangeFuture extends
GridDhtTopologyFutureAdapte
timeBag.finishGlobalStage("Wait partitions release latch [latch=" +
latchId + "]");
}
- /**
- *
- */
- private void onLeft() {
- for (CacheGroupContext grp : cctx.cache().cacheGroups()) {
- grp.preloader().pause();
-
- try {
- grp.unwindUndeploys();
- }
- finally {
- grp.preloader().resume();
- }
-
- cctx.exchange().exchangerUpdateHeartbeat();
- }
- }
-
/**
* @param partReleaseFut Partition release future.
* @param txTimeoutNotifyFlag If {@code true} print transaction rollback
timeout on PME notification.
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
index 8f93131415e..a8df9c74253 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java
@@ -747,7 +747,6 @@ public final class GridNearGetFuture<K, V> extends
CacheDistributedGetFutureAdap
expiryPlc != null ? expiryPlc.forAccess() : -1L,
true,
skipVals,
- cctx.deploymentEnabled(),
recovery,
null
);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
index 51a31a3ee07..03811aa6e79 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetRequest.java
@@ -125,7 +125,6 @@ public class GridNearGetRequest extends GridCacheIdMessage
implements GridCacheD
* @param taskNameHash Task name hash.
* @param createTtl New TTL to set after entry is created, -1 to leave
unchanged.
* @param accessTtl New TTL to set after entry is accessed, -1 to leave
unchanged.
- * @param addDepInfo Deployment info.
* @param txLbl Transaction label.
*/
public GridNearGetRequest(
@@ -141,7 +140,6 @@ public class GridNearGetRequest extends GridCacheIdMessage
implements GridCacheD
long accessTtl,
boolean addReader,
boolean skipVals,
- boolean addDepInfo,
boolean recovery,
@Nullable String txLbl
) {
@@ -170,7 +168,6 @@ public class GridNearGetRequest extends GridCacheIdMessage
implements GridCacheD
this.taskNameHash = taskNameHash;
this.createTtl = createTtl;
this.accessTtl = accessTtl;
- this.addDepInfo = addDepInfo;
this.txLbl = txLbl;
if (readThrough)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
index 51a5eaafbcf..6a5df13cd5a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
@@ -1073,7 +1073,6 @@ public final class GridNearLockFuture extends
GridCacheCompoundIdentityFuture<Bo
keepBinary,
clientFirst,
true,
- cctx.deploymentEnabled(),
inTx() ? tx.label() : null);
mapping.request(req);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
index 949c4d4fea8..80a84d8e32e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
@@ -107,7 +107,6 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
* @param accessTtl TTL for read operation.
* @param skipStore Skip store flag.
* @param firstClientReq {@code True} if first lock request for lock
operation sent from client node.
- * @param addDepInfo Deployment info flag.
* @param txLbl Transaction label.
*/
public GridNearLockRequest(
@@ -134,7 +133,6 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
boolean keepBinary,
boolean firstClientReq,
boolean nearCache,
- boolean addDepInfo,
@Nullable String txLbl
) {
super(
@@ -153,8 +151,7 @@ public class GridNearLockRequest extends
GridDistributedLockRequest {
txSize,
skipStore,
skipReadThrough,
- keepBinary,
- addDepInfo);
+ keepBinary);
assert topVer.compareTo(AffinityTopologyVersion.ZERO) > 0;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
index 3c5b90d8d78..16d3777ccc9 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
@@ -85,7 +85,6 @@ public class GridNearLockResponse extends
GridDistributedLockResponse {
* @param err Error.
* @param clientRemapVer {@code True} if client node should remap lock
request. If {@code compatibleRemapVer} is
* {@code true} when first request is not remapped, but all subsequent
will use remap version.
- * @param addDepInfo Deployment info.
* @param compatibleRemapVer {@code True} if remap version is compatible
with lock version.
*/
public GridNearLockResponse(
@@ -97,10 +96,9 @@ public class GridNearLockResponse extends
GridDistributedLockResponse {
int cnt,
Throwable err,
AffinityTopologyVersion clientRemapVer,
- boolean addDepInfo,
boolean compatibleRemapVer
) {
- super(cacheId, lockVer, futId, cnt, err, addDepInfo);
+ super(cacheId, lockVer, futId, cnt, err);
assert miniId != 0;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
index c49744df809..18948aa2795 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticSerializableTxPrepareFuture.java
@@ -536,7 +536,6 @@ public class GridNearOptimisticSerializableTxPrepareFuture
extends GridNearOptim
tx.taskNameHash(),
m.clientFirst(),
txNodes.size() == 1,
- tx.activeCachesDeploymentEnabled(),
tx.txState().recovery());
for (IgniteTxEntry txEntry : writes) {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
index 1858576e0d7..72c4f540b7a 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
@@ -531,7 +531,6 @@ public class GridNearOptimisticTxPrepareFuture extends
GridNearOptimisticTxPrepa
tx.taskNameHash(),
m.clientFirst(),
txMapping.transactionNodes().size() == 1,
- tx.activeCachesDeploymentEnabled(),
tx.txState().recovery());
for (IgniteTxEntry txEntry : m.entries()) {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
index 76a45612e85..757cc77b21c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
@@ -237,7 +237,6 @@ public class GridNearPessimisticTxPrepareFuture extends
GridNearTxPrepareFutureA
tx.taskNameHash(),
false,
true,
- tx.activeCachesDeploymentEnabled(),
tx.txState().recovery());
for (IgniteTxEntry txEntry : writes) {
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
index 771e77df9cd..8d3b160ef7e 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearSingleGetRequest.java
@@ -103,7 +103,6 @@ public class GridNearSingleGetRequest extends
GridCacheIdMessage implements Grid
* @param accessTtl New TTL to set after entry is accessed, -1 to leave
unchanged.
* @param addReader Add reader flag.
* @param needVer {@code True} if entry version is needed.
- * @param addDepInfo Deployment info.
* @param txLbl Transaction label.
*/
public GridNearSingleGetRequest(
@@ -118,7 +117,6 @@ public class GridNearSingleGetRequest extends
GridCacheIdMessage implements Grid
boolean skipVals,
boolean addReader,
boolean needVer,
- boolean addDepInfo,
boolean recovery,
@Nullable String txLbl
) {
@@ -131,7 +129,6 @@ public class GridNearSingleGetRequest extends
GridCacheIdMessage implements Grid
this.taskNameHash = taskNameHash;
this.createTtl = createTtl;
this.accessTtl = accessTtl;
- this.addDepInfo = addDepInfo;
this.txLbl = txLbl;
if (readThrough)
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
index 68c4bc9331f..407a46ddee6 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
@@ -404,8 +404,7 @@ public class GridNearTransactionalCache<K, V> extends
GridNearCacheAdapter<K, V>
GridNearUnlockRequest req = map.get(primary);
if (req == null) {
- map.put(primary, req = new
GridNearUnlockRequest(ctx.cacheId(), keyCnt,
- ctx.deploymentEnabled()));
+ map.put(primary, req = new
GridNearUnlockRequest(ctx.cacheId(), keyCnt));
req.version(ver);
}
@@ -521,8 +520,7 @@ public class GridNearTransactionalCache<K, V> extends
GridNearCacheAdapter<K, V>
req = map.get(primary);
if (req == null) {
- map.put(primary, req = new
GridNearUnlockRequest(ctx.cacheId(), keyCnt,
- ctx.deploymentEnabled()));
+ map.put(primary, req = new
GridNearUnlockRequest(ctx.cacheId(), keyCnt));
req.version(ver);
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
index c4049320dd6..307bdad29e4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishFuture.java
@@ -760,8 +760,7 @@ public final class GridNearTxFinishFuture<K, V> extends
GridCacheCompoundIdentit
null,
null,
null,
- tx.taskNameHash(),
- tx.activeCachesDeploymentEnabled()
+ tx.taskNameHash()
);
// If this is the primary node for the keys.
@@ -882,7 +881,6 @@ public final class GridNearTxFinishFuture<K, V> extends
GridCacheCompoundIdentit
null,
null,
0,
- tx.activeCachesDeploymentEnabled(),
!waitRemoteTxs && (tx.needReturnValue() && tx.implicit()),
waitRemoteTxs,
null);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
index 059222f3e17..fe9a9e089b3 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
@@ -58,7 +58,6 @@ public class GridNearTxFinishRequest extends
GridDistributedTxFinishRequest {
* @param committedVers Committed versions.
* @param rolledbackVers Rolled back versions.
* @param taskNameHash Task name hash.
- * @param addDepInfo Deployment info flag.
*/
public GridNearTxFinishRequest(
IgniteUuid futId,
@@ -74,8 +73,7 @@ public class GridNearTxFinishRequest extends
GridDistributedTxFinishRequest {
GridCacheVersion baseVer,
Collection<GridCacheVersion> committedVers,
Collection<GridCacheVersion> rolledbackVers,
- int taskNameHash,
- boolean addDepInfo) {
+ int taskNameHash) {
super(
xidVer,
futId,
@@ -89,8 +87,7 @@ public class GridNearTxFinishRequest extends
GridDistributedTxFinishRequest {
baseVer,
committedVers,
rolledbackVers,
- taskNameHash,
- addDepInfo
+ taskNameHash
);
explicitLock(explicitLock);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
index 46a02f401ed..2fdb9bccf3c 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
@@ -107,7 +107,6 @@ public class GridNearTxPrepareRequest extends
GridDistributedTxPrepareRequest {
* @param taskNameHash Task name hash.
* @param firstClientReq {@code True} if first optimistic tx prepare
request sent from client node.
* @param allowWaitTopFut {@code True} if it is safe for first client
request to wait for topology future.
- * @param addDepInfo Deployment info flag.
*/
public GridNearTxPrepareRequest(
IgniteUuid futId,
@@ -126,7 +125,6 @@ public class GridNearTxPrepareRequest extends
GridDistributedTxPrepareRequest {
int taskNameHash,
boolean firstClientReq,
boolean allowWaitTopFut,
- boolean addDepInfo,
boolean recovery
) {
super(tx,
@@ -136,8 +134,7 @@ public class GridNearTxPrepareRequest extends
GridDistributedTxPrepareRequest {
txNodes,
retVal,
last,
- onePhaseCommit,
- addDepInfo);
+ onePhaseCommit);
assert futId != null;
assert !firstClientReq || tx.optimistic() : tx;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
index d18aa266343..cdd0eb3af30 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/IgniteSnapshotManager.java
@@ -2388,7 +2388,7 @@ public class IgniteSnapshotManager extends
GridCacheSharedManagerAdapter
FilePageStore pageStore
) throws IgniteCheckedException {
CacheObjectContext coctx = new CacheObjectContext(ctx, grpName, null,
false,
- false, false, false, false);
+ false, false, false);
GridCacheSharedContext<?, ?> sctx =
GridCacheSharedContext.builder().build(ctx, null);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
index 075a5508ced..b8d6d0eb278 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/snapshot/dump/DumpEntrySerializer.java
@@ -97,7 +97,7 @@ public class DumpEntrySerializer {
/** */
public void kernalContext(GridKernalContext cctx) {
co = cctx.cacheObjects();
- fakeCacheObjCtx = new CacheObjectContext(cctx, null, null, false,
false, false, false, false);
+ fakeCacheObjCtx = new CacheObjectContext(cctx, null, null, false,
false, false, false);
}
/** @param keepBinary If {@code true} then return data in form of {@link
BinaryObject}. */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java
index 7b4b7e741d3..54cba990ee8 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/wal/reader/StandaloneWalRecordsIterator.java
@@ -392,7 +392,7 @@ class StandaloneWalRecordsIterator extends
AbstractWalRecordsIterator {
IgniteCacheObjectProcessor processor
) throws IgniteCheckedException {
final CacheObjectContext fakeCacheObjCtx = new CacheObjectContext(
- kernalCtx, null, null, false, false, false, false, false);
+ kernalCtx, null, null, false, false, false, false);
final int entryCnt = dataRec.entryCount();
final List<DataEntry> postProcessedEntries = new ArrayList<>(entryCnt);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java
index 9c6d6782b1c..e9cfcb2fd82 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/CacheQuery.java
@@ -712,16 +712,6 @@ public class CacheQuery<T> {
if (log.isDebugEnabled())
log.debug("Executing query [query=" + this + ", nodes=" + nodes +
']');
- if (cctx.deploymentEnabled()) {
- try {
- cctx.deploy().registerClasses(filter, rmtReducer);
- cctx.deploy().registerClasses(args);
- }
- catch (IgniteCheckedException e) {
- return new GridCacheQueryErrorFuture<>(cctx.kernalContext(),
e);
- }
- }
-
taskHash = cctx.kernalContext().job().currentTaskNameHash();
final GridCacheQueryBean bean = new GridCacheQueryBean(this,
(IgniteReducer<Object, Object>)rmtReducer,
@@ -776,9 +766,6 @@ public class CacheQuery<T> {
if (log.isDebugEnabled())
log.debug("Executing query [query=" + this + ", nodes=" + nodes +
']');
- if (cctx.deploymentEnabled())
- cctx.deploy().registerClasses(filter);
-
taskHash = cctx.kernalContext().job().currentTaskNameHash();
final GridCacheQueryManager qryMgr = cctx.queries();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
index 75b7645b039..583d3006bc4 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheDistributedQueryManager.java
@@ -191,7 +191,7 @@ public class GridCacheDistributedQueryManager<K, V> extends
GridCacheQueryManage
req.id(),
new IgniteCheckedException("Received request for
incorrect cache [expected=" + cctx.name() +
", actual=" + req.cacheName()),
- cctx.deploymentEnabled());
+ false);
sendQueryResponse(sndId, res, 0);
}
@@ -210,7 +210,7 @@ public class GridCacheDistributedQueryManager<K, V> extends
GridCacheQueryManage
U.error(log(), "Failed to run query.", e);
sendQueryResponse(sndId, new
GridCacheQueryResponse(cctx.cacheId(), req.id(), e.getCause(),
- cctx.deploymentEnabled()), 0);
+ false), 0);
if (e instanceof Error)
throw (Error)e;
@@ -417,7 +417,7 @@ public class GridCacheDistributedQueryManager<K, V> extends
GridCacheQueryManage
fut.onPage(null, null, null, e, true);
else
sendQueryResponse(qryInfo.senderId(),
- new GridCacheQueryResponse(cctx.cacheId(),
qryInfo.requestId(), e, cctx.deploymentEnabled()),
+ new GridCacheQueryResponse(cctx.cacheId(),
qryInfo.requestId(), e, false),
qryInfo.query().timeout());
return true;
@@ -427,7 +427,7 @@ public class GridCacheDistributedQueryManager<K, V> extends
GridCacheQueryManage
fut.onPage(null, null, data, null, finished);
else {
GridCacheQueryResponse res = new
GridCacheQueryResponse(cctx.cacheId(), qryInfo.requestId(),
- finished, false, cctx.deploymentEnabled());
+ finished, false);
if (qryInfo.query().type() == INDEX)
res.indexQueryMetadata(idxQryMetadata);
@@ -460,7 +460,7 @@ public class GridCacheDistributedQueryManager<K, V> extends
GridCacheQueryManage
}
else
sendQueryResponse(qryInfo.senderId(),
- new GridCacheQueryResponse(cctx.cacheId(),
qryInfo.requestId(), e, cctx.deploymentEnabled()),
+ new GridCacheQueryResponse(cctx.cacheId(),
qryInfo.requestId(), e, false),
qryInfo.query().timeout());
return true;
@@ -473,7 +473,7 @@ public class GridCacheDistributedQueryManager<K, V> extends
GridCacheQueryManage
}
else {
GridCacheQueryResponse res = new
GridCacheQueryResponse(cctx.cacheId(), qryInfo.requestId(),
- finished, qryInfo.reducer() == null, cctx.deploymentEnabled());
+ finished, qryInfo.reducer() == null);
res.data(entities != null ? entities : data);
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
index b5bb798ca40..9ab8a49a0ac 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryRequest.java
@@ -206,7 +206,7 @@ public class GridCacheQueryRequest extends
GridCacheIdMessage implements GridCac
qry.taskHash(),
cctx.affinity().affinityTopologyVersion(),
// Force deployment anyway if scan query is used.
- cctx.deploymentEnabled() || deployFilterOrTransformer,
+ deployFilterOrTransformer,
qry.isDataPageScanEnabled(),
qry.skipKeys());
}
@@ -230,7 +230,7 @@ public class GridCacheQueryRequest extends
GridCacheIdMessage implements GridCac
qry.taskHash(),
cctx.affinity().affinityTopologyVersion(),
// Force deployment anyway if scan query is used.
- cctx.deploymentEnabled() || (qry.scanFilter() != null &&
cctx.gridDeploy().enabled()),
+ qry.scanFilter() != null && cctx.gridDeploy().enabled(),
qry.isDataPageScanEnabled());
}
@@ -243,8 +243,7 @@ public class GridCacheQueryRequest extends
GridCacheIdMessage implements GridCac
static GridCacheQueryRequest cancelRequest(GridCacheContext<?, ?> cctx,
long reqId) {
return new GridCacheQueryRequest(cctx.cacheId(),
reqId,
- cctx.affinity().affinityTopologyVersion(),
- cctx.deploymentEnabled());
+ cctx.affinity().affinityTopologyVersion());
}
/**
@@ -253,18 +252,15 @@ public class GridCacheQueryRequest extends
GridCacheIdMessage implements GridCac
* @param cacheId Cache ID.
* @param id Request to cancel.
* @param topVer Topology version.
- * @param addDepInfo Deployment info flag.
*/
private GridCacheQueryRequest(
int cacheId,
long id,
- AffinityTopologyVersion topVer,
- boolean addDepInfo
+ AffinityTopologyVersion topVer
) {
this.cacheId = cacheId;
this.id = id;
this.topVer = topVer;
- this.addDepInfo = addDepInfo;
cancel = true;
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
index 0b788c42c69..b858725a6b0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryResponse.java
@@ -80,14 +80,12 @@ public class GridCacheQueryResponse extends
GridCacheIdMessage implements GridCa
* @param reqId Request id.
* @param finished Last response or not.
* @param fields Fields query or not.
- * @param addDepInfo Deployment info flag.
*/
- public GridCacheQueryResponse(int cacheId, long reqId, boolean finished,
boolean fields, boolean addDepInfo) {
+ public GridCacheQueryResponse(int cacheId, long reqId, boolean finished,
boolean fields) {
this.cacheId = cacheId;
this.reqId = reqId;
this.finished = finished;
this.fields = fields;
- this.addDepInfo = addDepInfo;
}
/**
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
index 92764327fa9..654476dc501 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
@@ -263,17 +263,6 @@ public interface IgniteInternalTx {
*/
public IgniteTxState txState();
- /**
- * @return {@code true} or {@code false} if the deployment is enabled or
disabled for all active caches involved
- * in this transaction.
- */
- public boolean activeCachesDeploymentEnabled();
-
- /**
- * @param depEnabled Flag indicating whether deployment is enabled for
caches from this transaction or not.
- */
- public void activeCachesDeploymentEnabled(boolean depEnabled);
-
/**
* Attempts to set topology version and returns the current value.
* If topology version was previously set, then it's value will
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java
index e88d6b7a7c6..0fdc10d29d0 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxImplicitSingleStateImpl.java
@@ -67,8 +67,6 @@ public class IgniteTxImplicitSingleStateImpl extends
IgniteTxLocalStateAdapter {
cacheCtx = ctx;
this.recovery = recovery;
-
- tx.activeCachesDeploymentEnabled(cacheCtx.deploymentEnabled());
}
/** {@inheritDoc} */
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
index fb9bc8b81ca..71c79fe8f9b 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
@@ -134,9 +134,6 @@ public abstract class IgniteTxLocalAdapter extends
IgniteTxAdapter implements Ig
/** Implicit transaction result. */
protected GridCacheReturn implicitRes;
- /** Flag indicating whether deployment is enabled for caches from this
transaction or not. */
- private boolean depEnabled;
-
/** */
@GridToStringInclude
protected final IgniteTxLocalState txState;
@@ -263,16 +260,6 @@ public abstract class IgniteTxLocalAdapter extends
IgniteTxAdapter implements Ig
return false;
}
- /** {@inheritDoc} */
- @Override public boolean activeCachesDeploymentEnabled() {
- return depEnabled;
- }
-
- /** {@inheritDoc} */
- @Override public void activeCachesDeploymentEnabled(boolean depEnabled) {
- this.depEnabled = depEnabled;
- }
-
/** {@inheritDoc} */
@Override public boolean isStarted() {
return txState.initialized();
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java
index 4b6ef7f77e8..319a9c38166 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxStateImpl.java
@@ -232,9 +232,6 @@ public class IgniteTxStateImpl extends
IgniteTxLocalStateAdapter {
}
else
activeCacheIds.add(cacheId);
-
- if (activeCacheIds.size() == 1)
- tx.activeCachesDeploymentEnabled(cacheCtx.deploymentEnabled());
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
index 7f00e4418d3..41783b4d815 100755
---
a/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java
@@ -4181,22 +4181,6 @@ public abstract class IgniteUtils extends CommonUtils {
return GridClassLoaderCache.classLoader(cls);
}
- /**
- * Detects class loader for given object's class.
- *
- * @param obj Object to find class loader for class of.
- * @return Class loader for given object (possibly {@code null}).
- */
- @Nullable public static ClassLoader detectObjectClassLoader(@Nullable
Object obj) {
- if (obj == null)
- return null;
-
- if (obj instanceof GridPeerDeployAware)
- return ((GridPeerDeployAware)obj).classLoader();
-
- return detectClassLoader(obj.getClass());
- }
-
/**
* Gets the peer deploy aware instance for the object with the widest
class loader.
* If collection is {@code null}, empty or contains only {@code null}s -
the peer
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
index 308b390cef1..d1e16d62729 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/binary/BinaryMarshallerSelfTest.java
@@ -2786,7 +2786,7 @@ public class BinaryMarshallerSelfTest extends
AbstractBinaryArraysTest {
BinaryObjectImpl po = marshal(simpleObject(), marsh);
- CacheObjectContext coCtx = new CacheObjectContext(newContext(), null,
null, false, false, true, false, false);
+ CacheObjectContext coCtx = new CacheObjectContext(newContext(), null,
null, false, false, true, false);
assert po.value(coCtx, false) == po.value(coCtx, false);
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
index ce8d2064f78..4642ac20064 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java
@@ -100,16 +100,6 @@ public class GridCacheConditionalDeploymentSelfTest
extends GridCommonAbstractTe
assertNull(msg.deployInfo());
}
- /**
- * @throws Exception In case of error.
- */
- @Test
- public void testAddedDeploymentInfo() throws Exception {
- GridCacheContext<?, ?> ctx = cacheContext();
-
- assertFalse(ctx.deploymentEnabled());
- }
-
/**
* @return Cache context.
*/
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
index 56f9bb9fde3..947539d0a29 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/distributed/replicated/preloader/GridCacheReplicatedPreloadSelfTest.java
@@ -32,7 +32,6 @@ import javax.cache.event.CacheEntryListener;
import org.apache.ignite.Ignite;
import org.apache.ignite.IgniteCache;
import org.apache.ignite.IgniteMessaging;
-import org.apache.ignite.binary.BinaryObject;
import org.apache.ignite.cache.CacheEntryEventSerializableFilter;
import org.apache.ignite.cache.CachePeekMode;
import org.apache.ignite.cache.CacheRebalanceMode;
@@ -42,7 +41,6 @@ import org.apache.ignite.configuration.IgniteConfiguration;
import org.apache.ignite.events.Event;
import org.apache.ignite.events.EventType;
import org.apache.ignite.internal.IgniteKernal;
-import org.apache.ignite.internal.binary.BinaryUtils;
import org.apache.ignite.internal.processors.cache.GridCacheAdapter;
import org.apache.ignite.internal.processors.cache.GridCacheEntryEx;
import org.apache.ignite.internal.util.lang.GridAbsPredicate;
@@ -281,77 +279,6 @@ public class GridCacheReplicatedPreloadSelfTest extends
GridCommonAbstractTest {
}
}
- /**
- * @throws Exception If test failed.
- */
- @Test
- public void testDeployment() throws Exception {
- // TODO GG-11141.
- if (true)
- return;
-
- preloadMode = SYNC;
-
- try {
- Ignite g1 = startGrid(1);
- Ignite g2 = startGrid(2);
-
- IgniteCache<Integer, Object> cache1 = g1.cache(DEFAULT_CACHE_NAME);
- IgniteCache<Integer, Object> cache2 = g2.cache(DEFAULT_CACHE_NAME);
-
- ClassLoader ldr = grid(1).configuration().getClassLoader();
-
- Object v1 =
ldr.loadClass("org.apache.ignite.tests.p2p.CacheDeploymentTestValue3").newInstance();
-
- cache1.put(1, v1);
-
- info("Stored value in cache1 [v=" + v1 + ", ldr=" +
v1.getClass().getClassLoader() + ']');
-
- Object v2 = cache2.get(1);
-
- info("Read value from cache2 [v=" + v2 + ", ldr=" +
v2.getClass().getClassLoader() + ']');
-
- assert v2 != null;
- assert v2.toString().equals(v1.toString());
- assert
!v2.getClass().getClassLoader().equals(getClass().getClassLoader());
-
- Object e1 =
ldr.loadClass("org.apache.ignite.tests.p2p.CacheDeploymentTestEnumValue").getEnumConstants()[0];
-
- cache1.put(2, e1);
-
- Object e2 = cache2.get(2);
-
- BinaryObject enumObj =
(BinaryObject)cache2.withKeepBinary().get(2);
-
- assertEquals(0, enumObj.enumOrdinal());
- assertTrue(enumObj.type().isEnum());
- assertTrue(BinaryUtils.isBinaryEnumObject(enumObj));
-
- assert e2 != null;
- assert e2.toString().equals(e1.toString());
- assert
!e2.getClass().getClassLoader().equals(getClass().getClassLoader());
-
- stopGrid(1);
-
- Ignite g3 = startGrid(3);
-
- IgniteCache<Integer, Object> cache3 = g3.cache(DEFAULT_CACHE_NAME);
-
- Object v3 = cache3.localPeek(1, CachePeekMode.ONHEAP);
-
- assert v3 != null;
-
- info("Read value from cache3 [v=" + v3 + ", ldr=" +
v3.getClass().getClassLoader() + ']');
-
- assert v3 != null;
- assert v3.toString().equals(v1.toString());
- assert
!v3.getClass().getClassLoader().equals(getClass().getClassLoader());
- }
- finally {
- stopAllGrids();
- }
- }
-
/**
* @throws Exception If test failed.
*/
