You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2017/02/02 08:49:01 UTC
[03/24] ignite git commit: IGNITE-4622 Fixed generation in domain
model for cache store.
IGNITE-4622 Fixed generation in domain model for cache store.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/43007d54
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/43007d54
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/43007d54
Branch: refs/heads/ignite-2.0
Commit: 43007d5473729ef6bc99043fdbd943381c74bc38
Parents: 23c4918
Author: Andrey Novikov <an...@gridgain.com>
Authored: Fri Jan 27 11:30:49 2017 +0700
Committer: Andrey Novikov <an...@gridgain.com>
Committed: Fri Jan 27 11:30:49 2017 +0700
----------------------------------------------------------------------
.../configuration/generator/ConfigurationGenerator.js | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/43007d54/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
index de2b750..670b828 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/ConfigurationGenerator.js
@@ -48,6 +48,10 @@ export default class IgniteConfigurationGenerator {
return new Bean('org.apache.ignite.cache.QueryEntity', 'qryEntity', domain, cacheDflts);
}
+ static domainJdbcTypeBean(domain) {
+ return new Bean('org.apache.ignite.cache.store.jdbc.JdbcType', 'type', domain);
+ }
+
static discoveryConfigurationBean(discovery) {
return new Bean('org.apache.ignite.spi.discovery.tcp.TcpDiscoverySpi', 'discovery', discovery, clusterDflts.discovery);
}
@@ -1383,7 +1387,7 @@ export default class IgniteConfigurationGenerator {
}
// Generate domain model for store group.
- static domainStore(domain, cfg = this.domainConfigurationBean(domain)) {
+ static domainStore(domain, cfg = this.domainJdbcTypeBean(domain)) {
cfg.stringProperty('databaseSchema')
.stringProperty('databaseTable');
@@ -1562,8 +1566,7 @@ export default class IgniteConfigurationGenerator {
if (_.isNil(domain.databaseTable))
return acc;
- const typeBean = new Bean('org.apache.ignite.cache.store.jdbc.JdbcType', 'type',
- _.merge({}, domain, {cacheName: cache.name}))
+ const typeBean = this.domainJdbcTypeBean(_.merge({}, domain, {cacheName: cache.name}))
.stringProperty('cacheName');
setType(typeBean, 'keyType');