Repository: ignite Updated Branches: refs/heads/ignite-950-new b94da422a -> 940779ac6
IGNITE-950-new - Fixing tests. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/940779ac Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/940779ac Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/940779ac Branch: refs/heads/ignite-950-new Commit: 940779ac600bdab0856326fa71b4a6de76ea8592 Parents: b94da42 Author: Alexey Goncharuk <[email protected]> Authored: Sun Nov 1 16:44:06 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Sun Nov 1 16:44:06 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheEntryEx.java | 5 ++-- .../processors/cache/GridCacheEventManager.java | 5 ++-- .../processors/cache/GridCacheMapEntry.java | 29 +++++++++++--------- .../distributed/GridDistributedCacheEntry.java | 9 +++--- .../distributed/dht/GridDhtCacheEntry.java | 5 ++-- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +- .../cache/local/GridLocalCacheEntry.java | 16 +++++++---- .../cache/local/GridLocalLockFuture.java | 3 +- .../cache/transactions/IgniteTxManager.java | 2 +- .../processors/cache/GridCacheTestEntryEx.java | 3 +- .../loadtests/hashmap/GridHashMapLoadTest.java | 3 +- 11 files changed, 48 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/940779ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java index 20cbd34..75158a3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEntryEx.java @@ -553,8 +553,9 @@ public interface GridCacheEntryEx { public boolean tmLock(IgniteInternalTx tx, long timeout, @Nullable GridCacheVersion serOrder, - @Nullable GridCacheVersion serReadVer) - throws GridCacheEntryRemovedException, GridDistributedLockCancelledException; + @Nullable GridCacheVersion serReadVer, + boolean keepBinary + ) throws GridCacheEntryRemovedException, GridDistributedLockCancelledException; /** * Unlocks acquired lock. http://git-wip-us.apache.org/repos/asf/ignite/blob/940779ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java index 750874a..da8ed33 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEventManager.java @@ -193,7 +193,8 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { boolean hasOldVal, UUID subjId, String cloClsName, - String taskName) + String taskName, + boolean keepBinary) { IgniteInternalTx tx = owner == null ? null : cctx.tm().tx(owner.version()); @@ -210,7 +211,7 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { subjId, cloClsName, taskName, - false); + keepBinary); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/940779ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java index c8bc794..4f29761 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java @@ -1416,7 +1416,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme boolean writeThrough, boolean readThrough, boolean retval, - boolean keepPortable, + boolean keepBinary, @Nullable ExpiryPolicy expiryPlc, boolean evt, boolean metrics, @@ -1518,7 +1518,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme assert entryProcessor != null; - CacheInvokeEntry<Object, Object> entry = new CacheInvokeEntry<>(cctx, key, old, version(), keepPortable); + CacheInvokeEntry<Object, Object> entry = new CacheInvokeEntry<>(cctx, key, old, version(), keepBinary); try { Object computed = entryProcessor.process(entry, invokeArgs); @@ -1559,7 +1559,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (op == GridCacheOperation.UPDATE) { updated0 = value(updated0, updated, false); - e = new CacheLazyEntry(cctx, key, key0, old, old0, keepPortable); + e = new CacheLazyEntry(cctx, key, key0, old, old0, keepBinary); Object interceptorVal = cctx.config().getInterceptor().onBeforePut(e, updated0); @@ -1572,7 +1572,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme } } else { - e = new CacheLazyEntry(cctx, key, key0, old, old0, keepPortable); + e = new CacheLazyEntry(cctx, key, key0, old, old0, keepBinary); interceptorRes = cctx.config().getInterceptor().onBeforeRemove(e); @@ -1634,7 +1634,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.events().addEvent(partition(), key, cctx.localNodeId(), null, (GridCacheVersion)null, EVT_CACHE_OBJECT_READ, evtOld, evtOld != null || hadVal, evtOld, - evtOld != null || hadVal, subjId, transformCloClsName, taskName, keepPortable); + evtOld != null || hadVal, subjId, transformCloClsName, taskName, keepBinary); } if (cctx.events().isRecordable(EVT_CACHE_OBJECT_PUT)) { @@ -1643,7 +1643,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.events().addEvent(partition(), key, cctx.localNodeId(), null, (GridCacheVersion)null, EVT_CACHE_OBJECT_PUT, updated, updated != null, evtOld, - evtOld != null || hadVal, subjId, null, taskName, keepPortable); + evtOld != null || hadVal, subjId, null, taskName, keepBinary); } } } @@ -1675,7 +1675,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (transformCloClsName != null && cctx.events().isRecordable(EVT_CACHE_OBJECT_READ)) cctx.events().addEvent(partition(), key, cctx.localNodeId(), null, (GridCacheVersion)null, EVT_CACHE_OBJECT_READ, evtOld, evtOld != null || hadVal, evtOld, - evtOld != null || hadVal, subjId, transformCloClsName, taskName, keepPortable); + evtOld != null || hadVal, subjId, transformCloClsName, taskName, keepBinary); if (cctx.events().isRecordable(EVT_CACHE_OBJECT_REMOVED)) { if (evtOld == null) @@ -1683,7 +1683,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.events().addEvent(partition(), key, cctx.localNodeId(), null, (GridCacheVersion)null, EVT_CACHE_OBJECT_REMOVED, null, false, evtOld, evtOld != null || hadVal, subjId, null, - taskName, keepPortable); + taskName, keepBinary); } } @@ -1695,18 +1695,20 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.continuousQueries().onEntryUpdated(this, key, val, old, false); - cctx.dataStructures().onEntryUpdated(key, op == GridCacheOperation.DELETE, keepPortable); + cctx.dataStructures().onEntryUpdated(key, op == GridCacheOperation.DELETE, keepBinary); if (intercept) { if (op == GridCacheOperation.UPDATE) - cctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(cctx, key, key0, updated, updated0, keepPortable)); + cctx.config().getInterceptor().onAfterPut(new CacheLazyEntry(cctx, key, key0, updated, updated0, keepBinary)); else - cctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(cctx, key, key0, old, old0, keepPortable)); + cctx.config().getInterceptor().onAfterRemove(new CacheLazyEntry(cctx, key, key0, old, old0, keepBinary)); } } return new GridTuple3<>(res, - cctx.unwrapTemporary(interceptorRes != null ? interceptorRes.get2() : CU.value(old, cctx, false)), + cctx.unwrapTemporary(interceptorRes != null ? + interceptorRes.get2() : + cctx.cacheObjectContext().unwrapPortableIfNeeded(old, keepBinary, false)), invokeRes); } @@ -3494,7 +3496,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme expiredVal != null || hasOldBytes, null, null, - null); + null, + true); } cctx.continuousQueries().onEntryExpired(this, key, expiredVal); http://git-wip-us.apache.org/repos/asf/ignite/blob/940779ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java index a138d30..eaf6a7d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java @@ -746,8 +746,9 @@ public class GridDistributedCacheEntry extends GridCacheMapEntry { @Override public boolean tmLock(IgniteInternalTx tx, long timeout, @Nullable GridCacheVersion serOrder, - GridCacheVersion serReadVer) - throws GridCacheEntryRemovedException, GridDistributedLockCancelledException { + GridCacheVersion serReadVer, + boolean keepBinary + ) throws GridCacheEntryRemovedException, GridDistributedLockCancelledException { if (tx.local()) // Null is returned if timeout is negative and there is other lock owner. return addLocal( @@ -821,7 +822,7 @@ public class GridDistributedCacheEntry extends GridCacheMapEntry { // Event notification. cctx.events().addEvent(partition(), key, prev.nodeId(), prev, EVT_CACHE_OBJECT_UNLOCKED, val, hasVal, - val, hasVal, null, null, null); + val, hasVal, null, null, null, true); } if (owner != null && cctx.events().isRecordable(EVT_CACHE_OBJECT_LOCKED)) { @@ -829,7 +830,7 @@ public class GridDistributedCacheEntry extends GridCacheMapEntry { // Event notification. cctx.events().addEvent(partition(), key, owner.nodeId(), owner, EVT_CACHE_OBJECT_LOCKED, val, hasVal, - val, hasVal, null, null, null); + val, hasVal, null, null, null, true); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/940779ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java index 1b2d834..60410c4 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtCacheEntry.java @@ -263,8 +263,9 @@ public class GridDhtCacheEntry extends GridDistributedCacheEntry { @Override public boolean tmLock(IgniteInternalTx tx, long timeout, @Nullable GridCacheVersion serOrder, - GridCacheVersion serReadVer) - throws GridCacheEntryRemovedException, GridDistributedLockCancelledException { + GridCacheVersion serReadVer, + boolean keepBinary + ) throws GridCacheEntryRemovedException, GridDistributedLockCancelledException { if (tx.local()) { GridDhtTxLocalAdapter dhtTx = (GridDhtTxLocalAdapter)tx; http://git-wip-us.apache.org/repos/asf/ignite/blob/940779ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java ---------------------------------------------------------------------- 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 cc3d6f9..33cf22a 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 @@ -235,7 +235,7 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter<Void> this.updateReq.taskNameHash(), forceTransformBackups ? this.updateReq.invokeArguments() : null, cctx.deploymentEnabled(), - updateReq.keepBinary()); + this.updateReq.keepBinary()); mappings.put(nodeId, updateReq); } http://git-wip-us.apache.org/repos/asf/ignite/blob/940779ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java index 85ed881..0ceae20 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalCacheEntry.java @@ -84,7 +84,9 @@ public class GridLocalCacheEntry extends GridCacheMapEntry { long timeout, boolean reenter, boolean tx, - boolean implicitSingle) throws GridCacheEntryRemovedException { + boolean implicitSingle, + boolean keepBinary + ) throws GridCacheEntryRemovedException { GridCacheMvccCandidate prev; GridCacheMvccCandidate cand; GridCacheMvccCandidate owner; @@ -141,7 +143,7 @@ public class GridLocalCacheEntry extends GridCacheMapEntry { // Event notification. if (cctx.events().isRecordable(EVT_CACHE_OBJECT_LOCKED)) cctx.events().addEvent(partition(), key, cand.nodeId(), cand, EVT_CACHE_OBJECT_LOCKED, val, hasVal, - val, hasVal, null, null, null); + val, hasVal, null, null, null, keepBinary); } checkOwnerChanged(prev, owner); @@ -207,7 +209,8 @@ public class GridLocalCacheEntry extends GridCacheMapEntry { @Override public boolean tmLock(IgniteInternalTx tx, long timeout, @Nullable GridCacheVersion serOrder, - GridCacheVersion serReadVer) + GridCacheVersion serReadVer, + boolean keepBinary) throws GridCacheEntryRemovedException { GridCacheMvccCandidate cand = addLocal( tx.threadId(), @@ -217,7 +220,8 @@ public class GridLocalCacheEntry extends GridCacheMapEntry { timeout, /*reenter*/false, /*tx*/true, - tx.implicitSingle() + tx.implicitSingle(), + keepBinary ); if (cand != null) { @@ -352,7 +356,7 @@ public class GridLocalCacheEntry extends GridCacheMapEntry { // Event notification. if (cctx.events().isRecordable(EVT_CACHE_OBJECT_UNLOCKED)) cctx.events().addEvent(partition(), key, prev.nodeId(), prev, EVT_CACHE_OBJECT_UNLOCKED, val, hasVal, - val, hasVal, null, null, null); + val, hasVal, null, null, null, true); } checkOwnerChanged(prev, owner); @@ -408,7 +412,7 @@ public class GridLocalCacheEntry extends GridCacheMapEntry { // Event notification. if (cctx.events().isRecordable(EVT_CACHE_OBJECT_UNLOCKED)) cctx.events().addEvent(partition(), key, doomed.nodeId(), doomed, EVT_CACHE_OBJECT_UNLOCKED, - val, hasVal, val, hasVal, null, null, null); + val, hasVal, val, hasVal, null, null, null, true); } checkOwnerChanged(prev, owner); http://git-wip-us.apache.org/repos/asf/ignite/blob/940779ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java index cb14b4c..64820ef 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/local/GridLocalLockFuture.java @@ -230,7 +230,8 @@ public final class GridLocalLockFuture<K, V> extends GridFutureAdapter<Boolean> timeout, !inTx(), inTx(), - implicitSingle() + implicitSingle(), + true ); entries.add(entry); http://git-wip-us.apache.org/repos/asf/ignite/blob/940779ac/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java index c1e9202..e5b0ed2 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxManager.java @@ -1404,7 +1404,7 @@ public class IgniteTxManager extends GridCacheSharedManagerAdapter { assert serReadVer == null || (tx.optimistic() && tx.serializable()) : txEntry1; - if (!entry1.tmLock(tx, timeout, serOrder, serReadVer)) { + if (!entry1.tmLock(tx, timeout, serOrder, serReadVer, txEntry1.keepBinary())) { // Unlock locks locked so far. for (IgniteTxEntry txEntry2 : entries) { if (txEntry2 == txEntry1) http://git-wip-us.apache.org/repos/asf/ignite/blob/940779ac/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java index 5bd4f9b..ca17867 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheTestEntryEx.java @@ -582,7 +582,8 @@ public class GridCacheTestEntryEx extends GridMetadataAwareAdapter implements Gr @Override public boolean tmLock(IgniteInternalTx tx, long timeout, @Nullable GridCacheVersion serOrder, - GridCacheVersion serReadVer) { + GridCacheVersion serReadVer, + boolean keepBinary) { assert false; return false; } http://git-wip-us.apache.org/repos/asf/ignite/blob/940779ac/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java index a6dfc9c..a41f6c8 100644 --- a/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java +++ b/modules/core/src/test/java/org/apache/ignite/loadtests/hashmap/GridHashMapLoadTest.java @@ -85,7 +85,8 @@ public class GridHashMapLoadTest extends GridCommonAbstractTest { @Override public boolean tmLock(IgniteInternalTx tx, long timeout, @Nullable GridCacheVersion serOrder, - GridCacheVersion serReadVer) { + GridCacheVersion serReadVer, + boolean keepBinary) { return false; }
