Repository: ignite Updated Branches: refs/heads/ignite-950-new bc976b434 -> e33fa6342
Ignite-950 - taking into account keepBinary for events. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e33fa634 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e33fa634 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e33fa634 Branch: refs/heads/ignite-950-new Commit: e33fa634291d8255e40614ba1f761187b3af923c Parents: bc976b4 Author: Alexey Goncharuk <[email protected]> Authored: Wed Oct 28 13:12:21 2015 +0300 Committer: Alexey Goncharuk <[email protected]> Committed: Wed Oct 28 13:12:21 2015 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheAdapter.java | 6 ++--- .../processors/cache/GridCacheEventManager.java | 22 +++++++++++------- .../cache/GridCacheEvictionManager.java | 5 ++-- .../processors/cache/GridCacheMapEntry.java | 24 ++++++++++++-------- .../processors/cache/GridCacheSwapManager.java | 21 ++++++++++------- .../distributed/dht/GridDhtLocalPartition.java | 3 ++- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../dht/preloader/GridDhtForceKeysFuture.java | 2 +- .../preloader/GridDhtPartitionDemandPool.java | 2 +- 10 files changed, 53 insertions(+), 36 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/e33fa634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java index 41c3dc9..cd7a505 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 @@ -945,13 +945,13 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V if (doomed != null && ctx.events().isRecordable(EVT_CACHE_ENTRY_DESTROYED)) // Event notification. ctx.events().addEvent(doomed.partition(), doomed.key(), locNodeId, (IgniteUuid)null, null, - EVT_CACHE_ENTRY_DESTROYED, null, false, null, false, null, null, null); + EVT_CACHE_ENTRY_DESTROYED, null, false, null, false, null, null, null, false); if (created != null) { // Event notification. if (ctx.events().isRecordable(EVT_CACHE_ENTRY_CREATED)) ctx.events().addEvent(created.partition(), created.key(), locNodeId, (IgniteUuid)null, null, - EVT_CACHE_ENTRY_CREATED, null, false, null, false, null, null, null); + EVT_CACHE_ENTRY_CREATED, null, false, null, false, null, null, null, false); if (touch) ctx.evicts().touch(cur, topVer); @@ -1046,7 +1046,7 @@ public abstract class GridCacheAdapter<K, V> implements IgniteInternalCache<K, V if (ctx.events().isRecordable(EVT_CACHE_ENTRY_DESTROYED)) // Event notification. ctx.events().addEvent(entry.partition(), entry.key(), locNodeId, (IgniteUuid)null, null, - EVT_CACHE_ENTRY_DESTROYED, null, false, null, false, null, null, null); + EVT_CACHE_ENTRY_DESTROYED, null, false, null, false, null, null, null, false); } else if (log.isDebugEnabled()) log.debug("Remove will not be done for key (obsolete entry got replaced or removed): " + key); http://git-wip-us.apache.org/repos/asf/ignite/blob/e33fa634/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 1f84e0a..750874a 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 @@ -98,7 +98,8 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { hasOldVal, subjId, cloClsName, - taskName); + taskName, + false); } /** @@ -118,7 +119,8 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { false, null, null, - null); + null, + false); } /** @@ -148,7 +150,8 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { boolean hasOldVal, UUID subjId, String cloClsName, - String taskName) + String taskName, + boolean keepPortable) { addEvent(part, key, @@ -161,7 +164,8 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { hasOldVal, subjId, cloClsName, - taskName); + taskName, + keepPortable); } /** @@ -205,7 +209,8 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { hasOldVal, subjId, cloClsName, - taskName); + taskName, + false); } /** @@ -236,7 +241,8 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { boolean hasOldVal, UUID subjId, @Nullable String cloClsName, - @Nullable String taskName + @Nullable String taskName, + boolean keepPortable ) { assert key != null || type == EVT_CACHE_STARTED || type == EVT_CACHE_STOPPED; @@ -265,9 +271,9 @@ public class GridCacheEventManager extends GridCacheManagerAdapter { key == null ? null : key.value(cctx.cacheObjectContext(), false), xid, lockId, - newVal == null ? null : newVal.value(cctx.cacheObjectContext(), false), + cctx.cacheObjectContext().unwrapPortableIfNeeded(newVal, keepPortable, true), hasNewVal, - oldVal == null ? null : oldVal.value(cctx.cacheObjectContext(), false), + cctx.cacheObjectContext().unwrapPortableIfNeeded(oldVal, keepPortable, true), hasOldVal, subjId, cloClsName, http://git-wip-us.apache.org/repos/asf/ignite/blob/e33fa634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java index 1c34c76..5dbd4dc 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java @@ -723,7 +723,7 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter { if (recordable) cctx.events().addEvent(entry.partition(), entry.key(), cctx.nodeId(), (IgniteUuid)null, null, - EVT_CACHE_ENTRY_EVICTED, null, false, oldVal, hasVal, null, null, null); + EVT_CACHE_ENTRY_EVICTED, null, false, oldVal, hasVal, null, null, null, false); if (log.isDebugEnabled()) log.debug("Entry was evicted [entry=" + entry + ", localNode=" + cctx.nodeId() + ']'); @@ -1043,7 +1043,8 @@ public class GridCacheEvictionManager extends GridCacheManagerAdapter { if (recordable) cctx.events().addEvent(entry.partition(), entry.key(), cctx.nodeId(), (IgniteUuid)null, null, - EVT_CACHE_ENTRY_EVICTED, null, false, entry.rawGet(), entry.hasValue(), null, null, null); + EVT_CACHE_ENTRY_EVICTED, null, false, entry.rawGet(), entry.hasValue(), null, null, null, + false); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/e33fa634/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 4bf50ee..71dc40a 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 @@ -1124,7 +1124,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme val != null, evtOld, evtOld != null || hasValueUnlocked(), - subjId, null, taskName); + subjId, null, taskName, + keepPortable); } if (cctx.isLocal() || cctx.isReplicated() || (tx != null && tx.local() && !isNear())) @@ -1283,7 +1284,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme evtOld != null || hasValueUnlocked(), subjId, null, - taskName); + taskName, + keepPortable); } if (cctx.isLocal() || cctx.isReplicated() || (tx != null && tx.local() && !isNear())) @@ -1571,7 +1573,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); + evtOld != null || hadVal, subjId, transformCloClsName, taskName, keepPortable); } if (cctx.events().isRecordable(EVT_CACHE_OBJECT_PUT)) { @@ -1580,7 +1582,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); + evtOld != null || hadVal, subjId, null, taskName, keepPortable); } } } @@ -1612,7 +1614,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); + evtOld != null || hadVal, subjId, transformCloClsName, taskName, keepPortable); if (cctx.events().isRecordable(EVT_CACHE_OBJECT_REMOVED)) { if (evtOld == null) @@ -1620,7 +1622,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); + taskName, keepPortable); } } @@ -2136,7 +2138,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.events().addEvent(partition(), key, evtNodeId, null, newVer, EVT_CACHE_OBJECT_READ, evtOld, evtOld != null || hadVal, evtOld, - evtOld != null || hadVal, subjId, transformClo.getClass().getName(), taskName); + evtOld != null || hadVal, subjId, transformClo.getClass().getName(), taskName, + keepPortable); } if (newVer != null && cctx.events().isRecordable(EVT_CACHE_OBJECT_PUT)) { @@ -2145,7 +2148,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.events().addEvent(partition(), key, evtNodeId, null, newVer, EVT_CACHE_OBJECT_PUT, updated, updated != null, evtOld, - evtOld != null || hadVal, subjId, null, taskName); + evtOld != null || hadVal, subjId, null, taskName, keepPortable); } } } @@ -2225,7 +2228,8 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.events().addEvent(partition(), key, evtNodeId, null, newVer, EVT_CACHE_OBJECT_READ, evtOld, evtOld != null || hadVal, evtOld, - evtOld != null || hadVal, subjId, transformClo.getClass().getName(), taskName); + evtOld != null || hadVal, subjId, transformClo.getClass().getName(), taskName, + keepPortable); } if (newVer != null && cctx.events().isRecordable(EVT_CACHE_OBJECT_REMOVED)) { @@ -2234,7 +2238,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme cctx.events().addEvent(partition(), key, evtNodeId, null, newVer, EVT_CACHE_OBJECT_REMOVED, null, false, evtOld, evtOld != null || hadVal, - subjId, null, taskName); + subjId, null, taskName, keepPortable); } } http://git-wip-us.apache.org/repos/asf/ignite/blob/e33fa634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java index b9b7a30..7d724d3 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java @@ -667,7 +667,8 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { true, null, null, - null); + null, + false); return entry; } @@ -731,7 +732,8 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { true, null, null, - null); + null, + false); } if (cctx.config().isStatisticsEnabled()) @@ -916,7 +918,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { if (cctx.events().isRecordable(EVT_CACHE_OBJECT_FROM_OFFHEAP)) cctx.events().addEvent(part, key, cctx.nodeId(), (IgniteUuid)null, null, - EVT_CACHE_OBJECT_FROM_OFFHEAP, null, false, null, true, null, null, null); + EVT_CACHE_OBJECT_FROM_OFFHEAP, null, false, null, true, null, null, null, false); GridCacheBatchSwapEntry unswapped = new GridCacheBatchSwapEntry(key, part, @@ -1021,7 +1023,8 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { true, null, null, - null); + null, + false); } if (cctx.config().isStatisticsEnabled()) @@ -1286,7 +1289,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { if (cctx.events().isRecordable(EVT_CACHE_OBJECT_TO_OFFHEAP)) cctx.events().addEvent(part, key, cctx.nodeId(), (IgniteUuid)null, null, - EVT_CACHE_OBJECT_TO_OFFHEAP, null, false, null, true, null, null, null); + EVT_CACHE_OBJECT_TO_OFFHEAP, null, false, null, true, null, null, null, false); } else if (swapEnabled) writeToSwap(part, key, entry.marshal()); @@ -1320,7 +1323,8 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { if (cctx.events().isRecordable(EVT_CACHE_OBJECT_TO_OFFHEAP)) cctx.events().addEvent(swapEntry.partition(), swapEntry.key(), cctx.nodeId(), - (IgniteUuid)null, null, EVT_CACHE_OBJECT_TO_OFFHEAP, null, false, null, true, null, null, null); + (IgniteUuid)null, null, EVT_CACHE_OBJECT_TO_OFFHEAP, null, false, null, true, null, null, null, + false); if (qryMgr.enabled()) qryMgr.onSwap(swapEntry.key()); @@ -1342,7 +1346,8 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { if (cctx.events().isRecordable(EVT_CACHE_OBJECT_SWAPPED)) { for (GridCacheBatchSwapEntry batchSwapEntry : swapped) { cctx.events().addEvent(batchSwapEntry.partition(), batchSwapEntry.key(), cctx.nodeId(), - (IgniteUuid)null, null, EVT_CACHE_OBJECT_SWAPPED, null, false, null, true, null, null, null); + (IgniteUuid)null, null, EVT_CACHE_OBJECT_SWAPPED, null, false, null, true, null, null, null, + false); if (qryMgr.enabled()) qryMgr.onSwap(batchSwapEntry.key()); @@ -1376,7 +1381,7 @@ public class GridCacheSwapManager extends GridCacheManagerAdapter { if (cctx.events().isRecordable(EVT_CACHE_OBJECT_SWAPPED)) cctx.events().addEvent(part, key, cctx.nodeId(), (IgniteUuid) null, null, - EVT_CACHE_OBJECT_SWAPPED, null, false, null, true, null, null, null); + EVT_CACHE_OBJECT_SWAPPED, null, false, null, true, null, null, null, false); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/e33fa634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java index 4f124e6..2e10833 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java @@ -658,7 +658,8 @@ public class GridDhtLocalPartition implements Comparable<GridDhtLocalPartition>, cached.hasValue(), null, null, - null); + null, + false); } } } http://git-wip-us.apache.org/repos/asf/ignite/blob/e33fa634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ---------------------------------------------------------------------- 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 2c16534..db1a3d6 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 @@ -1173,7 +1173,7 @@ public final class GridDhtLockFuture extends GridCompoundIdentityFuture<Boolean> if (rec && !entry.isInternal()) cctx.events().addEvent(entry.partition(), entry.key(), cctx.localNodeId(), (IgniteUuid)null, null, EVT_CACHE_REBALANCE_OBJECT_LOADED, info.value(), true, null, - false, null, null, null); + false, null, null, null, false); } } catch (IgniteCheckedException e) { http://git-wip-us.apache.org/repos/asf/ignite/blob/e33fa634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java ---------------------------------------------------------------------- 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 3a33bf5..273c9f1 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 @@ -1455,7 +1455,7 @@ public final class GridDhtTxPrepareFuture extends GridCompoundFuture<IgniteInter if (rec && !entry.isInternal()) cacheCtx.events().addEvent(entry.partition(), entry.key(), cctx.localNodeId(), (IgniteUuid)null, null, EVT_CACHE_REBALANCE_OBJECT_LOADED, info.value(), true, null, - false, null, null, null); + false, null, null, null, false); if (retVal && !invoke) ret.value(cacheCtx, info.value()); http://git-wip-us.apache.org/repos/asf/ignite/blob/e33fa634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtForceKeysFuture.java ---------------------------------------------------------------------- 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 eaed424..dfa4868 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 @@ -538,7 +538,7 @@ public final class GridDhtForceKeysFuture<K, V> extends GridCompoundFuture<Objec if (rec && !entry.isInternal()) cctx.events().addEvent(entry.partition(), entry.key(), cctx.localNodeId(), (IgniteUuid)null, null, EVT_CACHE_REBALANCE_OBJECT_LOADED, info.value(), true, null, - false, null, null, null); + false, null, null, null, false); } } catch (IgniteCheckedException e) { http://git-wip-us.apache.org/repos/asf/ignite/blob/e33fa634/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java index e993a88..e1ca25b 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/preloader/GridDhtPartitionDemandPool.java @@ -556,7 +556,7 @@ public class GridDhtPartitionDemandPool { if (cctx.events().isRecordable(EVT_CACHE_REBALANCE_OBJECT_LOADED) && !cached.isInternal()) cctx.events().addEvent(cached.partition(), cached.key(), cctx.localNodeId(), (IgniteUuid)null, null, EVT_CACHE_REBALANCE_OBJECT_LOADED, entry.value(), true, null, - false, null, null, null); + false, null, null, null, false); } else if (log.isDebugEnabled()) log.debug("Rebalancing entry is already in cache (will ignore) [key=" + cached.key() +
