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/07/31 09:47:23 UTC
[41/50] incubator-ignite git commit: IGNITE-843 Check store kind when
generating cache type metadata.
IGNITE-843 Check store kind when generating cache type metadata.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/f251f2c5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/f251f2c5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/f251f2c5
Branch: refs/heads/ignite-1155_1
Commit: f251f2c5b78bc06fbde92c46d271b4b05234849a
Parents: a3c533c
Author: AKuznetsov <ak...@gridgain.com>
Authored: Fri Jul 31 10:43:28 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Fri Jul 31 10:43:28 2015 +0700
----------------------------------------------------------------------
.../src/main/js/routes/generator/java.js | 28 +++++++++++---------
.../src/main/js/routes/generator/xml.js | 23 +++++++++-------
2 files changed, 29 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f251f2c5/modules/control-center-web/src/main/js/routes/generator/java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/java.js b/modules/control-center-web/src/main/js/routes/generator/java.js
index 803b360..516c7f4 100644
--- a/modules/control-center-web/src/main/js/routes/generator/java.js
+++ b/modules/control-center-web/src/main/js/routes/generator/java.js
@@ -426,26 +426,28 @@ function addCacheTypeMetadataGroups(res, meta) {
function addCacheTypeMetadataConfiguration(res, meta) {
declareVariable(res, needNewVariable(res, 'typeMeta'), 'typeMeta', 'org.apache.ignite.cache.CacheTypeMetadata');
- addProperty(res, 'typeMeta', meta, 'databaseSchema');
- addProperty(res, 'typeMeta', meta, 'databaseTable');
+ var kind = meta.kind;
addClassProperty(res, 'typeMeta', meta, 'keyType');
addClassProperty(res, 'typeMeta', meta, 'valueType');
- addCacheTypeMetadataDatabaseFields(res, meta, 'keyFields');
-
- addCacheTypeMetadataDatabaseFields(res, meta, 'valueFields');
-
- addCacheTypeMetadataQueryFields(res, meta, 'queryFields');
-
- addCacheTypeMetadataQueryFields(res, meta, 'ascendingFields');
+ if (kind != 'query') {
+ addProperty(res, 'typeMeta', meta, 'databaseSchema');
+ addProperty(res, 'typeMeta', meta, 'databaseTable');
+ addCacheTypeMetadataDatabaseFields(res, meta, 'keyFields');
+ addCacheTypeMetadataDatabaseFields(res, meta, 'valueFields');
+ }
- addCacheTypeMetadataQueryFields(res, meta, 'descendingFields');
+ if (kind != 'store') {
+ addCacheTypeMetadataQueryFields(res, meta, 'queryFields');
+ addCacheTypeMetadataQueryFields(res, meta, 'ascendingFields');
+ addCacheTypeMetadataQueryFields(res, meta, 'descendingFields');
- res.needEmptyLine = true;
- addListProperty(res, 'typeMeta', meta, 'textFields');
+ res.needEmptyLine = true;
+ addListProperty(res, 'typeMeta', meta, 'textFields');
- addCacheTypeMetadataGroups(res, meta);
+ addCacheTypeMetadataGroups(res, meta);
+ }
res.line();
res.line('types.add(typeMeta);');
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/f251f2c5/modules/control-center-web/src/main/js/routes/generator/xml.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/xml.js b/modules/control-center-web/src/main/js/routes/generator/xml.js
index f07f7f6..cba14df 100644
--- a/modules/control-center-web/src/main/js/routes/generator/xml.js
+++ b/modules/control-center-web/src/main/js/routes/generator/xml.js
@@ -425,22 +425,27 @@ function generateCacheTypeMetadataConfiguration(res, meta) {
res.startBlock('<bean class="org.apache.ignite.cache.CacheTypeMetadata">');
- addProperty(res, meta, 'databaseSchema');
- addProperty(res, meta, 'databaseTable');
+ var kind = meta.kind;
addProperty(res, meta, 'keyType');
addProperty(res, meta, 'valueType');
- addCacheTypeMetadataDatabaseFields(res, meta, 'keyFields');
- addCacheTypeMetadataDatabaseFields(res, meta, 'valueFields');
+ if (kind != 'query') {
+ addProperty(res, meta, 'databaseSchema');
+ addProperty(res, meta, 'databaseTable');
+ addCacheTypeMetadataDatabaseFields(res, meta, 'keyFields');
+ addCacheTypeMetadataDatabaseFields(res, meta, 'valueFields');
+ }
- addCacheTypeMetadataQueryFields(res, meta, 'queryFields');
- addCacheTypeMetadataQueryFields(res, meta, 'ascendingFields');
- addCacheTypeMetadataQueryFields(res, meta, 'descendingFields');
+ if (kind != 'store') {
+ addCacheTypeMetadataQueryFields(res, meta, 'queryFields');
+ addCacheTypeMetadataQueryFields(res, meta, 'ascendingFields');
+ addCacheTypeMetadataQueryFields(res, meta, 'descendingFields');
- addListProperty(res, meta, 'textFields');
+ addListProperty(res, meta, 'textFields');
- addCacheTypeMetadataGroups(res, meta);
+ addCacheTypeMetadataGroups(res, meta);
+ }
res.endBlock('</bean>');