Repository: ignite Updated Branches: refs/heads/ignite-1272 a8d5b990a -> 13fb3f2a6
ignite-1272: renaming of property in GridCacheMessage Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/13fb3f2a Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/13fb3f2a Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/13fb3f2a Branch: refs/heads/ignite-1272 Commit: 13fb3f2a63b2dd95d9cf812b74d812a201a82a6f Parents: a8d5b99 Author: Denis Magda <[email protected]> Authored: Fri Oct 9 09:16:07 2015 +0300 Committer: Denis Magda <[email protected]> Committed: Fri Oct 9 09:16:07 2015 +0300 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheIoManager.java | 6 ++---- .../internal/processors/cache/GridCacheMessage.java | 6 +++--- .../cache/distributed/GridCacheTxRecoveryRequest.java | 2 +- .../distributed/GridCacheTxRecoveryResponse.java | 2 +- .../cache/distributed/dht/GridDhtTxFinishRequest.java | 2 +- .../distributed/dht/GridDhtTxFinishResponse.java | 2 +- .../distributed/dht/GridDhtTxPrepareRequest.java | 2 +- .../distributed/dht/GridDhtTxPrepareResponse.java | 4 ++-- .../preloader/GridDhtPartitionsAbstractMessage.java | 2 +- .../distributed/near/GridNearTxFinishRequest.java | 2 +- .../distributed/near/GridNearTxFinishResponse.java | 2 +- .../distributed/near/GridNearTxPrepareRequest.java | 2 +- .../distributed/near/GridNearTxPrepareResponse.java | 2 +- .../cache/GridCacheConditionalDeploymentSelfTest.java | 14 ++------------ 14 files changed, 19 insertions(+), 31 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/13fb3f2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheIoManager.java ---------------------------------------------------------------------- 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 0cac67a..24a6867 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 @@ -56,8 +56,6 @@ import org.apache.ignite.internal.processors.cache.distributed.near.GridNearTxPr import org.apache.ignite.internal.util.F0; import org.apache.ignite.internal.util.GridLeanSet; import org.apache.ignite.internal.util.GridSpinReadWriteLock; -import org.apache.ignite.internal.util.future.GridFinishedFuture; -import org.apache.ignite.internal.util.lang.GridPlainRunnable; import org.apache.ignite.internal.util.typedef.CI1; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.P1; @@ -550,8 +548,8 @@ public class GridCacheIoManager extends GridCacheSharedManagerAdapter { if (depEnabled) { boolean depEnabled0; - if (msg.deploymentEnabled() != null) - depEnabled0 = msg.deploymentEnabled(); + if (msg.addDeploymentInfo() != null) + depEnabled0 = msg.addDeploymentInfo(); else { GridCacheContext ctx = cctx.cacheContext(msg.cacheId()); http://git-wip-us.apache.org/repos/asf/ignite/blob/13fb3f2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java index 5347696..2e815fd 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java @@ -81,7 +81,7 @@ public abstract class GridCacheMessage implements Message { * If the flag is not set use {@link GridCacheMessage#cacheId} to find out this information. */ @GridDirectTransient - protected Boolean depEnabled; + protected Boolean addDepInfo; /** * @return Error, if any. @@ -188,8 +188,8 @@ public abstract class GridCacheMessage implements Message { * in this message. Returns {@code null} if the flag hasn't been explicitly specified and {@link #cacheId()} has * to be use to find out whether deployment is enabled for a cache or not. */ - public Boolean deploymentEnabled() { - return depEnabled; + public Boolean addDeploymentInfo() { + return addDepInfo; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/13fb3f2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java ---------------------------------------------------------------------- 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 844e4f3..df76297 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 @@ -80,7 +80,7 @@ public class GridCacheTxRecoveryRequest extends GridDistributedBaseMessage { this.miniId = miniId; this.txNum = txNum; this.nearTxCheck = nearTxCheck; - this.depEnabled = false; + this.addDepInfo = false; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/13fb3f2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java index af80c4f..32e8fbf 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java @@ -65,7 +65,7 @@ public class GridCacheTxRecoveryResponse extends GridDistributedBaseMessage { this.miniId = miniId; this.success = success; - this.depEnabled = false; + this.addDepInfo = false; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/13fb3f2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java ---------------------------------------------------------------------- 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 5e9b2f1..0978ee5 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 @@ -159,7 +159,7 @@ public class GridDhtTxFinishRequest extends GridDistributedTxFinishRequest { this.sysInvalidate = sysInvalidate; this.subjId = subjId; this.taskNameHash = taskNameHash; - this.depEnabled = depEnabled; + this.addDepInfo = depEnabled; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/13fb3f2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java index 9c78aeb..6361299 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java @@ -69,7 +69,7 @@ public class GridDhtTxFinishResponse extends GridDistributedTxFinishResponse { assert miniId != null; this.miniId = miniId; - this.depEnabled = depEnabled; + this.addDepInfo = depEnabled; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/13fb3f2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java ---------------------------------------------------------------------- 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 64efb25..4204753 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 @@ -146,7 +146,7 @@ public class GridDhtTxPrepareRequest extends GridDistributedTxPrepareRequest { this.last = last; this.subjId = subjId; this.taskNameHash = taskNameHash; - this.depEnabled = depEnabled; + this.addDepInfo = depEnabled; invalidateNearEntries = new BitSet(dhtWrites == null ? 0 : dhtWrites.size()); http://git-wip-us.apache.org/repos/asf/ignite/blob/13fb3f2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java index e6f92c9..8d87fd1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java @@ -94,7 +94,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { this.futId = futId; this.miniId = miniId; - this.depEnabled = depEnabled; + this.addDepInfo = depEnabled; } /** @@ -113,7 +113,7 @@ public class GridDhtTxPrepareResponse extends GridDistributedTxPrepareResponse { this.futId = futId; this.miniId = miniId; - this.depEnabled = depEnabled; + this.addDepInfo = depEnabled; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/13fb3f2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java index 037511e..cad9f93 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionsAbstractMessage.java @@ -55,7 +55,7 @@ abstract class GridDhtPartitionsAbstractMessage extends GridCacheMessage { this.lastVer = lastVer; // Partitions related messages don't have objects for which deployment info has to be written. - this.depEnabled = false; + this.addDepInfo = false; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/13fb3f2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java ---------------------------------------------------------------------- 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 afde904..461a7c3 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 @@ -121,7 +121,7 @@ public class GridNearTxFinishRequest extends GridDistributedTxFinishRequest { this.topVer = topVer; this.subjId = subjId; this.taskNameHash = taskNameHash; - this.depEnabled = depEnabled; + this.addDepInfo = depEnabled; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/13fb3f2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java index 4ede5ce..0f3668d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishResponse.java @@ -74,7 +74,7 @@ public class GridNearTxFinishResponse extends GridDistributedTxFinishResponse { this.miniId = miniId; this.err = err; - this.depEnabled = false; + this.addDepInfo = false; } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/13fb3f2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java ---------------------------------------------------------------------- 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 012baa5..308ff8b 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 @@ -142,7 +142,7 @@ public class GridNearTxPrepareRequest extends GridDistributedTxPrepareRequest { this.subjId = subjId; this.taskNameHash = taskNameHash; this.firstClientReq = firstClientReq; - this.depEnabled = tx.activeCachesDeploymentEnabled(); + this.addDepInfo = tx.activeCachesDeploymentEnabled(); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/13fb3f2a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java index f515303..62faa9c 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java @@ -140,7 +140,7 @@ public class GridNearTxPrepareResponse extends GridDistributedTxPrepareResponse this.writeVer = writeVer; this.retVal = retVal; this.clientRemapVer = clientRemapVer; - this.depEnabled = depEnabled; + this.addDepInfo = depEnabled; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/13fb3f2a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheConditionalDeploymentSelfTest.java ---------------------------------------------------------------------- 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 5f82a67..3b2e224 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 @@ -17,25 +17,15 @@ package org.apache.ignite.internal.processors.cache; -import java.nio.ByteBuffer; -import java.util.ArrayList; -import java.util.Collection; import org.apache.ignite.Ignite; import org.apache.ignite.IgniteCheckedException; import org.apache.ignite.Ignition; import org.apache.ignite.configuration.CacheConfiguration; import org.apache.ignite.configuration.IgniteConfiguration; -import org.apache.ignite.internal.GridDirectCollection; -import org.apache.ignite.internal.IgniteKernal; import org.apache.ignite.internal.managers.communication.GridIoMessageFactory; -import org.apache.ignite.internal.portable.api.PortableMarshaller; import org.apache.ignite.internal.util.IgniteUtils; import org.apache.ignite.internal.util.typedef.CO; import org.apache.ignite.plugin.extensions.communication.Message; -import org.apache.ignite.plugin.extensions.communication.MessageCollectionItemType; -import org.apache.ignite.plugin.extensions.communication.MessageReader; -import org.apache.ignite.plugin.extensions.communication.MessageWriter; -import org.apache.ignite.spi.communication.GridTestMessage; import org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi; import org.apache.ignite.spi.discovery.tcp.ipfinder.TcpDiscoveryIpFinder; import org.apache.ignite.spi.discovery.tcp.ipfinder.vm.TcpDiscoveryVmIpFinder; @@ -119,7 +109,7 @@ public class GridCacheConditionalDeploymentSelfTest extends GridCommonAbstractTe assertNull(msg.deployInfo()); - msg.depEnabled = false; + msg.addDepInfo = false; IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg, grid(1).cluster().localNode().id()); @@ -136,7 +126,7 @@ public class GridCacheConditionalDeploymentSelfTest extends GridCommonAbstractTe assertNull(msg.deployInfo()); - msg.depEnabled = true; + msg.addDepInfo = true; IgniteUtils.invoke(GridCacheIoManager.class, ioMgr, "onSend", msg, grid(1).cluster().localNode().id());
