ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [47/50] [abbrv] ignite git commit: Restore cache query indexed types.
Date Thu, 08 Sep 2016 04:47:04 GMT
Restore cache query indexed types.


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

Branch: refs/heads/ignite-3629
Commit: 594f064f20be103ee74a4ba27362ff2ee89aca91
Parents: 4fe6862
Author: Andrey Novikov <anovikov@apache.org>
Authored: Tue Sep 6 15:01:17 2016 +0700
Committer: Andrey Novikov <anovikov@apache.org>
Committed: Tue Sep 6 15:01:17 2016 +0700

----------------------------------------------------------------------
 modules/web-console/frontend/generator/generator-java.js | 7 ++++---
 modules/web-console/frontend/generator/generator-xml.js  | 2 ++
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/594f064f/modules/web-console/frontend/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/generator/generator-java.js b/modules/web-console/frontend/generator/generator-java.js
index 43002d3..6cc3323 100644
--- a/modules/web-console/frontend/generator/generator-java.js
+++ b/modules/web-console/frontend/generator/generator-java.js
@@ -1412,8 +1412,6 @@ $generatorJava.cacheQuery = function(cache, domains, varName, res) {
     $generatorJava.property(res, varName, cache, 'sqlOnheapRowCacheSize', null, null, 10240);
     $generatorJava.property(res, varName, cache, 'longQueryWarningTimeout', null, null, 3000);
 
-    res.softEmptyLine();
-
     const indexedTypes = _.reduce(domains, (acc, domain) => {
         if (domain.queryMetadata === 'Annotations') {
             acc.push(domain.keyType);
@@ -1423,8 +1421,11 @@ $generatorJava.cacheQuery = function(cache, domains, varName, res)
{
         return acc;
     }, []);
 
-    if (indexedTypes.length > 0)
+    if (indexedTypes.length > 0) {
+        res.softEmptyLine();
+
         $generatorJava.multiparamProperty(res, varName, {indexedTypes}, 'indexedTypes', 'class');
+    }
 
     res.softEmptyLine();
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/594f064f/modules/web-console/frontend/generator/generator-xml.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/generator/generator-xml.js b/modules/web-console/frontend/generator/generator-xml.js
index 870d13f..b49b052 100644
--- a/modules/web-console/frontend/generator/generator-xml.js
+++ b/modules/web-console/frontend/generator/generator-xml.js
@@ -1153,6 +1153,8 @@ $generatorXml.cacheQuery = function(cache, domains, res) {
     const indexedTypes = _.filter(domains, (domain) => domain.queryMetadata === 'Annotations');
 
     if (indexedTypes.length > 0) {
+        res.softEmptyLine();
+
         res.startBlock('<property name="indexedTypes">');
         res.startBlock('<list>');
 


Mime
View raw message