Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 36D651854C for ; Tue, 11 Aug 2015 07:34:18 +0000 (UTC) Received: (qmail 85031 invoked by uid 500); 11 Aug 2015 07:27:38 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 84961 invoked by uid 500); 11 Aug 2015 07:27:38 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 84946 invoked by uid 99); 11 Aug 2015 07:27:38 -0000 Received: from Unknown (HELO spamd2-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Aug 2015 07:27:38 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd2-us-west.apache.org (ASF Mail Server at spamd2-us-west.apache.org) with ESMTP id 0F7141A9CE8 for ; Tue, 11 Aug 2015 07:27:38 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd2-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.791 X-Spam-Level: * X-Spam-Status: No, score=1.791 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd2-us-west.apache.org [10.40.0.9]) (amavisd-new, port 10024) with ESMTP id 4M6RbajoZCV1 for ; Tue, 11 Aug 2015 07:27:22 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id 962FB34A42 for ; Tue, 11 Aug 2015 07:27:13 +0000 (UTC) Received: (qmail 82872 invoked by uid 99); 11 Aug 2015 07:27:11 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 11 Aug 2015 07:27:11 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id DDEDFE35C6; Tue, 11 Aug 2015 07:27:10 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vkulichenko@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 11 Aug 2015 07:27:21 -0000 Message-Id: <8fb9e5df2fa84822b3ef257e5b610213@git.apache.org> In-Reply-To: <01fe7fc564c3447aa57a428396b623f3@git.apache.org> References: <01fe7fc564c3447aa57a428396b623f3@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [12/50] incubator-ignite git commit: IGNITE-104 - Ordered ATOMIC updates 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/f187add2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f187add2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f187add2 Branch: refs/heads/ignite-426 Commit: f187add2d9e96fda1da4ea5a98940cd4663ee355 Parents: 2d16d99 Author: Valentin Kulichenko Authored: Thu Jul 30 16:59:48 2015 -0700 Committer: Valentin Kulichenko Committed: Thu Jul 30 16:59:48 2015 -0700 ---------------------------------------------------------------------- .../distributed/dht/atomic/GridDhtAtomicCache.java | 5 +---- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 12 ------------ 2 files changed, 1 insertion(+), 16 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f187add2/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 a010baa..19c89e7 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 @@ -1182,9 +1182,6 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { e.printStackTrace(); } finally { - if (dhtFut != null && !remap) - dhtFut.map(); - if (locked != null) unlockEntries(locked, req.topologyVersion()); @@ -1228,7 +1225,7 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { else { // If there are backups, map backup update future. if (dhtFut != null) - dhtFut.onMapped(); + dhtFut.map(); // Otherwise, complete the call. else completionCb.apply(req, res); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f187add2/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 c05f4c6..eb1b42c 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 @@ -90,9 +90,6 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter /** */ private boolean waitForExchange; - /** */ - private boolean mapped; - /** * @param cctx Cache context. * @param completionCb Callback to invoke when future is completed. @@ -385,15 +382,6 @@ public class GridDhtAtomicUpdateFuture extends GridFutureAdapter } } - mapped = true; - } - - /** - * On mapped callback. - */ - public void onMapped() { - assert mapped; - checkComplete(); // Send response right away if no ACKs from backup is required.