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 0C49918124 for ; Tue, 24 Nov 2015 10:30:58 +0000 (UTC) Received: (qmail 47756 invoked by uid 500); 24 Nov 2015 10:30:58 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 47682 invoked by uid 500); 24 Nov 2015 10:30:58 -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 47613 invoked by uid 99); 24 Nov 2015 10:30: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; Tue, 24 Nov 2015 10:30:57 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id A65DFE0A1A; Tue, 24 Nov 2015 10:30: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: Tue, 24 Nov 2015 10:31:03 -0000 Message-Id: <61c9315d0170407f90ade098dc6e8ee0@git.apache.org> In-Reply-To: <771c108c3e794f2eab5c3bd79fb838dc@git.apache.org> References: <771c108c3e794f2eab5c3bd79fb838dc@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/8] ignite git commit: ignite-sql-cache-stmt ignite-sql-cache-stmt Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a0a10fca Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a0a10fca Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a0a10fca Branch: refs/heads/ignite-sql-opt-2 Commit: a0a10fcae51daa327dd56a3142fea71cc6b72b20 Parents: f5ea734 Author: sboikov Authored: Tue Nov 24 13:20:26 2015 +0300 Committer: sboikov Committed: Tue Nov 24 13:20:26 2015 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/query/h2/IgniteH2Indexing.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a0a10fca/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 3fbbe36..96409f6 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 @@ -101,6 +101,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.T2; +import org.apache.ignite.internal.util.typedef.T3; 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; @@ -283,7 +284,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { }; /** */ - private final GridBoundedConcurrentLinkedHashMap, TwoStepCachedQuery> twoStepCache = + private final GridBoundedConcurrentLinkedHashMap, TwoStepCachedQuery> twoStepCache = new GridBoundedConcurrentLinkedHashMap<>(TWO_STEP_QRY_CACHE_SIZE); /** @@ -992,7 +993,7 @@ public class IgniteH2Indexing implements GridQueryIndexing { GridCacheTwoStepQuery twoStepQry; List meta; - final T2 cachedQryKey = new T2<>(space, sqlQry); + final T3 cachedQryKey = new T3<>(space, sqlQry, qry.isCollocated()); TwoStepCachedQuery cachedQry = twoStepCache.get(cachedQryKey); if (cachedQry != null) {