Repository: incubator-ignite Updated Branches: refs/heads/ignite-104 1e98372ed -> 6c1655fbe
IGNITE-104 - Ordered ATOMIC updates Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/6c1655fb Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/6c1655fb Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/6c1655fb Branch: refs/heads/ignite-104 Commit: 6c1655fbe4c344a5f6ceb82abe6b231af57fcbed Parents: 1e98372 Author: Valentin Kulichenko <vkuliche...@gridgain.com> Authored: Thu Jul 30 17:35:15 2015 -0700 Committer: Valentin Kulichenko <vkuliche...@gridgain.com> Committed: Thu Jul 30 17:35:15 2015 -0700 ---------------------------------------------------------------------- .../cache/distributed/dht/atomic/GridDhtAtomicCache.java | 7 +------ .../distributed/dht/atomic/GridDhtAtomicUpdateFuture.java | 3 +-- .../distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 3 +-- 3 files changed, 3 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c1655fb/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 3802b29..9328932 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 @@ -2473,13 +2473,8 @@ public class GridDhtAtomicCache<K, V> extends GridDhtCacheAdapter<K, V> { if (updRes.removeVersion() != null) { if (ctx.deferredDelete()) ctx.onDeferredDelete(entry, updRes.removeVersion()); - else { - assert entry.obsolete(); - - entry.onMarkedObsolete(); - + else if (entry.markObsoleteVersion(updRes.removeVersion())) removeEntry(entry); - } } entry.onUnlock(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c1655fb/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 eb1b42c..5c22b3b 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 @@ -358,8 +358,7 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter<Void> if (part >= 0) { Object topic = new GridAtomicRequestTopic(cctx.cacheId(), part, false); - cctx.io().sendOrderedMessage(nodeId, topic, req, cctx.ioPolicy(), - 2 * cctx.gridConfig().getNetworkTimeout()); + cctx.io().sendSequentialMessage(nodeId, topic, req, cctx.ioPolicy()); } else { assert part == -1; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/6c1655fb/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 4642b1a..ff24964 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 @@ -1146,8 +1146,7 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> if (mappingKey.partition() >= 0) { Object topic = new GridAtomicRequestTopic(cctx.cacheId(), mappingKey.partition(), true); - cctx.io().sendOrderedMessage(mappingKey.nodeId(), topic, req, cctx.ioPolicy(), - 2 * cctx.gridConfig().getNetworkTimeout()); + cctx.io().sendSequentialMessage(mappingKey.nodeId(), topic, req, cctx.ioPolicy()); } else { assert mappingKey.partition() == -1;
