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/13 17:46:45 UTC
incubator-ignite git commit: IGNITE-843: Fixed cache memory required
settings and code generation.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 88cfa4eaa -> 777ec16f3
IGNITE-843: Fixed cache memory required settings and code 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/777ec16f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/777ec16f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/777ec16f
Branch: refs/heads/ignite-843
Commit: 777ec16f3fb2e28f45811a935f1e3e2d52de43fa
Parents: 88cfa4e
Author: AKuznetsov <ak...@gridgain.com>
Authored: Mon Jul 13 22:46:34 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Mon Jul 13 22:46:34 2015 +0700
----------------------------------------------------------------------
.../nodejs/controllers/caches-controller.js | 18 +++++++-----------
.../nodejs/routes/generator/common.js | 4 ++++
.../nodejs/routes/generator/java.js | 2 +-
.../nodejs/routes/generator/xml.js | 8 +++-----
4 files changed, 15 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/777ec16f/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 29564c7..52fdcf9 100644
--- a/modules/web-control-center/nodejs/controllers/caches-controller.js
+++ b/modules/web-control-center/nodejs/controllers/caches-controller.js
@@ -92,21 +92,17 @@ controlCenterModule.controller('cachesController', ['$scope', '$http', 'commonFu
var backupItem = $scope.backupItem;
var memoryMode = backupItem.memoryMode;
- var offHeapMaxMemory = backupItem.offHeapMaxMemory;
- if (model == 'offHeapMaxMemory') {
- var oft = memoryMode == 'OFFHEAP_TIERED';
+ var onHeapTired = memoryMode == 'ONHEAP_TIERED';
+ var offHeapTired = memoryMode == 'OFFHEAP_TIERED';
- if (oft && !commonFunctions.isDefined(offHeapMaxMemory))
- backupItem.offHeapMaxMemory = 0;
+ var offHeapMaxMemory = backupItem.offHeapMaxMemory;
- return oft;
- }
+ if (model == 'offHeapMaxMemory' && offHeapTired)
+ return true;
- if (model == 'evictionPolicy.kind') {
- return memoryMode == 'ONHEAP_TIERED' && backupItem.swapEnabled ||
- (commonFunctions.isDefined(offHeapMaxMemory) && offHeapMaxMemory >= 0);
- }
+ if (model == 'evictionPolicy.kind' && onHeapTired)
+ return backupItem.swapEnabled || (commonFunctions.isDefined(offHeapMaxMemory) && offHeapMaxMemory >= 0);
return false;
};
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/777ec16f/modules/web-control-center/nodejs/routes/generator/common.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/generator/common.js b/modules/web-control-center/nodejs/routes/generator/common.js
index f4f10d4..ed65d6b 100644
--- a/modules/web-control-center/nodejs/routes/generator/common.js
+++ b/modules/web-control-center/nodejs/routes/generator/common.js
@@ -17,6 +17,10 @@
var _ = require('lodash');
+exports.isDefined = function (v) {
+ return !(v === undefined || v === null);
+};
+
exports.mainComment = mainComment;
function mainComment() {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/777ec16f/modules/web-control-center/nodejs/routes/generator/java.js
----------------------------------------------------------------------
diff --git a/modules/web-control-center/nodejs/routes/generator/java.js b/modules/web-control-center/nodejs/routes/generator/java.js
index 80d3d02..b79ba66 100644
--- a/modules/web-control-center/nodejs/routes/generator/java.js
+++ b/modules/web-control-center/nodejs/routes/generator/java.js
@@ -490,7 +490,7 @@ function toJavaCode(val, type) {
function addProperty(res, obj, objVariableName, propName, enumType, setterName) {
var val = obj[propName];
- if (val) {
+ if (generatorUtils.isDefined(val)) {
res.emptyLineIfNeeded();
res.line(objVariableName + '.' + getSetterName(setterName ? setterName : propName)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/777ec16f/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 24657e4..07988ac 100644
--- a/modules/web-control-center/nodejs/routes/generator/xml.js
+++ b/modules/web-control-center/nodejs/routes/generator/xml.js
@@ -454,7 +454,7 @@ exports.generateCacheConfiguration = generateCacheConfiguration;
function addProperty(res, obj, propName, setterName) {
var val = obj[propName];
- if (val) {
+ if (generatorUtils.isDefined(val)) {
res.emptyLineIfNeeded();
res.line('<property name="' + (setterName ? setterName : propName) + '" value="' + escapeAttr(val) + '"/>');
@@ -503,13 +503,11 @@ function addBeanWithProperties(res, bean, beanPropName, beanClass, props, create
res.endBlock('</property>');
}
}
- else {
+ else
addProperty(res, bean, propName, descr.setterName);
- }
}
- else {
+ else
addProperty(res, bean, propName);
- }
}
}