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 B4FA4180A2 for ; Fri, 31 Jul 2015 00:26:16 +0000 (UTC) Received: (qmail 90743 invoked by uid 500); 31 Jul 2015 00:26:16 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 90705 invoked by uid 500); 31 Jul 2015 00:26:16 -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 90692 invoked by uid 99); 31 Jul 2015 00:26:16 -0000 Received: from Unknown (HELO spamd4-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 31 Jul 2015 00:26:16 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd4-us-west.apache.org (ASF Mail Server at spamd4-us-west.apache.org) with ESMTP id 2CE35C0B76 for ; Fri, 31 Jul 2015 00:26:16 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd4-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.771 X-Spam-Level: * X-Spam-Status: No, score=1.771 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, T_RP_MATCHES_RCVD=-0.01, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-west.apache.org ([10.40.0.8]) by localhost (spamd4-us-west.apache.org [10.40.0.11]) (amavisd-new, port 10024) with ESMTP id 4bWMJt8r8QQV for ; Fri, 31 Jul 2015 00:26:08 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-west.apache.org (ASF Mail Server at mx1-us-west.apache.org) with SMTP id 915742142D for ; Fri, 31 Jul 2015 00:26:08 +0000 (UTC) Received: (qmail 89974 invoked by uid 99); 31 Jul 2015 00:26:08 -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; Fri, 31 Jul 2015 00:26:08 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 52F96E7157; Fri, 31 Jul 2015 00:26:08 +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: Fri, 31 Jul 2015 00:26:12 -0000 Message-Id: <283f4de10dd54f47a5b487f41e49d891@git.apache.org> In-Reply-To: <64362d3f6f1b4898b7b50ac01493cdba@git.apache.org> References: <64362d3f6f1b4898b7b50ac01493cdba@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [5/5] 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/1e98372e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/1e98372e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/1e98372e Branch: refs/heads/ignite-104 Commit: 1e98372edca990804d1686521fd152c0549baa2c Parents: f187add Author: Valentin Kulichenko Authored: Thu Jul 30 17:24:48 2015 -0700 Committer: Valentin Kulichenko Committed: Thu Jul 30 17:24:48 2015 -0700 ---------------------------------------------------------------------- .../internal/processors/cache/GridCacheMapEntry.java | 5 ----- .../distributed/dht/atomic/GridDhtAtomicCache.java | 9 +++------ .../cache/distributed/near/GridNearAtomicCache.java | 14 ++++---------- 3 files changed, 7 insertions(+), 21 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e98372e/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 79d7989..5d2af9a 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 @@ -2161,9 +2161,6 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme } } - if (!cctx.deferredDelete()) - markObsolete0(rmvVer, true); - res = hadVal; } @@ -2458,8 +2455,6 @@ public abstract class GridCacheMapEntry extends GridMetadataAwareAdapter impleme /** {@inheritDoc} */ @Override public boolean markObsoleteVersion(GridCacheVersion ver) { - assert cctx.deferredDelete(); - boolean marked; synchronized (this) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e98372e/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 19c89e7..3802b29 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 @@ -1177,7 +1177,7 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { } } catch (GridCacheEntryRemovedException e) { - assert !ctx.deferredDelete() : "Entry should not become obsolete while holding lock."; + assert false : "Entry should not become obsolete while holding lock."; e.printStackTrace(); } @@ -1196,11 +1196,8 @@ public class GridDhtAtomicCache extends GridDhtCacheAdapter { else { GridDhtCacheEntry entry = e.get1(); - assert entry.obsolete(); - - entry.onMarkedObsolete(); - - removeEntry(entry); + if (entry.markObsoleteVersion(e.get2())) + removeEntry(entry); } } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/1e98372e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java index 707facc..b3f4a1d 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearAtomicCache.java @@ -245,11 +245,8 @@ public class GridNearAtomicCache extends GridNearCacheAdapter { if (ctx.deferredDelete()) ctx.onDeferredDelete(entry, updRes.removeVersion()); else { - assert entry.obsolete(); - - entry.onMarkedObsolete(); - - removeEntry(entry); + if (entry.markObsoleteVersion(updRes.removeVersion())) + removeEntry(entry); } } @@ -352,11 +349,8 @@ public class GridNearAtomicCache extends GridNearCacheAdapter { if (ctx.deferredDelete()) ctx.onDeferredDelete(entry, updRes.removeVersion()); else { - assert entry.obsolete(); - - entry.onMarkedObsolete(); - - removeEntry(entry); + if (entry.markObsoleteVersion(updRes.removeVersion())) + removeEntry(entry); } }