Repository: ignite Updated Branches: refs/heads/ignite-5075 c15749d97 -> 0f8c69aa4
ignite-5075 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0f8c69aa Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0f8c69aa Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0f8c69aa Branch: refs/heads/ignite-5075 Commit: 0f8c69aa433957deabd9cf3244c8104d2d87a483 Parents: c15749d Author: sboikov <[email protected]> Authored: Thu May 25 16:13:58 2017 +0300 Committer: sboikov <[email protected]> Committed: Thu May 25 16:13:58 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/GridCacheMapEntry.java | 39 ++++---------------- .../distributed/dht/GridDhtCacheEntry.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 7 +++- .../continuous/CacheContinuousQueryManager.java | 2 +- 4 files changed, 16 insertions(+), 34 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0f8c69aa/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 17a7680..95abd86 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 @@ -17,7 +17,6 @@ package org.apache.ignite.internal.processors.cache; -import java.nio.ByteBuffer; import java.util.ArrayList; import java.util.Collection; import java.util.Collections; @@ -76,7 +75,6 @@ import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteBiTuple; -import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; import static org.apache.ignite.events.EventType.EVT_CACHE_OBJECT_EXPIRED; @@ -984,7 +982,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme if (cctx.deferredDelete() && deletedUnlocked() && !isInternal() && !detached()) deletedUnlocked(false); - updateCntr0 = nextPartCounter(topVer); + updateCntr0 = nextPartitionCounter(); if (updateCntr != null && updateCntr != 0) updateCntr0 = updateCntr; @@ -1163,7 +1161,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme } } - updateCntr0 = nextPartCounter(topVer); + updateCntr0 = nextPartitionCounter(); if (updateCntr != null && updateCntr != 0) updateCntr0 = updateCntr; @@ -1565,7 +1563,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme updateMetrics(op, metrics); if (lsnrCol != null) { - long updateCntr = nextPartCounter(AffinityTopologyVersion.NONE); + long updateCntr = nextPartitionCounter(); cctx.continuousQueries().onEntryUpdated( lsnrCol, @@ -1725,7 +1723,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme else evtVal = (CacheObject)writeObj; - long updateCntr0 = nextPartCounter(); + long updateCntr0 = nextPartitionCounter(); if (updateCntr != null) updateCntr0 = updateCntr; @@ -2615,7 +2613,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme long updateCntr = 0; if (!preload) - updateCntr = nextPartCounter(topVer); + updateCntr = nextPartitionCounter(); if (walEnabled) { cctx.shared().wal().log(new DataRecord(new DataEntry( @@ -2673,31 +2671,10 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme /** * @return Update counter. */ - protected long nextPartCounter() { + protected long nextPartitionCounter() { return 0; } - /** - * @param topVer Topology version. - * @return Update counter. - */ - private long nextPartCounter(AffinityTopologyVersion topVer) { - long updateCntr; - - if (!cctx.isLocal() && !isNear()) { - GridDhtLocalPartition locPart = cctx.topology().localPartition(partition(), topVer, false); - - if (locPart == null) - return 0; - - updateCntr = locPart.nextUpdateCounter(); - } - else - updateCntr = 0; - - return updateCntr; - } - /** {@inheritDoc} */ @Override public synchronized GridCacheVersionedEntryEx versionedEntry(final boolean keepBinary) throws IgniteCheckedException, GridCacheEntryRemovedException { @@ -4411,7 +4388,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme ", locNodeId=" + cctx.localNodeId() + ']'; } - long updateCntr0 = entry.nextPartCounter(); + long updateCntr0 = entry.nextPartitionCounter(); if (updateCntr != null) updateCntr0 = updateCntr; @@ -4495,7 +4472,7 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme // Must persist inside synchronization in non-tx mode. cctx.store().remove(null, entry.key); - long updateCntr0 = entry.nextPartCounter(); + long updateCntr0 = entry.nextPartitionCounter(); if (updateCntr != null) updateCntr0 = updateCntr; http://git-wip-us.apache.org/repos/asf/ignite/blob/0f8c69aa/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 974a267..299ef3d 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 @@ -93,7 +93,7 @@ public class GridDhtCacheEntry extends GridDistributedCacheEntry { } /** {@inheritDoc} */ - @Override protected long nextPartCounter() { + @Override protected long nextPartitionCounter() { return locPart.nextUpdateCounter(); } http://git-wip-us.apache.org/repos/asf/ignite/blob/0f8c69aa/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 678c9c5..90fbfa4 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 @@ -922,7 +922,12 @@ public class GridDhtLocalPartition extends GridCacheConcurrentMapImpl implements * @return Next update index. */ public long nextUpdateCounter() { - return store.nextUpdateCounter(); + long nextCntr = store.nextUpdateCounter(); + +// if (grp.sharedGroup()) +// grp.onPartitionCounterUpdate(cacheId, nextCntr); + + return nextCntr; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/0f8c69aa/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java index d83c033..f913aeb 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/continuous/CacheContinuousQueryManager.java @@ -175,7 +175,7 @@ public class CacheContinuousQueryManager extends GridCacheManagerAdapter { * @param primary Primary. * @param topVer Topology version. */ - public void skipUpdateEvent(Map<UUID, CacheContinuousQueryListener> lsnrs, + private void skipUpdateEvent(Map<UUID, CacheContinuousQueryListener> lsnrs, KeyCacheObject key, int partId, long updCntr,
