You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2015/11/24 11:31:03 UTC
[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 <sb...@gridgain.com>
Authored: Tue Nov 24 13:20:26 2015 +0300
Committer: sboikov <sb...@gridgain.com>
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<T2<String, String>, TwoStepCachedQuery> twoStepCache =
+ private final GridBoundedConcurrentLinkedHashMap<T3<String, String, Boolean>, TwoStepCachedQuery> twoStepCache =
new GridBoundedConcurrentLinkedHashMap<>(TWO_STEP_QRY_CACHE_SIZE);
/**
@@ -992,7 +993,7 @@ public class IgniteH2Indexing implements GridQueryIndexing {
GridCacheTwoStepQuery twoStepQry;
List<GridQueryFieldMetadata> meta;
- final T2<String, String> cachedQryKey = new T2<>(space, sqlQry);
+ final T3<String, String, Boolean> cachedQryKey = new T3<>(space, sqlQry, qry.isCollocated());
TwoStepCachedQuery cachedQry = twoStepCache.get(cachedQryKey);
if (cachedQry != null) {