Repository: incubator-ignite Updated Branches: refs/heads/ignite-746-1 cac5072f1 -> b6efeab0a
# ignite-746-1 removed timeout for atomic futures Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/b6efeab0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/b6efeab0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/b6efeab0 Branch: refs/heads/ignite-746-1 Commit: b6efeab0a71d2bacb58c25e333677f7f5776f1af Parents: cac5072 Author: sboikov <sboi...@gridgain.com> Authored: Thu Apr 16 18:04:19 2015 +0300 Committer: sboikov <sboi...@gridgain.com> Committed: Thu Apr 16 18:04:19 2015 +0300 ---------------------------------------------------------------------- .../cache/distributed/dht/atomic/GridDhtAtomicUpdateFuture.java | 5 ----- .../distributed/dht/atomic/GridNearAtomicUpdateFuture.java | 5 ----- 2 files changed, 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6efeab0/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 f6aa5b6..40ab104 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 @@ -86,9 +86,6 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter<Void> /** Future keys. */ private Collection<KeyCacheObject> keys; - /** Future map time. */ - private volatile long mapTime; - /** * @param cctx Cache context. * @param completionCb Callback to invoke when future is completed. @@ -314,8 +311,6 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter<Void> * Sends requests to remote nodes. */ public void map() { - mapTime = U.currentTimeMillis(); - if (!mappings.isEmpty()) { for (GridDhtAtomicUpdateRequest req : mappings.values()) { try { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/b6efeab0/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 6ea326c..974a197 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 @@ -136,9 +136,6 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> /** Task name hash. */ private final int taskNameHash; - /** Map time. */ - private volatile long mapTime; - /** * @param cctx Cache context. * @param cache Cache instance. @@ -439,8 +436,6 @@ public class GridNearAtomicUpdateFuture extends GridFutureAdapter<Object> return; } - mapTime = U.currentTimeMillis(); - if (!remap && (cctx.config().getAtomicWriteOrderMode() == CLOCK || syncMode != FULL_ASYNC)) cctx.mvcc().addAtomicFuture(version(), this); }
