Delete use CLOCK for ignite-core.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a37ff761 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a37ff761 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a37ff761 Branch: refs/heads/ignite-4587 Commit: a37ff76168613007d3ca09c06688bc6456e4c330 Parents: f0dcbbd Author: Max Kozlov <[email protected]> Authored: Mon Feb 13 12:27:28 2017 +0300 Committer: Max Kozlov <[email protected]> Committed: Mon Feb 13 12:27:28 2017 +0300 ---------------------------------------------------------------------- .../dht/atomic/GridDhtAtomicCache.java | 27 +++----------------- .../GridNearAtomicAbstractUpdateFuture.java | 3 +-- .../GridNearAtomicSingleUpdateFuture.java | 17 +----------- .../dht/atomic/GridNearAtomicUpdateFuture.java | 17 +----------- 4 files changed, 7 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a37ff761/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicCache.java ---------------------------------------------------------------------- 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 940c74e..f09f073 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 @@ -106,7 +106,6 @@ import org.jsr166.ConcurrentLinkedDeque8; import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_DEFERRED_ACK_BUFFER_SIZE; import static org.apache.ignite.IgniteSystemProperties.IGNITE_ATOMIC_DEFERRED_ACK_TIMEOUT; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.DELETE; @@ -203,15 +202,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { updateReplyClos = new CI2<GridNearAtomicAbstractUpdateRequest, GridNearAtomicUpdateResponse>() { @SuppressWarnings("ThrowableResultOfMethodCallIgnored") @Override public void apply(GridNearAtomicAbstractUpdateRequest req, GridNearAtomicUpdateResponse res) { - if (ctx.config().getAtomicWriteOrderMode() == CLOCK) { - assert req.writeSynchronizationMode() != FULL_ASYNC : req; - - // Always send reply in CLOCK ordering mode. - sendNearUpdateReply(res.nodeId(), res); - - return; - } - // Request should be for primary keys only in PRIMARY ordering mode. assert req.hasPrimary() : req; @@ -1308,7 +1298,6 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { */ public boolean isFastMap(CacheEntryPredicate[] filters, GridCacheOperation op) { return F.isEmpty(filters) && op != TRANSFORM && ctx.config().getWriteSynchronizationMode() == FULL_SYNC && - ctx.config().getAtomicWriteOrderMode() == CLOCK && !(ctx.writeThrough() && ctx.config().getInterceptor() != null); } @@ -2398,7 +2387,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { true, true, primary, - ctx.config().getAtomicWriteOrderMode() == CLOCK, // Check version in CLOCK mode on primary node. + false, topVer, req.filter(), replicate ? primary ? DR_PRIMARY : DR_BACKUP : DR_NONE, @@ -2678,7 +2667,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { /*event*/true, /*metrics*/true, primary, - ctx.config().getAtomicWriteOrderMode() == CLOCK, // Check version in CLOCK mode on primary node. + false, topVer, null, replicate ? primary ? DR_PRIMARY : DR_BACKUP : DR_NONE, @@ -2825,11 +2814,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { return Collections.singletonList(entry); } catch (GridDhtInvalidPartitionException e) { - // Ignore invalid partition exception in CLOCK ordering mode. - if (ctx.config().getAtomicWriteOrderMode() == CLOCK) - return Collections.singletonList(null); - else - throw e; + throw e; } } } @@ -2844,11 +2829,7 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { locked.add(entry); } catch (GridDhtInvalidPartitionException e) { - // Ignore invalid partition exception in CLOCK ordering mode. - if (ctx.config().getAtomicWriteOrderMode() == CLOCK) - locked.add(null); - else - throw e; + throw e; } } http://git-wip-us.apache.org/repos/asf/ignite/blob/a37ff761/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicAbstractUpdateFuture.java ---------------------------------------------------------------------- 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 2fbabaa..619f3b0 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 @@ -39,7 +39,6 @@ import org.apache.ignite.internal.util.typedef.internal.U; import org.apache.ignite.lang.IgniteUuid; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC; /** @@ -245,7 +244,7 @@ public abstract class GridNearAtomicAbstractUpdateFuture extends GridFutureAdapt * @return {@code True} future is stored by {@link GridCacheMvccManager#addAtomicFuture}. */ protected boolean storeFuture() { - return cctx.config().getAtomicWriteOrderMode() == CLOCK || syncMode != FULL_ASYNC; + return syncMode != FULL_ASYNC; } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/a37ff761/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicSingleUpdateFuture.java ---------------------------------------------------------------------- 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 bd231cf..9b618c1 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 @@ -52,7 +52,6 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.lang.IgniteProductVersion; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM; /** @@ -454,21 +453,7 @@ public class GridNearAtomicSingleUpdateFuture extends GridNearAtomicAbstractUpda GridCacheVersion futVer = cctx.versions().next(topVer); - GridCacheVersion updVer; - - // Assign version on near node in CLOCK ordering mode even if fastMap is false. - if (cctx.config().getAtomicWriteOrderMode() == CLOCK) { - updVer = this.updVer; - - if (updVer == null) { - updVer = cctx.versions().next(topVer); - - if (log.isDebugEnabled()) - log.debug("Assigned fast-map version for update on near node: " + updVer); - } - } - else - updVer = null; + GridCacheVersion updVer = null; try { singleReq0 = mapSingleUpdate(topVer, futVer, updVer); http://git-wip-us.apache.org/repos/asf/ignite/blob/a37ff761/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateFuture.java ---------------------------------------------------------------------- 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 cd64117..840a805 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 @@ -58,7 +58,6 @@ import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.U; import org.jetbrains.annotations.Nullable; -import static org.apache.ignite.cache.CacheAtomicWriteOrderMode.CLOCK; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_ASYNC; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.PRIMARY_SYNC; import static org.apache.ignite.internal.processors.cache.GridCacheOperation.TRANSFORM; @@ -628,21 +627,7 @@ public class GridNearAtomicUpdateFuture extends GridNearAtomicAbstractUpdateFutu GridCacheVersion futVer = cctx.versions().next(topVer); - GridCacheVersion updVer; - - // Assign version on near node in CLOCK ordering mode even if fastMap is false. - if (cctx.config().getAtomicWriteOrderMode() == CLOCK) { - updVer = this.updVer; - - if (updVer == null) { - updVer = cctx.versions().next(topVer); - - if (log.isDebugEnabled()) - log.debug("Assigned fast-map version for update on near node: " + updVer); - } - } - else - updVer = null; + GridCacheVersion updVer = null; try { if (size == 1 && !fastMap) {
