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 79816200B4C for ; Fri, 22 Jul 2016 08:38:16 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 781A7160A77; Fri, 22 Jul 2016 06:38:16 +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 C061F160A5A for ; Fri, 22 Jul 2016 08:38:15 +0200 (CEST) Received: (qmail 95410 invoked by uid 500); 22 Jul 2016 06:38:14 -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 95401 invoked by uid 99); 22 Jul 2016 06:38:14 -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, 22 Jul 2016 06:38:14 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6CD17E04EE; Fri, 22 Jul 2016 06:38:14 +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 Message-Id: <6f510247be554f14808245aa2dddc07a@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: ignite git commit: ignite-1232 Date: Fri, 22 Jul 2016 06:38:14 +0000 (UTC) archived-at: Fri, 22 Jul 2016 06:38:16 -0000 Repository: ignite Updated Branches: refs/heads/ignite-1232-1 d0c1821e4 -> 68571792c ignite-1232 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/68571792 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/68571792 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/68571792 Branch: refs/heads/ignite-1232-1 Commit: 68571792c49fb504124304d9cb5be1554f070e86 Parents: d0c1821 Author: sboikov Authored: Fri Jul 22 09:38:09 2016 +0300 Committer: sboikov Committed: Fri Jul 22 09:38:09 2016 +0300 ---------------------------------------------------------------------- .../ignite/examples/datagrid/CacheQueryExample.java | 4 ++-- .../internal/processors/query/h2/opt/GridH2Table.java | 13 +++++++++++-- 2 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/68571792/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java ---------------------------------------------------------------------- diff --git a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java index 2db3234..85d74e0 100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java @@ -68,7 +68,7 @@ public class CacheQueryExample { /** Organizations cache name. */ private static final String ORG_CACHE = CacheQueryExample.class.getSimpleName() + "Organizations"; - /** Persons cache name. */ + /** Persons collocated with Organizations cache name. */ private static final String COLLOCATED_PERSON_CACHE = CacheQueryExample.class.getSimpleName() + "CollocatedPersons"; /** Persons cache name. */ @@ -149,7 +149,7 @@ public class CacheQueryExample { * Example for scan query based on a predicate. */ private static void scanQuery() { - IgniteCache cache = Ignition.ignite().cache(PERSON_CACHE).withKeepBinary(); + IgniteCache cache = Ignition.ignite().cache(COLLOCATED_PERSON_CACHE).withKeepBinary(); ScanQuery scan = new ScanQuery<>( new IgniteBiPredicate() { http://git-wip-us.apache.org/repos/asf/ignite/blob/68571792/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java index e2356f1..8d080ae 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java @@ -459,9 +459,16 @@ public class GridH2Table extends TableBase { if (!snapshotEnabled) return; + releaseSnapshots0(idxs); + } + + /** + * @param idxs Indexes. + */ + private void releaseSnapshots0(ArrayList idxs) { // Release snapshots on all except first which is scan. for (int i = 1, len = idxs.size(); i < len; i++) - index(i).releaseSnapshot(); + ((GridH2IndexBase)idxs.get(i)).releaseSnapshot(); } /** @@ -641,6 +648,8 @@ public class GridH2Table extends TableBase { Lock l = lock(true, Long.MAX_VALUE); + ArrayList idxs0 = new ArrayList<>(idxs); + try { snapshotIndexes(null); // Allow read access while we are rebuilding indexes. @@ -657,7 +666,7 @@ public class GridH2Table extends TableBase { throw new IgniteInterruptedException(e); } finally { - releaseSnapshots(); + releaseSnapshots0(idxs0); unlock(l); }