ignite-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anovi...@apache.org
Subject [09/10] ignite git commit: IGNITE-843 Missed fields fixed domain index focus
Date Fri, 22 Jan 2016 07:14:32 GMT
IGNITE-843 Missed fields  fixed domain index focus


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

Branch: refs/heads/ignite-843-rc3
Commit: e9673013c08f0bc72ce3fc5e95e83088c968d9a0
Parents: bfd9b54
Author: Andrey <anovikov@gridgain.com>
Authored: Fri Jan 22 09:53:10 2016 +0700
Committer: Andrey <anovikov@gridgain.com>
Committed: Fri Jan 22 09:53:10 2016 +0700

----------------------------------------------------------------------
 .../main/js/controllers/clusters-controller.js  |  7 +++++++
 .../main/js/controllers/domains-controller.js   | 10 +++++-----
 .../src/main/js/controllers/models/caches.json  | 21 +++++++++++++++++++-
 .../main/js/controllers/models/clusters.json    |  1 +
 modules/control-center-web/src/main/js/db.js    |  2 ++
 .../main/js/helpers/generator/generator-java.js | 16 ++++++++-------
 .../main/js/helpers/generator/generator-xml.js  | 16 ++++++++-------
 7 files changed, 53 insertions(+), 20 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/e9673013/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 295ff9a..73f6f8c 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -660,6 +660,13 @@ consoleModule.controller('clustersController', function ($http, $timeout,
$scope
                 }
             }
 
+            if (item.rebalanceThreadPoolSize && item.systemThreadPoolSize &&
item.systemThreadPoolSize <= item.rebalanceThreadPoolSize) {
+                $scope.ui.expanded = true;
+
+                return showPopoverMessage($scope.panels, 'pools', 'rebalanceThreadPoolSize',
+                    'Rebalance thread pool size exceed or equals System thread pool size');
+            }
+
             return true;
         }
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/e9673013/modules/control-center-web/src/main/js/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/domains-controller.js b/modules/control-center-web/src/main/js/controllers/domains-controller.js
index e792f32..e638f32 100644
--- a/modules/control-center-web/src/main/js/controllers/domains-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/domains-controller.js
@@ -907,10 +907,10 @@ consoleModule.controller('domainsController', function ($filter, $http,
$timeout
 
                     var dupSfx = (dup ? '_' + dupCnt : '');
 
-                    newDomain.keyType = valType + 'Key' + dupSfx;
 
                     newDomain.keyType = valType + 'Key' + dupSfx;
                     newDomain.valueType = valType + dupSfx;
+                    newDomain.queryMetadata = 'Configuration';
                     newDomain.databaseSchema = table.schema;
                     newDomain.databaseTable = tableName;
                     newDomain.fields = qryFields;
@@ -943,7 +943,7 @@ consoleModule.controller('domainsController', function ($filter, $http,
$timeout
                                 newDomain.newCache.cacheStoreFactory = {
                                     kind: 'CacheJdbcPojoStoreFactory',
                                     CacheJdbcPojoStoreFactory: {
-                                        dataSourceBean: newDomain.newCache.name + 'DS',
+                                        dataSourceBean: 'ds' + dialect,
                                         dialect: dialect
                                     }
                                 };
@@ -1658,7 +1658,7 @@ consoleModule.controller('domainsController', function ($filter, $http,
$timeout
                 var index = $scope.backupItem.indexes[indexIdx];
 
                 $table.tableState(field, -1, 'table-index-fields');
-                $table.tableFocusInvalidField('FieldName' + (index.indexType === 'SORTED'
? 'S' : ''), indexIdx);
+                $table.tableFocusInvalidField(-1, 'FieldName' + (index.indexType === 'SORTED'
? 'S' : '') + indexIdx);
 
                 field.newFieldName = null;
                 field.newDirection = true;
@@ -1741,6 +1741,8 @@ consoleModule.controller('domainsController', function ($filter, $http,
$timeout
 
             $table.tableReset();
 
+            field.indexIdx = -1;
+
             if (curIdx < 0) {
                 if (index.fields)
                     index.fields.push(indexItemValue);
@@ -1761,8 +1763,6 @@ consoleModule.controller('domainsController', function ($filter, $http,
$timeout
                 }
             }
 
-            field.indexIdx = -1;
-
             return true;
         };
 

http://git-wip-us.apache.org/repos/asf/ignite/blob/e9673013/modules/control-center-web/src/main/js/controllers/models/caches.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json
index e89130a..dc17a61 100644
--- a/modules/control-center-web/src/main/js/controllers/models/caches.json
+++ b/modules/control-center-web/src/main/js/controllers/models/caches.json
@@ -367,6 +367,15 @@
           ]
         },
         {
+          "label": "Snapshotable index",
+          "id": "snapshotableIndex",
+          "type": "check",
+          "model": "snapshotableIndex",
+          "tip": [
+            "Flag indicating whether SQL indexes should support snapshots"
+          ]
+        },
+        {
           "label": "Escape table and filed names",
           "id": "sqlEscapeAll",
           "type": "check",
@@ -616,7 +625,6 @@
           "id": "storeKeepBinary",
           "type": "check",
           "model": "storeKeepBinary",
-          "placeholder": true,
           "tip": [
             "Flag indicating that CacheStore implementation is working with binary objects
instead of Java objects"
           ]
@@ -826,6 +834,17 @@
           ]
         },
         {
+          "label": "Batches prefetch count",
+          "id": "rebalanceBatchesPrefetchCount",
+          "type": "number",
+          "model": "rebalanceBatchesPrefetchCount",
+          "placeholder": "2",
+          "min": 1,
+          "tip": [
+            "number of batches generated by supply node at rebalancing start"
+          ]
+        },
+        {
           "label": "Order",
           "id": "rebalanceOrder",
           "type": "number",

http://git-wip-us.apache.org/repos/asf/ignite/blob/e9673013/modules/control-center-web/src/main/js/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index bcb69a0..b9a2778 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -1834,6 +1834,7 @@
           "type": "number",
           "model": "rebalanceThreadPoolSize",
           "placeholder": 1,
+          "min": 1,
           "tip": [
             "Max count of threads can be used at rebalancing"
           ]

http://git-wip-us.apache.org/repos/asf/ignite/blob/e9673013/modules/control-center-web/src/main/js/db.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/db.js b/modules/control-center-web/src/main/js/db.js
index 6d5ad65..7e0c30f 100644
--- a/modules/control-center-web/src/main/js/db.js
+++ b/modules/control-center-web/src/main/js/db.js
@@ -127,6 +127,7 @@ var CacheSchema = new Schema({
 
     rebalanceMode: {type: String, enum: ['SYNC', 'ASYNC', 'NONE']},
     rebalanceBatchSize: Number,
+    rebalanceBatchesPrefetchCount: Number,
     rebalanceOrder: Number,
     rebalanceDelay: Number,
     rebalanceTimeout: Number,
@@ -185,6 +186,7 @@ var CacheSchema = new Schema({
     sqlOnheapRowCacheSize: Number,
     longQueryWarningTimeout: Number,
     sqlFunctionClasses: [String],
+    snapshotableIndex: Boolean,
     statisticsEnabled: Boolean,
     managementEnabled: Boolean,
     readFromBackup: Boolean,

http://git-wip-us.apache.org/repos/asf/ignite/blob/e9673013/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index fe1bf4a..7343e7a 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -985,6 +985,7 @@ $generatorJava.cacheQuery = function (cache, varName, res) {
     $generatorJava.property(res, varName, cache, 'sqlSchema');
     $generatorJava.property(res, varName, cache, 'sqlOnheapRowCacheSize');
     $generatorJava.property(res, varName, cache, 'longQueryWarningTimeout');
+    $generatorJava.property(res, varName, cache, 'snapshotableIndex', null, null, false);
 
     var indexedTypes = _.filter(cache.domains, function (domain) {
         return domain.queryMetadata === 'Annotations'
@@ -1300,13 +1301,14 @@ $generatorJava.cacheRebalance = function (cache, varName, res) {
         res = $generatorCommon.builder();
 
     if (cache.cacheMode !== 'LOCAL') {
-        $generatorJava.property(res, varName, cache, 'rebalanceMode', 'org.apache.ignite.cache.CacheRebalanceMode');
-        $generatorJava.property(res, varName, cache, 'rebalanceThreadPoolSize');
-        $generatorJava.property(res, varName, cache, 'rebalanceBatchSize');
-        $generatorJava.property(res, varName, cache, 'rebalanceOrder');
-        $generatorJava.property(res, varName, cache, 'rebalanceDelay');
-        $generatorJava.property(res, varName, cache, 'rebalanceTimeout');
-        $generatorJava.property(res, varName, cache, 'rebalanceThrottle');
+        $generatorJava.property(res, varName, cache, 'rebalanceMode', 'org.apache.ignite.cache.CacheRebalanceMode',
null, 'ASYNC');
+        $generatorJava.property(res, varName, cache, 'rebalanceThreadPoolSize', null, null,
1);
+        $generatorJava.property(res, varName, cache, 'rebalanceBatchSize', null, null, 524288);
+        $generatorJava.property(res, varName, cache, 'rebalanceBatchesPrefetchCount', null,
null, 2);
+        $generatorJava.property(res, varName, cache, 'rebalanceOrder', null, null, 0);
+        $generatorJava.property(res, varName, cache, 'rebalanceDelay', null, null, 0);
+        $generatorJava.property(res, varName, cache, 'rebalanceTimeout', null, null, 10000);
+        $generatorJava.property(res, varName, cache, 'rebalanceThrottle', null, null, 0);
 
         res.needEmptyLine = true;
     }

http://git-wip-us.apache.org/repos/asf/ignite/blob/e9673013/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
index cb41ea8..16986f2 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
@@ -764,6 +764,7 @@ $generatorXml.cacheQuery = function(cache, res) {
     $generatorXml.property(res, cache, 'sqlSchema');
     $generatorXml.property(res, cache, 'sqlOnheapRowCacheSize');
     $generatorXml.property(res, cache, 'longQueryWarningTimeout');
+    $generatorXml.property(res, cache, 'snapshotableIndex', null, false);
 
     var indexedTypes = _.filter(cache.domains, function (domain) {
         return domain.queryMetadata === 'Annotations'
@@ -922,13 +923,14 @@ $generatorXml.cacheRebalance = function(cache, res) {
         res = $generatorCommon.builder();
 
     if (cache.cacheMode !== 'LOCAL') {
-        $generatorXml.property(res, cache, 'rebalanceMode');
-        $generatorXml.property(res, cache, 'rebalanceThreadPoolSize');
-        $generatorXml.property(res, cache, 'rebalanceBatchSize');
-        $generatorXml.property(res, cache, 'rebalanceOrder');
-        $generatorXml.property(res, cache, 'rebalanceDelay');
-        $generatorXml.property(res, cache, 'rebalanceTimeout');
-        $generatorXml.property(res, cache, 'rebalanceThrottle');
+        $generatorXml.property(res, cache, 'rebalanceMode', null, 'ASYNC');
+        $generatorXml.property(res, cache, 'rebalanceThreadPoolSize', null, 1);
+        $generatorXml.property(res, cache, 'rebalanceBatchSize', null, 524288);
+        $generatorXml.property(res, cache, 'rebalanceBatchesPrefetchCount', null, 2);
+        $generatorXml.property(res, cache, 'rebalanceOrder', null, 0);
+        $generatorXml.property(res, cache, 'rebalanceDelay', null, 0);
+        $generatorXml.property(res, cache, 'rebalanceTimeout', null, 10000);
+        $generatorXml.property(res, cache, 'rebalanceThrottle', null, 0);
 
         res.needEmptyLine = true;
     }


Mime
View raw message