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 A5F19200D2A for ; Fri, 13 Oct 2017 19:42:51 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id A49311609E9; Fri, 13 Oct 2017 17:42:51 +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 C6753160C00 for ; Fri, 13 Oct 2017 19:42:49 +0200 (CEST) Received: (qmail 94398 invoked by uid 500); 13 Oct 2017 17:42:49 -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 93687 invoked by uid 99); 13 Oct 2017 17:42:48 -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, 13 Oct 2017 17:42:48 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8B174DFF4E; Fri, 13 Oct 2017 17:42:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: yzhdanov@apache.org To: commits@ignite.apache.org Date: Fri, 13 Oct 2017 17:43:19 -0000 Message-Id: In-Reply-To: <923551ea2bf0464f812c292ff76fcc2a@git.apache.org> References: <923551ea2bf0464f812c292ff76fcc2a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [34/50] [abbrv] ignite git commit: IGNITE-6466 Fixed testGetForInitialWrite - Fixes #2721. archived-at: Fri, 13 Oct 2017 17:42:51 -0000 IGNITE-6466 Fixed testGetForInitialWrite - Fixes #2721. Signed-off-by: Alexey Goncharuk Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/98afbfda Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/98afbfda Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/98afbfda Branch: refs/heads/ignite-2.1.5-p1 Commit: 98afbfdab47112cbae722a7317d1af39472e1f88 Parents: 1ccdc97 Author: dpavlov Authored: Fri Sep 22 13:47:14 2017 +0300 Committer: Alexey Goncharuk Committed: Fri Sep 22 13:49:44 2017 +0300 ---------------------------------------------------------------------- .../processors/cache/persistence/tree/io/DataPageIO.java | 6 +++--- .../internal/processors/cache/persistence/tree/io/PageIO.java | 2 +- .../IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java | 4 +++- 3 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/98afbfda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java index e6876a1..628ff38 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/DataPageIO.java @@ -68,8 +68,8 @@ public class DataPageIO extends PageIO { /** */ private static final int FIRST_ENTRY_OFF = INDIRECT_CNT_OFF + 1; - /** */ - private static final int ITEMS_OFF = FIRST_ENTRY_OFF + 2; + /** Offset of items (internal page pointers) within data page */ + public static final int ITEMS_OFF = FIRST_ENTRY_OFF + 2; /** */ private static final int ITEM_SIZE = 2; @@ -1445,7 +1445,7 @@ public class DataPageIO extends PageIO { /** {@inheritDoc} */ @Override protected void printPage(long addr, int pageSize, GridStringBuilder sb) throws IgniteCheckedException { sb.a("DataPageIO [\n"); - printPageLayout(addr, 0, sb); + printPageLayout(addr, pageSize, sb); sb.a("\n]"); } http://git-wip-us.apache.org/repos/asf/ignite/blob/98afbfda/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java index 57339a1..b51a934 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/persistence/tree/io/PageIO.java @@ -550,7 +550,7 @@ public abstract class PageIO { /** * @param addr Address. - * @param pageSize + * @param pageSize Page size. * @param sb Sb. */ protected abstract void printPage(long addr, int pageSize, GridStringBuilder sb) throws IgniteCheckedException ; http://git-wip-us.apache.org/repos/asf/ignite/blob/98afbfda/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java ---------------------------------------------------------------------- diff --git a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java index 297e69f..2278981 100644 --- a/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java +++ b/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/persistence/db/file/IgnitePdsCheckpointSimulationWithRealCpDisabledTest.java @@ -235,8 +235,10 @@ public class IgnitePdsCheckpointSimulationWithRealCpDisabledTest extends GridCom try { DataPageIO.VERSIONS.latest().initNewPage(pageAddr, fullId.pageId(), mem.pageSize()); - for (int i = PageIO.COMMON_HEADER_END; i < mem.pageSize(); i++) + for (int i = PageIO.COMMON_HEADER_END + DataPageIO.ITEMS_OFF; i < mem.pageSize(); i++) PageUtils.putByte(pageAddr, i, (byte)0xAB); + + PageIO.printPage(pageAddr, mem.pageSize()); } finally { mem.writeUnlock(fullId.groupId(), fullId.pageId(), page, null, true);