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 1B40018661 for ; Tue, 19 Apr 2016 12:58:20 +0000 (UTC) Received: (qmail 9079 invoked by uid 500); 19 Apr 2016 12:58:19 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 8959 invoked by uid 500); 19 Apr 2016 12:58:19 -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 8585 invoked by uid 99); 19 Apr 2016 12:58:19 -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, 19 Apr 2016 12:58:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8FA29DFF41; Tue, 19 Apr 2016 12:58:19 +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: Tue, 19 Apr 2016 12:58:41 -0000 Message-Id: <9ddce6efbcd5494196883ae2c08d14fc@git.apache.org> In-Reply-To: <4f408e32fde8498d8f180871ecbd0990@git.apache.org> References: <4f408e32fde8498d8f180871ecbd0990@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [24/50] [abbrv] ignite git commit: ignite-db - leaf ignite-db - leaf Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/43326c62 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/43326c62 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/43326c62 Branch: refs/heads/ignite-db-x-10884 Commit: 43326c6214dcb6dc531ed10f0b81a2f74bfc71e1 Parents: 8218c2d Author: S.Vladykin Authored: Wed Apr 13 00:44:41 2016 +0300 Committer: S.Vladykin Committed: Wed Apr 13 00:44:41 2016 +0300 ---------------------------------------------------------------------- .../cache/database/tree/io/BPlusLeafIO.java | 17 ++++------------- .../processors/query/h2/database/io/H2LeafIO.java | 5 ----- 2 files changed, 4 insertions(+), 18 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/43326c62/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusLeafIO.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusLeafIO.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusLeafIO.java index 73ba044..cc72a99 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusLeafIO.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/database/tree/io/BPlusLeafIO.java @@ -43,19 +43,10 @@ public abstract class BPlusLeafIO extends BPlusIO { return (buf.capacity() - ITEMS_OFF) >>> 3; // divide by ITEM_SIZE } -// /** {@inheritDoc} */ -// @Override public long getLink(ByteBuffer buf, int idx) { -// assert idx < getCount(buf): idx; -// -// return buf.getLong(offset(idx)); -// } -// -// /** {@inheritDoc} */ -// @Override public void setLink(ByteBuffer buf, int idx, long link) { -// buf.putLong(offset(idx), link); -// -// assert getLink(buf, idx) == link; -// } + /** {@inheritDoc} */ + @Override public final boolean canGetRow() { + return true; + } /** {@inheritDoc} */ @Override public void copyItems(ByteBuffer src, ByteBuffer dst, int srcIdx, int dstIdx, int cnt, http://git-wip-us.apache.org/repos/asf/ignite/blob/43326c62/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2LeafIO.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2LeafIO.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2LeafIO.java index b06d557..215d856 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2LeafIO.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/database/io/H2LeafIO.java @@ -62,11 +62,6 @@ public class H2LeafIO extends BPlusLeafIO implements H2RowLinkIO { } /** {@inheritDoc} */ - @Override public boolean canGetRow() { - return true; // We can get row from link. - } - - /** {@inheritDoc} */ @Override public long getLink(ByteBuffer buf, int idx) { assert idx < getCount(buf): idx;