Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 34FEE187AA for ; Wed, 29 Jul 2015 03:12:38 +0000 (UTC) Received: (qmail 71734 invoked by uid 500); 29 Jul 2015 03:12:38 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 71702 invoked by uid 500); 29 Jul 2015 03:12:38 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 71691 invoked by uid 99); 29 Jul 2015 03:12:38 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Jul 2015 03:12:38 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id 91878D8696 for ; Wed, 29 Jul 2015 03:12:37 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: -0.626 X-Spam-Level: X-Spam-Status: No, score=-0.626 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, RP_MATCHES_RCVD=-1.427, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-eu-west.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id LHpNdicBYbbR for ; Wed, 29 Jul 2015 03:12:24 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-eu-west.apache.org (ASF Mail Server at mx1-eu-west.apache.org) with SMTP id A527026294 for ; Wed, 29 Jul 2015 03:12:22 +0000 (UTC) Received: (qmail 70955 invoked by uid 99); 29 Jul 2015 03:11:06 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 29 Jul 2015 03:11:06 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 96233DF9A3; Wed, 29 Jul 2015 03:11:06 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: akuznetsov@apache.org To: commits@ignite.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: IGNITE-843: WIP java code generation. Date: Wed, 29 Jul 2015 03:11:06 +0000 (UTC) Repository: incubator-ignite Updated Branches: refs/heads/ignite-843 2e4daaa83 -> cb2ecb53b IGNITE-843: WIP java 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/cb2ecb53 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/cb2ecb53 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/cb2ecb53 Branch: refs/heads/ignite-843 Commit: cb2ecb53b3332fe90b1bd3d39e7b226ed7b4114f Parents: 2e4daaa Author: AKuznetsov Authored: Wed Jul 29 10:11:02 2015 +0700 Committer: AKuznetsov Committed: Wed Jul 29 10:11:02 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/routes/generator/common.js | 12 - .../src/main/js/routes/generator/java.js | 266 +++++++++++++++---- .../src/main/js/routes/generator/xml.js | 34 ++- 3 files changed, 230 insertions(+), 82 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2ecb53/modules/web-control-center/src/main/js/routes/generator/common.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/src/main/js/routes/generator/common.js b/modules/web-control-center/src/main/js/routes/generator/common.js index a300bb5..44ddf31 100644 --- a/modules/web-control-center/src/main/js/routes/generator/common.js +++ b/modules/web-control-center/src/main/js/routes/generator/common.js @@ -274,18 +274,6 @@ exports.hasProperty = function (obj, props) { }; /** - * Convert some name to valid java name. - * - * @param name to convert. - * @returns {string} Valid java name. - */ -exports.toJavaName = function (name) { - var javaName = name.replace(/[^A-Za-z_0-9]+/, '_'); - - return javaName.charAt(0).toLocaleUpperCase() + javaName.slice(1); -}; - -/** * Generate properties file with properties stubs for stores data sources. * * @param cluster Configuration to process. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2ecb53/modules/web-control-center/src/main/js/routes/generator/java.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/src/main/js/routes/generator/java.js b/modules/web-control-center/src/main/js/routes/generator/java.js index 31cd2ac..41b9bb8 100644 --- a/modules/web-control-center/src/main/js/routes/generator/java.js +++ b/modules/web-control-center/src/main/js/routes/generator/java.js @@ -19,6 +19,18 @@ var _ = require('lodash'); var generatorUtils = require("./common"); +/** + * Convert some name to valid java name. + * + * @param name to convert. + * @returns {string} Valid java name. + */ +function toJavaName(name) { + var javaName = name.replace(/[^A-Za-z_0-9]+/, '_'); + + return javaName.charAt(0).toLocaleUpperCase() + javaName.slice(1); +} + exports.generateClusterConfiguration = function(cluster, javaClass, clientNearConfiguration) { var res = generatorUtils.builder(); @@ -156,11 +168,11 @@ exports.generateClusterConfiguration = function(cluster, javaClass, clientNearCo var cache = cluster.caches[i]; - var cacheName = 'cache' + generatorUtils.toJavaName(cache.name); + var cacheName = 'cache' + toJavaName(cache.name); names.push(cacheName); - generateCacheConfiguration(cache, cacheName, res); + generateCacheConfiguration(res, cache, cacheName); res.needEmptyLine = true; } @@ -320,17 +332,130 @@ function createEvictionPolicy(res, evictionPolicy, varName, propertyName) { } } -exports.generateCacheConfiguration = generateCacheConfiguration; +function addCacheTypeMetadataDatabaseFields(res, meta, varName, fieldsProperty) { + var fields = meta[fieldsProperty]; + + if (fields && fields.length > 0) { + res.line('addCacheTypeMetadataDatabaseFields for ' + varName); + //res.startBlock(''); + // + //res.startBlock(''); + // + //_.forEach(fields, function (field) { + // res.startBlock(''); + // + // addProperty(res, field, 'databaseName'); + // + // res.startBlock(''); + // res.line(''); + // res.endBlock(''); + // + // addProperty(res, field, 'javaName'); + // + // addElement(res, 'property', 'name', 'javaType', 'value', generatorUtils.javaBuildInClass(field.javaType)); + // + // res.endBlock(''); + //}); + // + //res.endBlock(''); + //res.endBlock(''); + } +} + +function addCacheTypeMetadataQueryFields(res, meta, varName, fieldsProperty) { + var fields = meta[fieldsProperty]; + + if (fields && fields.length > 0) { + res.line('addCacheTypeMetadataQueryFields for ' + varName); + //res.startBlock(''); + // + //res.startBlock(''); + // + //_.forEach(fields, function (field) { + // addElement(res, 'entry', 'key', field.name, 'value', generatorUtils.javaBuildInClass(field.className)); + //}); + // + //res.endBlock(''); + // + //res.endBlock(''); + } +} + +function addCacheTypeMetadataGroups(res, meta, varName) { + var groups = meta.groups; + + if (groups && groups.length > 0) { + res.line('addCacheTypeMetadataGroups for ' + varName); + //res.startBlock(''); + //res.startBlock(''); + // + //_.forEach(groups, function (group) { + // var fields = group.fields; + // + // if (fields && fields.length > 0) { + // res.startBlock(''); + // res.startBlock(''); + // + // _.forEach(fields, function (field) { + // res.startBlock(''); + // + // res.startBlock(''); + // res.line(''); + // res.line(''); + // res.endBlock(''); + // + // res.endBlock(''); + // }); + // + // res.endBlock(''); + // res.endBlock(''); + // } + //}); + // + //res.endBlock(''); + //res.endBlock(''); + } +} + +function generateCacheTypeMetadataConfiguration(res, meta, varCacheTypeMetadata) { + if (!res) + res = generatorUtils.builder(); + + res.importClass('org.apache.ignite.cache.CacheTypeMetadata'); + + var varType = varCacheTypeMetadata + 'Item'; + + addProperty(res, meta, varType, 'databaseSchema'); + addProperty(res, meta, varType, 'databaseTable'); + + addProperty(res, meta, varType, 'keyType'); + addProperty(res, meta, varType, 'valueType'); + + addCacheTypeMetadataDatabaseFields(res, meta, varType, 'keyFields'); + addCacheTypeMetadataDatabaseFields(res, meta, varType, 'valueFields'); + + addCacheTypeMetadataQueryFields(res, meta, varType, 'queryFields'); + addCacheTypeMetadataQueryFields(res, meta, varType, 'ascendingFields'); + addCacheTypeMetadataQueryFields(res, meta, varType, 'descendingFields'); + + addListProperty(res, meta, varType, 'textFields'); + + addCacheTypeMetadataGroups(res, varType, meta); + + res.line(varCacheTypeMetadata + '.add(' + varType + ')'); + + return res; +} /** * Generate java code for cache configuration. * - * @param cacheCfg Cache config. + * @param cache Cache config. * @param varName Variable name. * @param res Result builder. * @returns {*} Append generated java code to builder and return it. */ -function generateCacheConfiguration(cacheCfg, varName, res) { +function generateCacheConfiguration(res, cache, varName) { if (!res) res = generatorUtils.builder(); @@ -344,55 +469,55 @@ function generateCacheConfiguration(cacheCfg, varName, res) { res.needEmptyLine = true; - addProperty(res, cacheCfg, varName, 'name'); + addProperty(res, cache, varName, 'name'); - addProperty(res, cacheCfg, varName, 'mode', 'CacheMode', 'cacheMode'); + addProperty(res, cache, varName, 'mode', 'CacheMode', 'cacheMode'); - addProperty(res, cacheCfg, varName, 'atomicityMode', 'CacheAtomicityMode'); - addProperty(res, cacheCfg, varName, 'backups'); - addProperty(res, cacheCfg, varName, 'startSize'); - addProperty(res, cacheCfg, varName, 'readFromBackup'); + addProperty(res, cache, varName, 'atomicityMode', 'CacheAtomicityMode'); + addProperty(res, cache, varName, 'backups'); + addProperty(res, cache, varName, 'startSize'); + addProperty(res, cache, varName, 'readFromBackup'); res.needEmptyLine = true; - addProperty(res, cacheCfg, varName, 'memoryMode', 'CacheMemoryMode'); - addProperty(res, cacheCfg, varName, 'offHeapMaxMemory'); - addProperty(res, cacheCfg, varName, 'swapEnabled'); - addProperty(res, cacheCfg, varName, 'copyOnRead'); + addProperty(res, cache, varName, 'memoryMode', 'CacheMemoryMode'); + addProperty(res, cache, varName, 'offHeapMaxMemory'); + addProperty(res, cache, varName, 'swapEnabled'); + addProperty(res, cache, varName, 'copyOnRead'); res.needEmptyLine = true; - createEvictionPolicy(res, cacheCfg.evictionPolicy, varName, 'evictionPolicy'); + createEvictionPolicy(res, cache.evictionPolicy, varName, 'evictionPolicy'); - if (cacheCfg.nearCacheEnabled) { + if (cache.nearCacheEnabled) { res.needEmptyLine = true; res.importClass('org.apache.ignite.configuration.NearCacheConfiguration'); - addBeanWithProperties(res, cacheCfg.nearConfiguration, varName, 'nearConfiguration', 'nearConfiguration', + addBeanWithProperties(res, cache.nearConfiguration, varName, 'nearConfiguration', 'nearConfiguration', 'NearCacheConfiguration', {nearStartSize: null}, true); - if (cacheCfg.nearConfiguration && cacheCfg.nearConfiguration.nearEvictionPolicy && cacheCfg.nearConfiguration.nearEvictionPolicy.kind) { - createEvictionPolicy(res, cacheCfg.nearConfiguration.nearEvictionPolicy, 'nearConfiguration', 'nearEvictionPolicy'); + if (cache.nearConfiguration && cache.nearConfiguration.nearEvictionPolicy && cache.nearConfiguration.nearEvictionPolicy.kind) { + createEvictionPolicy(res, cache.nearConfiguration.nearEvictionPolicy, 'nearConfiguration', 'nearEvictionPolicy'); } } res.needEmptyLine = true; - addProperty(res, cacheCfg, varName, 'sqlEscapeAll'); - addProperty(res, cacheCfg, varName, 'sqlOnheapRowCacheSize'); - addProperty(res, cacheCfg, varName, 'longQueryWarningTimeout'); + addProperty(res, cache, varName, 'sqlEscapeAll'); + addProperty(res, cache, varName, 'sqlOnheapRowCacheSize'); + addProperty(res, cache, varName, 'longQueryWarningTimeout'); - if (cacheCfg.indexedTypes && cacheCfg.indexedTypes.length > 0) { + if (cache.indexedTypes && cache.indexedTypes.length > 0) { res.emptyLineIfNeeded(); res.append(varName + '.setIndexedTypes('); - for (var i = 0; i < cacheCfg.indexedTypes.length; i++) { + for (var i = 0; i < cache.indexedTypes.length; i++) { if (i > 0) res.append(', '); - var pair = cacheCfg.indexedTypes[i]; + var pair = cache.indexedTypes[i]; res.append(toJavaCode(pair.keyClass, 'class')).append(', ').append(toJavaCode(pair.valueClass, 'class')) } @@ -400,25 +525,25 @@ function generateCacheConfiguration(cacheCfg, varName, res) { res.line(');'); } - addMultiparamProperty(res, cacheCfg, varName, 'sqlFunctionClasses', 'class'); + addMultiparamProperty(res, cache, varName, 'sqlFunctionClasses', 'class'); res.needEmptyLine = true; - addProperty(res, cacheCfg, varName, 'rebalanceMode', 'CacheRebalanceMode'); - addProperty(res, cacheCfg, varName, 'rebalanceThreadPoolSize'); - addProperty(res, cacheCfg, varName, 'rebalanceBatchSize'); - addProperty(res, cacheCfg, varName, 'rebalanceOrder'); - addProperty(res, cacheCfg, varName, 'rebalanceDelay'); - addProperty(res, cacheCfg, varName, 'rebalanceTimeout'); - addProperty(res, cacheCfg, varName, 'rebalanceThrottle'); + addProperty(res, cache, varName, 'rebalanceMode', 'CacheRebalanceMode'); + addProperty(res, cache, varName, 'rebalanceThreadPoolSize'); + addProperty(res, cache, varName, 'rebalanceBatchSize'); + addProperty(res, cache, varName, 'rebalanceOrder'); + addProperty(res, cache, varName, 'rebalanceDelay'); + addProperty(res, cache, varName, 'rebalanceTimeout'); + addProperty(res, cache, varName, 'rebalanceThrottle'); res.needEmptyLine = true; - if (cacheCfg.cacheStoreFactory && cacheCfg.cacheStoreFactory.kind) { - var storeFactory = cacheCfg.cacheStoreFactory[cacheCfg.cacheStoreFactory.kind]; - var data = generatorUtils.storeFactories[cacheCfg.cacheStoreFactory.kind]; + if (cache.cacheStoreFactory && cache.cacheStoreFactory.kind) { + var storeFactory = cache.cacheStoreFactory[cache.cacheStoreFactory.kind]; + var data = generatorUtils.storeFactories[cache.cacheStoreFactory.kind]; - var sfVarName = 'storeFactory' + generatorUtils.toJavaName(cacheCfg.name); + var sfVarName = 'storeFactory' + toJavaName(cache.name); var dsVarName = 'none'; if (storeFactory.dialect) { @@ -448,32 +573,69 @@ function generateCacheConfiguration(cacheCfg, varName, res) { res.needEmptyLine = true; - addProperty(res, cacheCfg, varName, 'loadPreviousValue'); - addProperty(res, cacheCfg, varName, 'readThrough'); - addProperty(res, cacheCfg, varName, 'writeThrough'); + addProperty(res, cache, varName, 'loadPreviousValue'); + addProperty(res, cache, varName, 'readThrough'); + addProperty(res, cache, varName, 'writeThrough'); res.needEmptyLine = true; - addProperty(res, cacheCfg, varName, 'invalidate'); - addProperty(res, cacheCfg, varName, 'defaultLockTimeout'); - addProperty(res, cacheCfg, varName, 'transactionManagerLookupClassName'); + addProperty(res, cache, varName, 'invalidate'); + addProperty(res, cache, varName, 'defaultLockTimeout'); + addProperty(res, cache, varName, 'transactionManagerLookupClassName'); res.needEmptyLine = true; - addProperty(res, cacheCfg, varName, 'writeBehindEnabled'); - addProperty(res, cacheCfg, varName, 'writeBehindBatchSize'); - addProperty(res, cacheCfg, varName, 'writeBehindFlushSize'); - addProperty(res, cacheCfg, varName, 'writeBehindFlushFrequency'); - addProperty(res, cacheCfg, varName, 'writeBehindFlushThreadCount'); + addProperty(res, cache, varName, 'writeBehindEnabled'); + addProperty(res, cache, varName, 'writeBehindBatchSize'); + addProperty(res, cache, varName, 'writeBehindFlushSize'); + addProperty(res, cache, varName, 'writeBehindFlushFrequency'); + addProperty(res, cache, varName, 'writeBehindFlushThreadCount'); res.needEmptyLine = true; - addProperty(res, cacheCfg, varName, 'statisticsEnabled'); - addProperty(res, cacheCfg, varName, 'managementEnabled'); + addProperty(res, cache, varName, 'statisticsEnabled'); + addProperty(res, cache, varName, 'managementEnabled'); + + res.needEmptyLine = true; + + addProperty(res, cache, varName, 'maxConcurrentAsyncOperations'); res.needEmptyLine = true; - addProperty(res, cacheCfg, varName, 'maxConcurrentAsyncOperations'); + // Generate cache type metadata configs. + if ((cache.queryMetadata && cache.queryMetadata.length > 0) || + (cache.storeMetadata && cache.storeMetadata.length > 0)) { + res.emptyLineIfNeeded(); + + var varCacheTypeMetadata = varName + 'TypeMetadata'; + + res.line('Collection ' + varCacheTypeMetadata + ' = new ArrayList();'); + res.line(); + + var metaNames = []; + + if (cache.queryMetadata && cache.queryMetadata.length > 0) { + _.forEach(cache.queryMetadata, function (meta) { + if (!_.contains(metaNames, meta.name)) { + metaNames.push(meta.name); + + generateCacheTypeMetadataConfiguration(res, meta, varCacheTypeMetadata); + } + }); + } + + if (cache.storeMetadata && cache.storeMetadata.length > 0) { + _.forEach(cache.storeMetadata, function (meta) { + if (!_.contains(metaNames, meta.name)) { + metaNames.push(meta.name); + + generateCacheTypeMetadataConfiguration(meta, res); + } + }); + } + + res.line(varName + '.setCacheTypeMetadata(' + varCacheTypeMetadata + ');'); + } return res; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/cb2ecb53/modules/web-control-center/src/main/js/routes/generator/xml.js ---------------------------------------------------------------------- diff --git a/modules/web-control-center/src/main/js/routes/generator/xml.js b/modules/web-control-center/src/main/js/routes/generator/xml.js index dbb6935..079f268 100644 --- a/modules/web-control-center/src/main/js/routes/generator/xml.js +++ b/modules/web-control-center/src/main/js/routes/generator/xml.js @@ -274,7 +274,7 @@ exports.generateClusterConfiguration = function(cluster, clientNearConfiguration var cache = cluster.caches[i]; - generateCacheConfiguration(cache, res); + generateCacheConfiguration(res, cache); } res.endBlock(''); @@ -419,35 +419,35 @@ function addCacheTypeMetadataGroups(res, meta) { } } -function generateCacheTypeMetadataConfiguration(metaCfg, res) { +function generateCacheTypeMetadataConfiguration(res, meta) { if (!res) res = generatorUtils.builder(); res.startBlock(''); - addProperty(res, metaCfg, 'databaseSchema'); - addProperty(res, metaCfg, 'databaseTable'); + addProperty(res, meta, 'databaseSchema'); + addProperty(res, meta, 'databaseTable'); - addProperty(res, metaCfg, 'keyType'); - addProperty(res, metaCfg, 'valueType'); + addProperty(res, meta, 'keyType'); + addProperty(res, meta, 'valueType'); - addCacheTypeMetadataDatabaseFields(res, metaCfg, 'keyFields'); - addCacheTypeMetadataDatabaseFields(res, metaCfg, 'valueFields'); + addCacheTypeMetadataDatabaseFields(res, meta, 'keyFields'); + addCacheTypeMetadataDatabaseFields(res, meta, 'valueFields'); - addCacheTypeMetadataQueryFields(res, metaCfg, 'queryFields'); - addCacheTypeMetadataQueryFields(res, metaCfg, 'ascendingFields'); - addCacheTypeMetadataQueryFields(res, metaCfg, 'descendingFields'); + addCacheTypeMetadataQueryFields(res, meta, 'queryFields'); + addCacheTypeMetadataQueryFields(res, meta, 'ascendingFields'); + addCacheTypeMetadataQueryFields(res, meta, 'descendingFields'); - addListProperty(res, metaCfg, 'textFields'); + addListProperty(res, meta, 'textFields'); - addCacheTypeMetadataGroups(res, metaCfg); + addCacheTypeMetadataGroups(res, meta); res.endBlock(''); return res; } -function generateCacheConfiguration(cacheCfg, res) { +function generateCacheConfiguration(res, cacheCfg) { if (!res) res = generatorUtils.builder(); @@ -590,7 +590,7 @@ function generateCacheConfiguration(cacheCfg, res) { if (!_.contains(metaNames, meta.name)) { metaNames.push(meta.name); - generateCacheTypeMetadataConfiguration(meta, res); + generateCacheTypeMetadataConfiguration(res, meta); } }); } @@ -600,7 +600,7 @@ function generateCacheConfiguration(cacheCfg, res) { if (!_.contains(metaNames, meta.name)) { metaNames.push(meta.name); - generateCacheTypeMetadataConfiguration(meta, res); + generateCacheTypeMetadataConfiguration(res, meta); } }); } @@ -614,8 +614,6 @@ function generateCacheConfiguration(cacheCfg, res) { return res; } -exports.generateCacheConfiguration = generateCacheConfiguration; - function addElement(res, tag, attr1, val1, attr2, val2) { var elem = '<' + tag;