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 C9A4C17580 for ; Thu, 28 Jan 2016 16:17:55 +0000 (UTC) Received: (qmail 62810 invoked by uid 500); 28 Jan 2016 16:16:57 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 62773 invoked by uid 500); 28 Jan 2016 16:16: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 62762 invoked by uid 99); 28 Jan 2016 16:16: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; Thu, 28 Jan 2016 16:16:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ED47FDFF8E; Thu, 28 Jan 2016 16:16:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.apache.org Message-Id: <1f1064e1d0924171bf7e255164b0ec2c@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: Page memory integration WIP Date: Thu, 28 Jan 2016 16:16:56 +0000 (UTC) Repository: ignite Updated Branches: refs/heads/sql-store 0af910876 -> 7bec0b9c4 Page memory integration WIP Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7bec0b9c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7bec0b9c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7bec0b9c Branch: refs/heads/sql-store Commit: 7bec0b9c4d3aa99e480727b8fcd5be0198a64eda Parents: 0af9108 Author: Alexey Goncharuk Authored: Thu Jan 28 19:16:04 2016 +0300 Committer: Alexey Goncharuk Committed: Thu Jan 28 19:16:04 2016 +0300 ---------------------------------------------------------------------- .../stream/v2/DirectByteBufferStreamImplV2.java | 1 + .../processors/query/h2/IgniteH2Indexing.java | 26 +++++++++++++++++--- .../query/h2/IgniteH2QueryIndexProvider.java | 2 +- 3 files changed, 24 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7bec0b9c/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java index 1a4c4bb..8f5fac1 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/direct/stream/v2/DirectByteBufferStreamImplV2.java @@ -19,6 +19,7 @@ package org.apache.ignite.internal.direct.stream.v2; import java.lang.reflect.Array; import java.nio.ByteBuffer; +import java.nio.charset.Charset; import java.util.ArrayList; import java.util.BitSet; import java.util.Collection; http://git-wip-us.apache.org/repos/asf/ignite/blob/7bec0b9c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java index aa79e7c..4cd7cb6 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java @@ -104,6 +104,7 @@ import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeGuard; import org.apache.ignite.internal.util.offheap.unsafe.GridUnsafeMemory; import org.apache.ignite.internal.util.typedef.F; import org.apache.ignite.internal.util.typedef.T3; +import org.apache.ignite.internal.util.typedef.internal.CU; import org.apache.ignite.internal.util.typedef.internal.LT; import org.apache.ignite.internal.util.typedef.internal.S; import org.apache.ignite.internal.util.typedef.internal.SB; @@ -1953,7 +1954,16 @@ public class IgniteH2Indexing implements GridQueryIndexing { ArrayList idxs = new ArrayList<>(); - idxs.add(createSortedIndex("_key_PK", tbl, true, KEY_COL, VAL_COL, tbl.indexColumn(0, ASCENDING))); + int cacheId = CU.cacheId(schema.ccfg.getName()); + + idxs.add(createSortedIndex( + cacheId, + "_key_PK", + tbl, + true, + KEY_COL, + VAL_COL, + tbl.indexColumn(0, ASCENDING))); if (type().valueClass() == String.class) { try { @@ -1993,7 +2003,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { } if (idx.type() == SORTED) - idxs.add(createSortedIndex(name, tbl, false, KEY_COL, VAL_COL, cols)); + idxs.add(createSortedIndex(cacheId, name, tbl, false, KEY_COL, VAL_COL, cols)); else if (idx.type() == GEO_SPATIAL) idxs.add(createH2SpatialIndex(tbl, name, cols, KEY_COL, VAL_COL)); else @@ -2013,9 +2023,17 @@ public class IgniteH2Indexing implements GridQueryIndexing { * @param cols Columns. * @return Index. */ - private Index createSortedIndex(String name, GridH2Table tbl, boolean pk, int keyCol, int valCol, IndexColumn... cols) { + private Index createSortedIndex( + int cacheId, + String name, + GridH2Table tbl, + boolean pk, + int keyCol, + int valCol, + IndexColumn... cols + ) { if (idxProvider != null) - return idxProvider.createIndex(name, tbl, pk, keyCol, valCol, cols); + return idxProvider.createIndex(cacheId, name, tbl, pk, keyCol, valCol, cols); return new GridH2TreeIndex(name, tbl, pk, keyCol, valCol, cols); } http://git-wip-us.apache.org/repos/asf/ignite/blob/7bec0b9c/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2QueryIndexProvider.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2QueryIndexProvider.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2QueryIndexProvider.java index de8016d..3fada9b 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2QueryIndexProvider.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2QueryIndexProvider.java @@ -34,5 +34,5 @@ public interface IgniteH2QueryIndexProvider { * @param cols Index columns. * @return Created index. */ - public Index createIndex(String name, GridH2Table tbl, boolean pk, int keyCol, int valCol, IndexColumn... cols); + public Index createIndex(int cacheId, String name, GridH2Table tbl, boolean pk, int keyCol, int valCol, IndexColumn... cols); }