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/03 10:48:45 UTC
[3/3] incubator-ignite git commit: IGNITE-843 Regrouped properties.
IGNITE-843 Regrouped properties.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/d38e5de6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/d38e5de6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/d38e5de6
Branch: refs/heads/ignite-843
Commit: d38e5de685a837450537b731edaad726fd024003
Parents: 6ecfc5e
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Jul 3 15:48:38 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Jul 3 15:48:38 2015 +0700
----------------------------------------------------------------------
.../nodejs/public/form-models/caches.json | 131 +++++++++++--------
.../public/javascripts/controllers/caches.js | 2 +-
2 files changed, 76 insertions(+), 57 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d38e5de6/modules/web-control-center/nodejs/public/form-models/caches.json
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/public/form-models/caches.json b/modules/web-control-center/nodejs/public/form-models/caches.json
index a1d1989..f401006 100644
--- a/modules/web-control-center/nodejs/public/form-models/caches.json
+++ b/modules/web-control-center/nodejs/public/form-models/caches.json
@@ -44,12 +44,38 @@
"tip": [
"Number of nodes used to back up single partition for partitioned cache."
]
+ },
+ {
+ "label": "Read from backup",
+ "type": "check",
+ "model": "readFromBackup",
+ "tip": [
+ "Flag indicating whether data can be read from backup.",
+ "If not set then always get data from primary node (never from backup)."
+ ]
}
],
"advanced": [
{
+ "label": "Async back pressure control",
+ "fields": [
+ {
+ "label": "Max async concurrency",
+ "type": "number",
+ "model": "maxConcurrentAsyncOperations",
+ "placeholder": "500",
+ "tip": [
+ "Maximum number of allowed concurrent asynchronous operations.",
+ "If 0 then number of concurrent asynchronous operations is unlimited."
+ ]
+ }
+ ]
+ },
+ {
"label": "Memory",
- "tip": ["Cache memory settings."],
+ "tip": [
+ "Cache memory settings."
+ ],
"fields": [
{
"label": "Mode",
@@ -218,12 +244,23 @@
"tip": [
"Flag indicating whether swap storage is enabled or not for this cache."
]
+ },
+ {
+ "label": "Copy on read",
+ "type": "check",
+ "model": "copyOnRead",
+ "tip": [
+ "Flag indicating whether copy of of the value stored in cache should be created for cache operation implying return value.",
+ "Also if this flag is set copies are created for values passed to CacheInterceptor and to CacheEntryProcessor."
+ ]
}
]
},
{
"label": "Near cache",
- "tip": ["Near cache settings."],
+ "tip": [
+ "Near cache settings."
+ ],
"fields": [
{
"label": "Start size",
@@ -363,7 +400,9 @@
},
{
"label": "Query",
- "tip": ["Cache query settings."],
+ "tip": [
+ "Cache query settings."
+ ],
"fields": [
{
"label": "Escape all",
@@ -414,7 +453,9 @@
},
{
"label": "Rebalance",
- "tip": ["Cache rebalance settings."],
+ "tip": [
+ "Cache rebalance settings."
+ ],
"fields": [
{
"label": "Mode",
@@ -490,8 +531,31 @@
]
},
{
+ "label": "Statistics",
+ "fields": [
+ {
+ "label": "Statistics enabled",
+ "type": "check",
+ "model": "statisticsEnabled",
+ "tip": [
+ "Flag indicating whether statistics gathering is enabled on a cache."
+ ]
+ },
+ {
+ "label": "Management enabled",
+ "type": "check",
+ "model": "managementEnabled",
+ "tip": [
+ "Flag indicating whether management is enabled on this cache."
+ ]
+ }
+ ]
+ },
+ {
"label": "Store",
- "tip": ["Cache store settings."],
+ "tip": [
+ "Cache store settings."
+ ],
"fields": [
{
"label": "Store factory",
@@ -668,7 +732,9 @@
},
{
"label": "Transaction",
- "tip": ["Cache transactions settings."],
+ "tip": [
+ "Cache transactions settings."
+ ],
"fields": [
{
"label": "Invalidate",
@@ -701,7 +767,9 @@
},
{
"label": "Write behind",
- "tip": ["Cache write behind settings."],
+ "tip": [
+ "Cache write behind settings."
+ ],
"fields": [
{
"label": "Enabled",
@@ -750,55 +818,6 @@
]
}
]
- },
- {
- "label": "Misc",
- "fields": [
- {
- "label": "Statistics enabled",
- "type": "check",
- "model": "statisticsEnabled",
- "tip": [
- "Flag indicating whether statistics gathering is enabled on a cache."
- ]
- },
- {
- "label": "Management enabled",
- "type": "check",
- "model": "managementEnabled",
- "tip": [
- "Flag indicating whether management is enabled on this cache."
- ]
- },
- {
- "label": "Read from backup",
- "type": "check",
- "model": "readFromBackup",
- "tip": [
- "Flag indicating whether data can be read from backup.",
- "If not set then always get data from primary node (never from backup)."
- ]
- },
- {
- "label": "Copy on read",
- "type": "check",
- "model": "copyOnRead",
- "tip": [
- "Flag indicating whether copy of of the value stored in cache should be created for cache operation implying return value.",
- "Also if this flag is set copies are created for values passed to CacheInterceptor and to CacheEntryProcessor."
- ]
- },
- {
- "label": "Max async concurrency",
- "type": "number",
- "model": "maxConcurrentAsyncOperations",
- "placeholder": "500",
- "tip": [
- "Maximum number of allowed concurrent asynchronous operations.",
- "If 0 then number of concurrent asynchronous operations is unlimited."
- ]
- }
- ]
}
]
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/d38e5de6/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js b/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js
index 006f065..45c4f9a 100644
--- a/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js
+++ b/modules/web-control-center/nodejs/public/javascripts/controllers/caches.js
@@ -43,7 +43,7 @@ configuratorModule.controller('cachesController', ['$scope', '$alert', '$http',
];
$scope.evictionPolicies = [
- {value: 'LRU', label: 'Least Recently Used'},
+ {value: 'LRU', label: 'LRU'},
{value: 'RND', label: 'Random'},
{value: 'FIFO', label: 'FIFO'},
{value: 'SORTED', label: 'Sorted'},