Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 94DCD200B9C for ; Mon, 10 Oct 2016 14:12:59 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 935F0160AF6; Mon, 10 Oct 2016 12:12:59 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id A1B03160AF7 for ; Mon, 10 Oct 2016 14:12:58 +0200 (CEST) Received: (qmail 47054 invoked by uid 500); 10 Oct 2016 12:12:57 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 46904 invoked by uid 99); 10 Oct 2016 12:12:57 -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; Mon, 10 Oct 2016 12:12:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 3A0B5E69B2; Mon, 10 Oct 2016 12:12:57 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Mon, 10 Oct 2016 12:13:05 -0000 Message-Id: <0d9a31a512d54e76bb2e657c48801f60@git.apache.org> In-Reply-To: <1c2b871572b547e0bad93846577cf97b@git.apache.org> References: <1c2b871572b547e0bad93846577cf97b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [09/50] [abbrv] ignite git commit: ignite-db-x - minor refactor archived-at: Mon, 10 Oct 2016 12:12:59 -0000 ignite-db-x - minor refactor Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f5dd4b06 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f5dd4b06 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f5dd4b06 Branch: refs/heads/ignite-gg-8-io2-selNow Commit: f5dd4b0604e2bcf390d7c947d80eea2ec8199d82 Parents: 86925b1 Author: Sergi Vladykin Authored: Mon Sep 26 22:27:51 2016 +0300 Committer: Sergi Vladykin Committed: Mon Sep 26 22:27:51 2016 +0300 ---------------------------------------------------------------------- .../cache/database/DataStructure.java | 18 ++------- .../cache/database/tree/util/PageHandler.java | 41 ++++++++++++++------ 2 files changed, 34 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f5dd4b06/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/DataStructure.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/DataStructure.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/DataStructure.java index 4dd31e7..2242863 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/DataStructure.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/DataStructure.java @@ -136,13 +136,7 @@ public abstract class DataStructure implements PageLockListener { * @return Buffer. */ protected final ByteBuffer tryWriteLock(Page page) { - onBeforeWriteLock(page); - - ByteBuffer buf = page.tryGetForWrite(); - - onWriteLock(page, buf); - - return buf; + return PageHandler.writeLock(page, this, true); } @@ -151,7 +145,7 @@ public abstract class DataStructure implements PageLockListener { * @return Buffer. */ protected final ByteBuffer writeLock(Page page) { - return PageHandler.writeLock(page, this); + return PageHandler.writeLock(page, this, false); } /** @@ -160,9 +154,7 @@ public abstract class DataStructure implements PageLockListener { * @param dirty Dirty page. */ protected final void writeUnlock(Page page, ByteBuffer buf, boolean dirty) { - onWriteUnlock(page, buf); - - page.releaseWrite(dirty); + PageHandler.writeUnlock(page, buf, this, dirty); } /** @@ -178,9 +170,7 @@ public abstract class DataStructure implements PageLockListener { * @param buf Buffer. */ protected final void readUnlock(Page page, ByteBuffer buf) { - onReadUnlock(page, buf); - - page.releaseRead(); + PageHandler.readUnlock(page, buf, this); } /** {@inheritDoc} */ http://git-wip-us.apache.org/repos/asf/ignite/blob/f5dd4b06/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/util/PageHandler.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/util/PageHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/util/PageHandler.java index 8fbe1af..38a52c8 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/util/PageHandler.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/util/PageHandler.java @@ -91,9 +91,7 @@ public abstract class PageHandler { return h.run(page, io, buf, arg, intArg); } finally { - lockListener.onReadUnlock(page, buf); - - page.releaseRead(); + readUnlock(page, buf, lockListener); } } @@ -151,13 +149,25 @@ public abstract class PageHandler { /** * @param page Page. + * @param buf Page buffer. + * @param lockListener Lock listener. + */ + public static void readUnlock(Page page, ByteBuffer buf, PageLockListener lockListener) { + lockListener.onReadUnlock(page, buf); + + page.releaseRead(); + } + + /** + * @param page Page. * @param lockListener Lock listener. + * @param tryLock Only try to lock without waiting. * @return Byte buffer or {@code null} if failed to lock due to recycling. */ - public static ByteBuffer writeLock(Page page, PageLockListener lockListener) { + public static ByteBuffer writeLock(Page page, PageLockListener lockListener, boolean tryLock) { lockListener.onBeforeWriteLock(page); - ByteBuffer buf = page.getForWrite(); + ByteBuffer buf = tryLock ? page.tryGetForWrite() : page.getForWrite(); lockListener.onWriteLock(page, buf); @@ -166,6 +176,18 @@ public abstract class PageHandler { /** * @param page Page. + * @param buf Page buffer. + * @param lockListener Lock listener. + * @param dirty Page is dirty. + */ + public static void writeUnlock(Page page, ByteBuffer buf, PageLockListener lockListener, boolean dirty) { + lockListener.onWriteUnlock(page, buf); + + page.releaseWrite(dirty); + } + + /** + * @param page Page. * @param lockListener Lock listener. * @param h Handler. * @param init IO for new page initialization or {@code null} if it is an existing page. @@ -185,7 +207,7 @@ public abstract class PageHandler { int intArg, R lockFailed ) throws IgniteCheckedException { - ByteBuffer buf = writeLock(page, lockListener); + ByteBuffer buf = writeLock(page, lockListener, false); if (buf == null) return lockFailed; @@ -207,11 +229,8 @@ public abstract class PageHandler { finally { assert PageIO.getCrc(buf) == 0; //TODO GG-11480 - if (h.releaseAfterWrite(page, arg, intArg)) { - lockListener.onWriteUnlock(page, buf); - - page.releaseWrite(ok); - } + if (h.releaseAfterWrite(page, arg, intArg)) + writeUnlock(page, buf, lockListener, ok); } return res;