You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/07/15 11:24:19 UTC
[1/2] incubator-ignite git commit: IGNITE-843 Added check for
write-behind & store. Hide write-behind settings. Fix escape all label text.
Fixed indexed types xml generation.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 55f7e077b -> 9c8550692
IGNITE-843 Added check for write-behind & store. Hide write-behind settings. Fix escape all label text. Fixed indexed types xml generation.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fca9ac99
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fca9ac99
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fca9ac99
Branch: refs/heads/ignite-843
Commit: fca9ac999777b5c02494d06f2fd96daec76c076f
Parents: 55f7e07
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Jul 15 16:23:57 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Jul 15 16:23:57 2015 +0700
----------------------------------------------------------------------
.../nodejs/controllers/caches-controller.js | 14 +++++++++++---
.../nodejs/controllers/models/caches.json | 6 +++++-
.../web-control-center/nodejs/routes/generator/xml.js | 4 ++--
3 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fca9ac99/modules/web-control-center/nodejs/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/caches-controller.js b/modules/web-control-center/nodejs/controllers/caches-controller.js
index fa308da..5c9a793 100644
--- a/modules/web-control-center/nodejs/controllers/caches-controller.js
+++ b/modules/web-control-center/nodejs/controllers/caches-controller.js
@@ -159,14 +159,22 @@ controlCenterModule.controller('cachesController', ['$scope', '$http', 'commonFu
$scope.saveItem = function () {
var item = $scope.backupItem;
- if (item.cacheStoreFactory && item.cacheStoreFactory.kind && !(item.readThrough || item.writeThrough)) {
+ var cacheStoreFactorySelected = item.cacheStoreFactory && item.cacheStoreFactory.kind;
+
+ if (cacheStoreFactorySelected && !(item.readThrough || item.writeThrough)) {
commonFunctions.showError('Store is configured but read/write through are not enabled!');
return;
}
- if ((item.readThrough || item.writeThrough) && (!item.cacheStoreFactory || !item.cacheStoreFactory.kind)) {
- commonFunctions.showError('Read / write through are enabled but strore is not configured!');
+ if ((item.readThrough || item.writeThrough) && !cacheStoreFactorySelected) {
+ commonFunctions.showError('Read / write through are enabled but store is not configured!');
+
+ return;
+ }
+
+ if (item.writeBehindEnabled && !cacheStoreFactorySelected) {
+ commonFunctions.showError('Write behind enabled but store is not configured!');
return;
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fca9ac99/modules/web-control-center/nodejs/controllers/models/caches.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/models/caches.json b/modules/web-control-center/nodejs/controllers/models/caches.json
index d54c5eb..7becbdd 100644
--- a/modules/web-control-center/nodejs/controllers/models/caches.json
+++ b/modules/web-control-center/nodejs/controllers/models/caches.json
@@ -328,7 +328,7 @@
],
"fields": [
{
- "label": "Escape all",
+ "label": "Escape table and filed names",
"type": "check",
"model": "sqlEscapeAll",
"tip": [
@@ -859,6 +859,7 @@
"label": "Batch size",
"type": "number",
"model": "writeBehindBatchSize",
+ "hide": "!backupItem.writeBehindEnabled",
"placeholder": 512,
"tip": [
"Maximum batch size for write-behind cache store operations.",
@@ -869,6 +870,7 @@
"label": "Flush size",
"type": "number",
"model": "writeBehindFlushSize",
+ "hide": "!backupItem.writeBehindEnabled",
"placeholder": 10240,
"tip": [
"Maximum size of the write-behind cache.<br>",
@@ -879,6 +881,7 @@
"label": "Flush frequency",
"type": "number",
"model": "writeBehindFlushFrequency",
+ "hide": "!backupItem.writeBehindEnabled",
"placeholder": 5000,
"tip": [
"Frequency with which write-behind cache is flushed to the cache store in milliseconds."
@@ -888,6 +891,7 @@
"label": "Flush threads count",
"type": "number",
"model": "writeBehindFlushThreadCount",
+ "hide": "!backupItem.writeBehindEnabled",
"placeholder": 1,
"tip": [
"Number of threads that will perform cache flushing."
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/fca9ac99/modules/web-control-center/nodejs/routes/generator/xml.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/generator/xml.js b/modules/web-control-center/nodejs/routes/generator/xml.js
index f01d136..9e45111 100644
--- a/modules/web-control-center/nodejs/routes/generator/xml.js
+++ b/modules/web-control-center/nodejs/routes/generator/xml.js
@@ -380,7 +380,7 @@ function generateCacheConfiguration(cacheCfg, res) {
if (cacheCfg.indexedTypes && cacheCfg.indexedTypes.length > 0) {
res.startBlock('<property name="indexedTypes">');
- res.startBlock('<array>');
+ res.startBlock('<list>');
for (var i = 0; i < cacheCfg.indexedTypes.length; i++) {
var pair = cacheCfg.indexedTypes[i];
@@ -389,7 +389,7 @@ function generateCacheConfiguration(cacheCfg, res) {
res.line('<value>' + escape(pair.valueClass) + '</value>');
}
- res.endBlock('</array>');
+ res.endBlock('</list>');
res.endBlock('</property>');
}
[2/2] incubator-ignite git commit: IGNITE-843 WIP on metadata.
Posted by ak...@apache.org.
IGNITE-843 WIP on metadata.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9c855069
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9c855069
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9c855069
Branch: refs/heads/ignite-843
Commit: 9c8550692c532abf6a1876f10c5f4119d5ee98f4
Parents: fca9ac9
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Jul 15 16:24:18 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Jul 15 16:24:18 2015 +0700
----------------------------------------------------------------------
.../nodejs/controllers/metadata-controller.js | 6 ++++
.../nodejs/controllers/models/metadata.json | 3 +-
.../nodejs/views/configuration/metadata.jade | 36 ++++++++++++++------
3 files changed, 32 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c855069/modules/web-control-center/nodejs/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/metadata-controller.js b/modules/web-control-center/nodejs/controllers/metadata-controller.js
index a826e04..194a993 100644
--- a/modules/web-control-center/nodejs/controllers/metadata-controller.js
+++ b/modules/web-control-center/nodejs/controllers/metadata-controller.js
@@ -26,6 +26,12 @@ controlCenterModule.controller('metadataController', ['$scope', '$http', 'common
{value: {kind: 'both'}, label: 'both'}
];
+ $scope.kinds = [
+ {value: 'query', label: 'query'},
+ {value: 'store', label: 'store'},
+ {value: 'both', label: 'both'}
+ ];
+
$scope.template = $scope.templates[0].value;
$scope.metadata = [];
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c855069/modules/web-control-center/nodejs/controllers/models/metadata.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/controllers/models/metadata.json b/modules/web-control-center/nodejs/controllers/models/metadata.json
index a3e2cf1..ce206b4 100644
--- a/modules/web-control-center/nodejs/controllers/models/metadata.json
+++ b/modules/web-control-center/nodejs/controllers/models/metadata.json
@@ -24,8 +24,7 @@
"label": "Metadata for",
"type": "dropdown",
"model": "kind",
- "items": "templates",
- "placeholder": "Select kind",
+ "items": "kinds",
"tip": ["TODO."]
},
{
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9c855069/modules/web-control-center/nodejs/views/configuration/metadata.jade
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/views/configuration/metadata.jade b/modules/web-control-center/nodejs/views/configuration/metadata.jade
index 8c213c6..526edb4 100644
--- a/modules/web-control-center/nodejs/views/configuration/metadata.jade
+++ b/modules/web-control-center/nodejs/views/configuration/metadata.jade
@@ -34,14 +34,28 @@ block content
tr(ng-repeat='row in metadata track by row._id')
td.col-sm-6(ng-class='{active: row._id == selectedItem._id}')
a(ng-click='selectItem(row)') {{$index + 1}}) {{row.name}}
- button.btn.btn-primary(ng-click='createItem()')  Add metadata
- label(style='margin-left: 15px; margin-right: 10px') for:
- button.btn.btn-default(ng-model='template' data-template='/select' data-placeholder='Choose metadata type' bs-options='item.value as item.label for item in templates' bs-select)
- i.tiplabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}' type='button')
- hr
- form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate)
- .panel-body
- .settings-row(ng-repeat='field in general')
- +form-row
- button#save-btn.btn.btn-primary(ng-disabled='inputForm.$invalid' ng-click='saveItem()') Save
- button.btn.btn-primary.btn-second(ng-show='backupItem._id' ng-click='removeItem()') Remove
+ panel-group(bs-collapse data-allow-multiple="false")
+ .panel.panel-default
+ .panel-heading
+ h3
+ a(bs-collapse-toggle) Manual
+ .panel-collapse(role="tabpanel" bs-collapse-target)
+ .panel-body
+ button.btn.btn-primary(ng-click='createItem()')  Add metadata
+ label(style='margin-left: 15px; margin-right: 10px') for:
+ button.btn.btn-default(ng-model='template' data-template='/select' data-placeholder='Choose metadata type' bs-options='item.value as item.label for item in templates' bs-select)
+ i.tiplabel.fa.fa-question-circle(bs-tooltip data-title='{{joinTip(templateTip)}}' type='button')
+ hr
+ form.form-horizontal(name='inputForm' ng-if='backupItem' novalidate)
+ .panel-body
+ .settings-row(ng-repeat='field in general')
+ +form-row
+ button#save-btn.btn.btn-primary(ng-disabled='inputForm.$invalid' ng-click='saveItem()') Save
+ button.btn.btn-primary.btn-second(ng-show='backupItem._id' ng-click='removeItem()') Remove
+ .panel.panel-default
+ .panel-heading
+ h3
+ a(bs-collapse-toggle) Load from database
+ .panel-collapse(role="tabpanel" bs-collapse-target)
+ .panel-body
+ p TODO 2