Repository: ignite Updated Branches: refs/heads/ignite-4565-ddl fc294dabe -> f8a426445
Minors. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f8a42644 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f8a42644 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f8a42644 Branch: refs/heads/ignite-4565-ddl Commit: f8a426445b1f4c2f7ba865f1d55a009dc4f398b7 Parents: fc294da Author: devozerov <[email protected]> Authored: Mon Mar 13 13:31:17 2017 +0300 Committer: devozerov <[email protected]> Committed: Mon Mar 13 13:31:17 2017 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/query/GridQueryProcessor.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/f8a42644/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 5425b30..6903704 100644 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@ -193,11 +193,11 @@ public class GridQueryProcessor extends GridProcessorAdapter { } // Register candidates. - Collection<QueryTypeDescriptorImpl> typeDescs = new ArrayList<>(); - idx.registerCache(space, cctx, cctx.config()); try { + Collection<QueryTypeDescriptorImpl> typeDescs = new ArrayList<>(); + for (QueryTypeCandidate cand : cands) { QueryTypeIdKey typeId = cand.typeId(); QueryTypeIdKey altTypeId = cand.alternativeTypeId(); @@ -216,6 +216,8 @@ public class GridQueryProcessor extends GridProcessorAdapter { typeDescs.add(desc); } + + idxHnd.onCacheCreated(cctx.name(), typeDescs); } catch (IgniteCheckedException | RuntimeException e) { unregisterCache0(space); @@ -223,8 +225,6 @@ public class GridQueryProcessor extends GridProcessorAdapter { throw e; } - idxHnd.onCacheCreated(cctx.name(), typeDescs); - // Warn about possible implicit deserialization. if (!mustDeserializeClss.isEmpty()) { U.warn(log, "Some classes in query configuration cannot be written in binary format " +
