You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/11/11 11:45:12 UTC
[1/2] ignite git commit: IGNITE-1867 Fixed QueryIndexType.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 5200031d2 -> 1335f1fbf
IGNITE-1867 Fixed QueryIndexType.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/79b2a512
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/79b2a512
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/79b2a512
Branch: refs/heads/ignite-843-rc1
Commit: 79b2a512c35474109a433f567ad0374cca82bae8
Parents: 5200031
Author: Andrey <an...@gridgain.com>
Authored: Wed Nov 11 17:39:02 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Nov 11 17:39:02 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 2 +-
.../src/main/js/controllers/metadata-controller.js | 4 ++--
modules/control-center-web/src/main/js/db.js | 2 +-
.../src/main/js/helpers/generator/generator-common.js | 2 +-
.../src/main/js/helpers/generator/generator-java.js | 2 +-
.../src/main/js/helpers/generator/generator-xml.js | 2 +-
.../src/main/js/views/includes/controls.jade | 10 +++++-----
7 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/79b2a512/modules/control-center-web/src/main/js/controllers/common-module.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js
index 3c784f5..5e34adf 100644
--- a/modules/control-center-web/src/main/js/controllers/common-module.js
+++ b/modules/control-center-web/src/main/js/controllers/common-module.js
@@ -1142,7 +1142,7 @@ consoleModule.service('$table', ['$common', '$focus', function ($common, $focus)
}
else if (ui == 'table-indexes') {
field.curIndexName = val.name;
- field.curIndexType = val.type;
+ field.curIndexType = val.indexType;
field.curIndexFields = val.fields;
_tableFocus(field.focusId, index);
http://git-wip-us.apache.org/repos/asf/ignite/blob/79b2a512/modules/control-center-web/src/main/js/controllers/metadata-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
index 8e81c2c..4256970 100644
--- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js
@@ -1147,7 +1147,7 @@ consoleModule.controller('metadataController', [
}
if (curIdx < 0) {
- var newIndex = {name: indexName, type: indexType};
+ var newIndex = {name: indexName, indexType: indexType};
if (item.indexes)
item.indexes.push(newIndex);
@@ -1156,7 +1156,7 @@ consoleModule.controller('metadataController', [
}
else {
item.indexes[curIdx].name = indexName;
- item.indexes[curIdx].type = indexType;
+ item.indexes[curIdx].indexType = indexType;
}
if (curIdx < 0)
http://git-wip-us.apache.org/repos/asf/ignite/blob/79b2a512/modules/control-center-web/src/main/js/db.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/db.js b/modules/control-center-web/src/main/js/db.js
index 6d4df8d..af3fefb 100644
--- a/modules/control-center-web/src/main/js/db.js
+++ b/modules/control-center-web/src/main/js/db.js
@@ -83,7 +83,7 @@ var CacheTypeMetadataSchema = new Schema({
keepSerialized: Boolean,
fields: [{name: String, className: String}],
aliases: [{field: String, alias: String}],
- indexes: [{name: String, type: {type: String, enum: ['SORTED', 'FULLTEXT', 'GEOSPATIAL']}, fields: [{name: String, direction: Boolean}]}]
+ indexes: [{name: String, indexType: {type: String, enum: ['SORTED', 'FULLTEXT', 'GEOSPATIAL']}, fields: [{name: String, direction: Boolean}]}]
});
// Define Cache type metadata model.
http://git-wip-us.apache.org/repos/asf/ignite/blob/79b2a512/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
index d9c903b..a36f519 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-common.js
@@ -49,7 +49,7 @@ $generatorCommon.mainComment = function mainComment() {
$generatorCommon.builder = function (deep) {
var res = [];
- res.deep = deep ? deep : 0;
+ res.deep = deep || 0;
res.needEmptyLine = false;
res.lineStart = true;
res.datasources = [];
http://git-wip-us.apache.org/repos/asf/ignite/blob/79b2a512/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
index 8e136a7..0e88486 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-java.js
@@ -1072,7 +1072,7 @@ $generatorJava.metadataQueryIndexes = function (res, meta) {
$generatorJava.declareVariable(res, 'index', 'org.apache.ignite.cache.QueryIndex');
$generatorJava.property(res, 'index', index, 'name');
- $generatorJava.property(res, 'index', index, 'type', 'org.apache.ignite.cache.QueryIndexType');
+ $generatorJava.property(res, 'index', index, 'indexType', 'org.apache.ignite.cache.QueryIndexType');
var fields = index.fields;
http://git-wip-us.apache.org/repos/asf/ignite/blob/79b2a512/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
index 9e55dec..475c280 100644
--- a/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
+++ b/modules/control-center-web/src/main/js/helpers/generator/generator-xml.js
@@ -949,7 +949,7 @@ $generatorXml.metadataQueryIndexes = function (res, meta) {
res.startBlock('<bean class="org.apache.ignite.cache.QueryIndex">');
$generatorXml.property(res, index, 'name');
- $generatorXml.property(res, index, 'type');
+ $generatorXml.property(res, index, 'indexType');
var fields = index.fields;
http://git-wip-us.apache.org/repos/asf/ignite/blob/79b2a512/modules/control-center-web/src/main/js/views/includes/controls.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/controls.jade b/modules/control-center-web/src/main/js/views/includes/controls.jade
index 8262ccc..f0334f7 100644
--- a/modules/control-center-web/src/main/js/views/includes/controls.jade
+++ b/modules/control-center-web/src/main/js/views/includes/controls.jade
@@ -457,7 +457,7 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
tr(ng-repeat='item in #{fieldMdl}')
td
.col-sm-12(ng-show='!tableEditing(field, $index)')
- a.labelFormField(id='{{field.id + $index}}' ng-click='tableStartEdit(backupItem, field, $index)') {{$index + 1}}) {{item.name}} [{{item.type}}]
+ a.labelFormField(id='{{field.id + $index}}' ng-click='tableStartEdit(backupItem, field, $index)') {{$index + 1}}) {{item.name}} [{{item.indexType}}]
+btn-remove('tableRemove(backupItem, field, $index)', 'field.removeTip')
+btn-add('tableIndexNewItem(field, $index)', 'field.addItemTip')
div(ng-show='tableEditing(field, $index)')
@@ -477,15 +477,15 @@ mixin form-row-custom(lblClasses, fieldClasses, dataSource)
tr(ng-repeat='itemItem in item.fields')
td
div(ng-show='!tableIndexItemEditing(itemIndex, $index)')
- a.labelFormField(ng-if='item.type == "SORTED"' ng-click='tableIndexItemStartEdit(field, itemIndex, $index)') {{$index + 1}}) {{itemItem.name}} / {{itemItem.direction ? "ASC" : "DESC"}}
- a.labelFormField(ng-if='item.type != "SORTED"' ng-click='tableIndexItemStartEdit(field, itemIndex, $index)') {{$index + 1}}) {{itemItem.name}}
+ a.labelFormField(ng-if='item.indexType == "SORTED"' ng-click='tableIndexItemStartEdit(field, itemIndex, $index)') {{$index + 1}}) {{itemItem.name}} / {{itemItem.direction ? "ASC" : "DESC"}}
+ a.labelFormField(ng-if='item.indexType != "SORTED"' ng-click='tableIndexItemStartEdit(field, itemIndex, $index)') {{$index + 1}}) {{itemItem.name}}
+btn-remove('tableRemoveIndexItem(item, $index)', 'field.removeItemTip')
div(ng-show='tableIndexItemEditing(itemIndex, $index)')
- +table-index-item-edit('cur', '$index', '{{item.type == "SORTED"}}')
+ +table-index-item-edit('cur', '$index', '{{item.indexType == "SORTED"}}')
tfoot(ng-show='tableIndexNewItemActive(itemIndex)')
tr(style='padding-left: 18px')
td
- +table-index-item-edit('new', '-1', '{{item.type == "SORTED"}}')
+ +table-index-item-edit('new', '-1', '{{item.indexType == "SORTED"}}')
tfoot(ng-show='tableNewItemActive(field)')
tr
td
[2/2] ignite git commit: IGNITE-1867 Undefined checks
Posted by an...@apache.org.
IGNITE-1867 Undefined checks
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/1335f1fb
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/1335f1fb
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/1335f1fb
Branch: refs/heads/ignite-843-rc1
Commit: 1335f1fbf35cd58d9d27adb68797690d275ca7ed
Parents: 79b2a51
Author: vsisko <vs...@gridgain.com>
Authored: Wed Nov 11 17:45:04 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Nov 11 17:45:04 2015 +0700
----------------------------------------------------------------------
.../main/js/controllers/summary-controller.js | 26 +++++++++++---------
1 file changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/1335f1fb/modules/control-center-web/src/main/js/controllers/summary-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/summary-controller.js b/modules/control-center-web/src/main/js/controllers/summary-controller.js
index 9bfe3d7..4ce3f3f 100644
--- a/modules/control-center-web/src/main/js/controllers/summary-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/summary-controller.js
@@ -45,10 +45,11 @@ consoleModule.controller('summaryController', [
$scope.pojoClasses = function() {
var classes = [];
- _.forEach($scope.selectedItem.metadatas, function(meta) {
- classes.push(meta.keyType);
- classes.push(meta.valueType);
- });
+ if ($scope.selectedItem)
+ _.forEach($scope.selectedItem.metadatas, function(meta) {
+ classes.push(meta.keyType);
+ classes.push(meta.valueType);
+ });
return classes;
};
@@ -96,13 +97,14 @@ consoleModule.controller('summaryController', [
};
function selectPojoClass(config) {
- _.forEach($scope.selectedItem.metadatas, function(meta) {
- if (meta.keyType == config.pojoClass)
- return config.pojoClassBody = meta.keyClass;
-
- if (meta.valueType == config.pojoClass)
- return config.pojoClassBody = meta.valueClass;
- });
+ if ($scope.selectedItem)
+ _.forEach($scope.selectedItem.metadatas, function(meta) {
+ if (meta.keyType == config.pojoClass)
+ return config.pojoClassBody = meta.keyClass;
+
+ if (meta.valueType == config.pojoClass)
+ return config.pojoClassBody = meta.valueClass;
+ });
}
function pojoClsListener(config) {
@@ -189,7 +191,7 @@ consoleModule.controller('summaryController', [
};
$scope.pojoAvailable = function() {
- return $common.isDefined($scope.selectedItem.metadatas) && $scope.selectedItem.metadatas.length > 0;
+ return $scope.selectedItem && $common.isDefined($scope.selectedItem.metadatas) && $scope.selectedItem.metadatas.length > 0;
};
$scope.downloadConfiguration = function () {