You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by se...@apache.org on 2015/06/25 13:04:44 UTC
[1/3] incubator-ignite git commit: # IGNITE-843 Bug fix: SwapSpaceSpi
always shown.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-843 7929eeafa -> eff3fe492
# IGNITE-843 Bug fix: SwapSpaceSpi always shown.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/eff3fe49
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/eff3fe49
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/eff3fe49
Branch: refs/heads/ignite-843
Commit: eff3fe49206c708b4da12c1efb7af1aa5105d8bd
Parents: 3bb4ca6
Author: sevdokimov <se...@jetbrains.com>
Authored: Thu Jun 25 14:04:01 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Thu Jun 25 14:04:23 2015 +0300
----------------------------------------------------------------------
modules/webconfig/nodejs/utils/generatorJava.js | 12 +++++++++---
modules/webconfig/nodejs/utils/generatorXml.js | 8 +++++---
2 files changed, 14 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eff3fe49/modules/webconfig/nodejs/utils/generatorJava.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/utils/generatorJava.js b/modules/webconfig/nodejs/utils/generatorJava.js
index e534092..1c5f0f3 100644
--- a/modules/webconfig/nodejs/utils/generatorJava.js
+++ b/modules/webconfig/nodejs/utils/generatorJava.js
@@ -218,10 +218,12 @@ exports.generateClusterConfiguration = function(cluster) {
addProperty(res, cluster, 'cfg', 'peerClassLoadingThreadPoolSize');
res.needEmptyLine = true;
- addBeanWithProperties(res, cluster.swapSpaceSpi.FileSwapSpaceSpi, 'cfg', 'swapSpaceSpi', 'swapSpi',
- generatorUtils.swapSpaceSpi.shortClassName, generatorUtils.swapSpaceSpi.fields, true);
+ if (cluster.swapSpaceSpi && cluster.swapSpaceSpi.kind == 'FileSwapSpaceSpi') {
+ addBeanWithProperties(res, cluster.swapSpaceSpi.FileSwapSpaceSpi, 'cfg', 'swapSpaceSpi', 'swapSpi',
+ generatorUtils.swapSpaceSpi.shortClassName, generatorUtils.swapSpaceSpi.fields, true);
- res.needEmptyLine = true;
+ res.needEmptyLine = true;
+ }
addProperty(res, cluster, 'cfg', 'clockSyncSamples');
addProperty(res, cluster, 'cfg', 'clockSyncFrequency');
@@ -471,6 +473,10 @@ function addBeanWithProperties(res, bean, objVarName, beanPropName, beanVarName,
addProperty(res, bean, beanVarName, propName, descr.enumClass, descr.setterName);
break;
+ case 'float':
+ addProperty(res, bean, beanVarName, propName, 'float', descr.setterName);
+ break;
+
case 'className':
if (bean[propName]) {
res.line(beanVarName + '.' + getSetterName(propName) + '(new ' + bean[propName] + '());');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/eff3fe49/modules/webconfig/nodejs/utils/generatorXml.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/utils/generatorXml.js b/modules/webconfig/nodejs/utils/generatorXml.js
index f55d0a9..aab420b 100644
--- a/modules/webconfig/nodejs/utils/generatorXml.js
+++ b/modules/webconfig/nodejs/utils/generatorXml.js
@@ -227,10 +227,12 @@ exports.generateClusterConfiguration = function(cluster) {
res.needEmptyLine = true;
- addBeanWithProperties(res, cluster.swapSpaceSpi.FileSwapSpaceSpi, 'swapSpaceSpi',
- generatorUtils.swapSpaceSpi.className, generatorUtils.swapSpaceSpi.fields, true);
+ if (cluster.swapSpaceSpi && cluster.swapSpaceSpi.kind == 'FileSwapSpaceSpi') {
+ addBeanWithProperties(res, cluster.swapSpaceSpi.FileSwapSpaceSpi, 'swapSpaceSpi',
+ generatorUtils.swapSpaceSpi.className, generatorUtils.swapSpaceSpi.fields, true);
- res.needEmptyLine = true;
+ res.needEmptyLine = true;
+ }
addProperty(res, cluster, 'clockSyncSamples');
addProperty(res, cluster, 'clockSyncFrequency');
[2/3] incubator-ignite git commit: # IGNITE-843 Support 'dialect'.
Posted by se...@apache.org.
# IGNITE-843 Support 'dialect'.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3bb4ca63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3bb4ca63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3bb4ca63
Branch: refs/heads/ignite-843
Commit: 3bb4ca63e48d08157da1926e85ff5a11aba51cca
Parents: da4bead
Author: sevdokimov <se...@jetbrains.com>
Authored: Thu Jun 25 12:45:03 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Thu Jun 25 14:04:23 2015 +0300
----------------------------------------------------------------------
modules/webconfig/nodejs/utils/generatorJava.js | 27 +++++++++++++-------
.../webconfig/nodejs/utils/generatorUtils.js | 13 +++++++++-
modules/webconfig/nodejs/utils/generatorXml.js | 7 +++++
3 files changed, 37 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3bb4ca63/modules/webconfig/nodejs/utils/generatorJava.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/utils/generatorJava.js b/modules/webconfig/nodejs/utils/generatorJava.js
index c5d60d04..e534092 100644
--- a/modules/webconfig/nodejs/utils/generatorJava.js
+++ b/modules/webconfig/nodejs/utils/generatorJava.js
@@ -380,7 +380,7 @@ function toJavaCode(val, type) {
if (val == null)
return 'null';
- if (type == 'f')
+ if (type == 'float')
return val + 'f';
if (type == 'class')
@@ -462,14 +462,23 @@ function addBeanWithProperties(res, bean, objVarName, beanPropName, beanVarName,
var descr = props[propName];
if (descr) {
- if (descr.type == 'list') {
- addListProperty(res, bean, beanVarName, propName, descr.elementsType, descr.setterName);
- }
- else if (descr.type == 'enum') {
- addProperty(res, bean, beanVarName, propName, descr.enumClass, descr.setterName);
- }
- else {
- addProperty(res, bean, beanVarName, propName, null, descr.setterName);
+ switch (descr.type) {
+ case 'list':
+ addListProperty(res, bean, beanVarName, propName, descr.elementsType, descr.setterName);
+ break;
+
+ case 'enum':
+ addProperty(res, bean, beanVarName, propName, descr.enumClass, descr.setterName);
+ break;
+
+ case 'className':
+ if (bean[propName]) {
+ res.line(beanVarName + '.' + getSetterName(propName) + '(new ' + bean[propName] + '());');
+ }
+ break;
+
+ default:
+ addProperty(res, bean, beanVarName, propName, null, descr.setterName);
}
}
else {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3bb4ca63/modules/webconfig/nodejs/utils/generatorUtils.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/utils/generatorUtils.js b/modules/webconfig/nodejs/utils/generatorUtils.js
index 0b0fbe6..618c93b 100644
--- a/modules/webconfig/nodejs/utils/generatorUtils.js
+++ b/modules/webconfig/nodejs/utils/generatorUtils.js
@@ -122,10 +122,21 @@ exports.evictionPolicies = {
{batchSize: null, maxMemorySize: null, maxSize: null})
};
+exports.knownClasses = {
+
+
+ OracleDialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.OracleDialect', {}),
+ BasicJdbcDialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.BasicJdbcDialect', {}),
+ DB2Dialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.DB2Dialect', {}),
+ SQLServerDialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.SQLServerDialect', {}),
+ MySQLDialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.MySQLDialect', {}),
+ H2Dialect: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.dialect.H2Dialect', {})
+};
+
exports.storeFactories = {
CacheJdbcPojoStoreFactory: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.CacheJdbcPojoStoreFactory', {
dataSourceBean: null,
- dialect: null
+ dialect: {type: 'className'}
}),
CacheJdbcBlobStoreFactory: new ClassDescriptor('org.apache.ignite.cache.store.jdbc.CacheJdbcBlobStoreFactory', {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3bb4ca63/modules/webconfig/nodejs/utils/generatorXml.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/utils/generatorXml.js b/modules/webconfig/nodejs/utils/generatorXml.js
index 52df1e8..f55d0a9 100644
--- a/modules/webconfig/nodejs/utils/generatorXml.js
+++ b/modules/webconfig/nodejs/utils/generatorXml.js
@@ -425,6 +425,13 @@ function addBeanWithProperties(res, bean, beanPropName, beanClass, props, create
if (descr.type == 'list') {
addListProperty(res, bean, propName, descr.setterName);
}
+ else if (descr.type == 'className') {
+ if (bean[propName]) {
+ res.startBlock('<property name="' + propName + '">');
+ res.line('<bean class="' + generatorUtils.knownClasses[bean[propName]].className + '"/>');
+ res.endBlock('</property>');
+ }
+ }
else {
addProperty(res, bean, propName, descr.setterName);
}
[3/3] incubator-ignite git commit: # IGNITE-843 Support Store factory.
Posted by se...@apache.org.
# IGNITE-843 Support Store factory.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/da4beadd
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/da4beadd
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/da4beadd
Branch: refs/heads/ignite-843
Commit: da4beadda0d000ed584ed7646ae881a9d86570d8
Parents: 7929eea
Author: sevdokimov <se...@jetbrains.com>
Authored: Thu Jun 25 12:24:55 2015 +0300
Committer: sevdokimov <se...@jetbrains.com>
Committed: Thu Jun 25 14:04:23 2015 +0300
----------------------------------------------------------------------
modules/webconfig/nodejs/utils/generatorJava.js | 65 +++++---------------
.../webconfig/nodejs/utils/generatorUtils.js | 8 +--
modules/webconfig/nodejs/utils/generatorXml.js | 24 +++-----
3 files changed, 29 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da4beadd/modules/webconfig/nodejs/utils/generatorJava.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/utils/generatorJava.js b/modules/webconfig/nodejs/utils/generatorJava.js
index 9dbdfcd..c5d60d04 100644
--- a/modules/webconfig/nodejs/utils/generatorJava.js
+++ b/modules/webconfig/nodejs/utils/generatorJava.js
@@ -42,7 +42,9 @@ exports.generateClusterConfiguration = function(cluster) {
case 'Vm':
addBeanWithProperties(res, d.Vm, 'discovery', 'ipFinder', 'ipFinder',
- 'TcpDiscoveryVmIpFinder', {addresses: 'list'}, true);
+ 'TcpDiscoveryVmIpFinder', {
+ addresses: {type: 'list'}
+ }, true);
break;
@@ -341,40 +343,12 @@ function generateCacheConfiguration(cacheCfg, varName, res) {
res.needEmptyLine = true;
- if (cacheCfg.store) {
- switch (cacheCfg.store.kind) {
- case 'CacheJdbcPojoStoreFactory':
- addBeanWithProperties(res, cacheCfg.store[cacheCfg.store.kind], varName, 'cacheStoreFactory',
- 'cacheStoreFactory', 'CacheJdbcPojoStoreFactory', {
- dataSourceBean: null,
- dialect: null
- }, true);
-
- break;
+ if (cacheCfg.cacheStoreFactory && cacheCfg.cacheStoreFactory.kind) {
+ var obj = cacheCfg.cacheStoreFactory[cacheCfg.cacheStoreFactory.kind];
+ var data = generatorUtils.storeFactories[cacheCfg.cacheStoreFactory.kind];
- case 'CacheJdbcBlobStoreFactory':
- addBeanWithProperties(res, cacheCfg.store[cacheCfg.store.kind], varName, 'cacheStoreFactory',
- 'cacheStoreFactory', 'CacheJdbcBlobStoreFactory', {
- user: null,
- dataSourceBean: null,
- initSchema: null,
- createTableQuery: null,
- loadQuery: null,
- insertQuery: null,
- updateQuery: null,
- deleteQuery: null
- }, true);
-
- break;
-
- case 'CacheHibernateBlobStoreFactory':
- addBeanWithProperties(res, cacheCfg.store[cacheCfg.store.kind], varName, 'cacheStoreFactory',
- 'cacheStoreFactory', 'CacheHibernateBlobStoreFactory', {
- hibernateProperties: 'list'
- }, true);
-
- break;
- }
+ addBeanWithProperties(res, obj, varName, 'cacheStoreFactory', 'cacheStoreFactory', data.shortClassName,
+ data.fields, true);
}
res.needEmptyLine = true;
@@ -485,30 +459,25 @@ function addBeanWithProperties(res, bean, objVarName, beanPropName, beanVarName,
res.line(beanClass + ' ' + beanVarName + ' = new ' + beanClass + '();');
for (var propName in props) {
if (props.hasOwnProperty(propName)) {
- var setterName = null;
- var type = null;
-
var descr = props[propName];
if (descr) {
- if (typeof(descr) == 'string') {
- type = descr;
+ if (descr.type == 'list') {
+ addListProperty(res, bean, beanVarName, propName, descr.elementsType, descr.setterName);
}
- if (typeof(descr) == 'object') {
- type = descr.type;
-
- setterName = descr.setterName
+ else if (descr.type == 'enum') {
+ addProperty(res, bean, beanVarName, propName, descr.enumClass, descr.setterName);
+ }
+ else {
+ addProperty(res, bean, beanVarName, propName, null, descr.setterName);
}
- }
-
- if (type == 'list') {
- addListProperty(res, bean, beanVarName, propName, type, setterName);
}
else {
- addProperty(res, bean, beanVarName, propName, type, setterName);
+ addProperty(res, bean, beanVarName, propName);
}
}
}
+
res.line(objVarName + '.' + getSetterName(beanPropName) + '(' + beanVarName + ');');
res.needEmptyLine = true;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da4beadd/modules/webconfig/nodejs/utils/generatorUtils.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/utils/generatorUtils.js b/modules/webconfig/nodejs/utils/generatorUtils.js
index 210072f..0b0fbe6 100644
--- a/modules/webconfig/nodejs/utils/generatorUtils.js
+++ b/modules/webconfig/nodejs/utils/generatorUtils.js
@@ -140,26 +140,26 @@ exports.storeFactories = {
}),
CacheHibernateBlobStoreFactory: new ClassDescriptor('org.apache.ignite.cache.store.hibernate.CacheHibernateBlobStoreFactory', {
- hibernateProperties: 'list'
+ hibernateProperties: {type: 'list'}
})
};
exports.atomicConfiguration = new ClassDescriptor('org.apache.ignite.configuration.AtomicConfiguration', {
backups: null,
- cacheMode: 'CacheMode',
+ cacheMode: {type: 'enum', enumClass: 'CacheMode'},
atomicSequenceReserveSize: null
});
exports.swapSpaceSpi = new ClassDescriptor('org.apache.ignite.spi.swapspace.file.FileSwapSpaceSpi', {
baseDirectory: null,
readStripesNumber: null,
- maximumSparsity: 'f',
+ maximumSparsity: {type: 'float'},
maxWriteQueueSize: null,
writeBufferSize: null
});
exports.transactionConfiguration = new ClassDescriptor('org.apache.ignite.configuration.TransactionConfiguration', {
- defaultTxConcurrency: 'TransactionConcurrency',
+ defaultTxConcurrency: {type: 'enum', enumClass: 'TransactionConcurrency'},
transactionIsolation: {type: 'TransactionIsolation', setterName: 'defaultTxIsolation'},
defaultTxTimeout: null,
pessimisticTxLogLinger: null,
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/da4beadd/modules/webconfig/nodejs/utils/generatorXml.js
----------------------------------------------------------------------
diff --git a/modules/webconfig/nodejs/utils/generatorXml.js b/modules/webconfig/nodejs/utils/generatorXml.js
index 6655998..52df1e8 100644
--- a/modules/webconfig/nodejs/utils/generatorXml.js
+++ b/modules/webconfig/nodejs/utils/generatorXml.js
@@ -354,9 +354,9 @@ function generateCacheConfiguration(cacheCfg, res) {
res.needEmptyLine = true;
- if (cacheCfg.store && cacheCfg.store.kind) {
- var obj = cacheCfg.store[cacheCfg.store.kind];
- var data = generatorUtils.storeFactories[cacheCfg.store.kind];
+ if (cacheCfg.cacheStoreFactory && cacheCfg.cacheStoreFactory.kind) {
+ var obj = cacheCfg.cacheStoreFactory[cacheCfg.cacheStoreFactory.kind];
+ var data = generatorUtils.storeFactories[cacheCfg.cacheStoreFactory.kind];
addBeanWithProperties(res, obj, 'cacheStoreFactory', data.className, data.fields, true);
}
@@ -419,26 +419,18 @@ function addBeanWithProperties(res, bean, beanPropName, beanClass, props, create
for (var propName in props) {
if (props.hasOwnProperty(propName)) {
- var setterName = null;
-
var descr = props[propName];
if (descr) {
- if (typeof(descr) == 'string') {
- var type = descr;
+ if (descr.type == 'list') {
+ addListProperty(res, bean, propName, descr.setterName);
}
- else if (typeof(descr) == 'object') {
- type = descr.type;
-
- setterName = descr.setterName
+ else {
+ addProperty(res, bean, propName, descr.setterName);
}
}
-
- if (type == 'list') {
- addListProperty(res, bean, propName, setterName);
- }
else {
- addProperty(res, bean, propName, setterName);
+ addProperty(res, bean, propName);
}
}
}