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 2017/07/17 08:24:14 UTC

[10/24] ignite git commit: IGNITE-5744 Ignore non user caches when automatically choosing a queryable cache inside JDBC driver

IGNITE-5744 Ignore non user caches when automatically choosing a queryable cache inside JDBC driver


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/3c1749da
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/3c1749da
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/3c1749da

Branch: refs/heads/ignite-5578
Commit: 3c1749da82e663500e45a34369eac48dbbc62bdc
Parents: 689b1b6
Author: Alexander Paschenko <al...@gmail.com>
Authored: Thu Jul 13 11:25:55 2017 +0300
Committer: sboikov <sb...@gridgain.com>
Committed: Thu Jul 13 11:25:55 2017 +0300

----------------------------------------------------------------------
 .../ignite/internal/processors/cache/GridCacheProcessor.java   | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/3c1749da/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
index 85772d8..f7c6e11 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java
@@ -1668,6 +1668,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
     public IgniteCacheProxy<?, ?> getOrStartPublicCache(boolean start, boolean inclLoc) throws IgniteCheckedException {
         // Try to find started cache first.
         for (Map.Entry<String, GridCacheAdapter<?, ?>> e : caches.entrySet()) {
+            if (!e.getValue().context().userCache())
+                continue;
+
             CacheConfiguration ccfg = e.getValue().configuration();
 
             String cacheName = ccfg.getName();
@@ -1680,6 +1683,9 @@ public class GridCacheProcessor extends GridProcessorAdapter {
             for (Map.Entry<String, DynamicCacheDescriptor> e : cachesInfo.registeredCaches().entrySet()) {
                 DynamicCacheDescriptor desc = e.getValue();
 
+                if (!desc.cacheType().userCache())
+                    continue;
+
                 CacheConfiguration ccfg = desc.cacheConfiguration();
 
                 if (ccfg.getCacheMode() != LOCAL) {