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 2016/01/22 08:14:24 UTC
[01/10] ignite git commit: IGNITE-843 Fixed agent readme.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc3 4dcaabec9 -> 9ef6c9c9a
IGNITE-843 Fixed agent readme.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/97f2ab9d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/97f2ab9d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/97f2ab9d
Branch: refs/heads/ignite-843-rc3
Commit: 97f2ab9d0d062bf410d88df1ac72c6b0162d98e8
Parents: 4dcaabe
Author: Andrey <an...@gridgain.com>
Authored: Wed Jan 20 18:00:57 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Wed Jan 20 18:00:57 2016 +0700
----------------------------------------------------------------------
modules/control-center-agent/README.txt | 110 +++++++++++++--------------
1 file changed, 55 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/97f2ab9d/modules/control-center-agent/README.txt
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/README.txt b/modules/control-center-agent/README.txt
index 1fb94d2..1d62f68 100644
--- a/modules/control-center-agent/README.txt
+++ b/modules/control-center-agent/README.txt
@@ -5,82 +5,82 @@ Ignite Web Agent communicates with grid nodes via REST interface and connects to
Two main functions of Ignite Web Agent:
1. Proxy between Ignite Web Console and Ignite Grid to execute SQL statements and collect metrics for monitoring.
- You may need to specify URI for connect to Ignite REST server via "-n" option.
+ You may need to specify URI for connect to Ignite REST server via "-n" option.
2. Proxy between Ignite Web Console and user RDBMS to collect database metadata for later CacheTypeMetadata configuration.
- You may need to copy JDBC driver into "./jdbc-drivers" subfolder or specify path via "-d" option.
+ You may need to copy JDBC driver into "./jdbc-drivers" subfolder or specify path via "-d" option.
Usage example:
- ignite-web-agent.sh
+ ignite-web-agent.sh
Demo of Ignite Web Agent:
- In order to simplify evaluation two demo modes were implemented:
+ In order to simplify evaluation two demo modes were implemented:
- 1) Demo for metadata load from database.
- In this mode an in-memory H2 database will started.
- How to evaluate:
- 1.1) Go to Ignite Web Console "Metadata" screen.
- 1.2) Click "Load from demo database".
- 1.3) Click "Next" button. You should see list of available schemas.
- 1.4) Click "Next" button. You should see list of available tables.
- 1.5) Click "Next" button. You should see metadata load options.
- 1.6) Select some of them and click "Save".
+ 1) Demo for import domain model from database.
+ In this mode an in-memory H2 database will be started.
+ How to evaluate:
+ 1.1) Go to Ignite Web Console "Domain model" screen.
+ 1.2) Click "Demo".
+ 1.3) Click "Next" button. You should see list of available schemas.
+ 1.4) Click "Next" button. You should see list of available tables.
+ 1.5) Click "Next" button. You should see import options.
+ 1.6) Select some of them and click "Save".
- 2) Demo for SQL.
- In this mode internal Ignite node will be started. Cache created and populated with data.
- How to evaluate:
+ 2) Demo for SQL.
+ How to evaluate:
+ In this mode internal Ignite node will be started. Cache created and populated with data.
2.1) Go to Ignite Web Console "SQL" menu and select "SQL demo" menu item.
- 2.2) In "SQL demo" notebook paragraph enter SQL queries for tables: "Country, Department, Employee", "Parking, Car".
+ 2.2) "SQL demo" notebook contains preconfigured queries: "Simple query", "Query with aggregates", "Query with refresh rate".
+ 2.3) You can also execute any SQL queries for tables: "Country, Department, Employee", "Parking, Car".
- For example:
- 2.3) select "ParkingCache" cache,
- 2.4) Enter SQL statement:
- SELECT p.name, count(*) AS cnt
- FROM "ParkingCache".Parking p
- INNER JOIN "CarCache".Car c
- ON (p.id) = (c.parkingId)
- GROUP BY P.NAME
- 2.5) Click "Execute" button. You should get some data in table.
- 2.6) Click charts buttons to see auto generated charts.
+ For example:
+ 2.4) Enter SQL statement:
+ SELECT p.name, count(*) AS cnt
+ FROM "ParkingCache".Parking p
+ INNER JOIN "CarCache".Car c
+ ON (p.id) = (c.parkingId)
+ GROUP BY P.NAME
+ 2.5) Click "Execute" button. You should get some data in table.
+ 2.6) Click charts buttons to see auto generated charts.
Configuration file:
- Should be a file with simple line-oriented format as described here: http://docs.oracle.com/javase/7/docs/api/java/util/Properties.html#load(java.io.Reader)
+ Should be a file with simple line-oriented format as described here: http://docs.oracle.com/javase/7/docs/api/java/util/Properties.html#load(java.io.Reader)
- Available entries names:
- token
- server-uri
- node-uri
- driver-folder
+ Available entries names:
+ token
+ server-uri
+ node-uri
+ driver-folder
- Example configuration file:
- token=1a2b3c4d5f
- serverURI=wss://console.example.com:3001
+ Example configuration file:
+ token=1a2b3c4d5f
+ serverURI=wss://console.example.com:3001
Security token:
- 1) By default token will be included into downloaded agent zip.
- 2) You can get/change token in your profile.
+ 1) By default token will be included into downloaded agent zip.
+ 2) You can get/change token in your profile.
Ignite Web agent requirements:
- 1) Ignite node should be started with REST server (move ignite-rest-http folder from lib/optional/ to lib/).
- 2) Pass Ignite node REST server URI to agent.
+ 1) Ignite node should be started with REST server (move ignite-rest-http folder from lib/optional/ to lib/).
+ 2) Pass Ignite node REST server URI to agent.
Options:
- -h, --help
- Print this help message
- -c, --config
- Path to configuration file
- -d, --driver-folder
- Path to folder with JDBC drivers, default value: ./jdbc-drivers
- -n, --node-uri
- URI for connect to Ignite REST server, default value:
- http://localhost:8080
- -s, --server-uri
- URI for connect to Ignite Web Console via web-socket protocol, default
- value: wss://localhost:3001
- -t, --token
- User's security token
+ -h, --help
+ Print this help message
+ -c, --config
+ Path to configuration file
+ -d, --driver-folder
+ Path to folder with JDBC drivers, default value: ./jdbc-drivers
+ -n, --node-uri
+ URI for connect to Ignite REST server, default value:
+ http://localhost:8080
+ -s, --server-uri
+ URI for connect to Ignite Web Console via web-socket protocol, default
+ value: wss://localhost:3001
+ -t, --token
+ User's security token
Ignite Web Agent Build Instructions
==============================================
If you want to build from sources run following command in Ignite project root folder:
- mvn clean package -pl :ignite-control-center-agent -am -P control-center -DskipTests=true
+ mvn clean package -pl :ignite-control-center-agent -am -P control-center -DskipTests=true
[03/10] ignite git commit: IGNITE-2346 Common class with datasource
instances.
Posted by an...@apache.org.
IGNITE-2346 Common class with datasource instances.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/965e307e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/965e307e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/965e307e
Branch: refs/heads/ignite-843-rc3
Commit: 965e307e7b71e71f7d3b1f2a79b7686b441d3f07
Parents: 87df9d4
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Thu Jan 21 10:08:37 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Jan 21 10:08:37 2016 +0700
----------------------------------------------------------------------
.../main/js/helpers/generator/generator-java.js | 29 +++++++++++++-------
1 file changed, 19 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/965e307e/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 aae4a41..fe1bf4a 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
@@ -1036,13 +1036,11 @@ $generatorJava.cacheStoreDataSource = function (storeFactory, res) {
var beanClassName = $commonUtils.toJavaName(varType, dataSourceBean);
- res.line('/** Helper class for datasource creation. */');
- res.startBlock('public static class ' + beanClassName + ' {');
- res.line('public static final ' + varType + ' INSTANCE = createInstance();');
+ res.line('public static final ' + varType + ' INSTANCE_' + dataSourceBean + ' = create' + dataSourceBean + '();');
res.needEmptyLine = true;
- res.startBlock('private static ' + varType + ' createInstance() {');
+ res.startBlock('private static ' + varType + ' create' + dataSourceBean + '() {');
if (dialect === 'Oracle')
res.startBlock('try {');
@@ -1053,8 +1051,6 @@ $generatorJava.cacheStoreDataSource = function (storeFactory, res) {
switch (dialect) {
case 'Generic':
res.line(varName + '.setJdbcUrl(props.getProperty("' + dataSourceBean + '.jdbc.url"));');
- res.line(varName + '.setUser(props.getProperty("' + dataSourceBean + '.jdbc.username"));');
- res.line(varName + '.setPassword(props.getProperty("' + dataSourceBean + '.jdbc.password"));');
break;
@@ -1092,7 +1088,6 @@ $generatorJava.cacheStoreDataSource = function (storeFactory, res) {
}
res.endBlock('}');
- res.endBlock('}');
res.needEmptyLine = true;
@@ -1108,6 +1103,8 @@ $generatorJava.clusterDataSources = function (caches, res) {
var datasources = [];
+ var storeFound = false;
+
_.forEach(caches, function (cache) {
var factoryKind = cache.cacheStoreFactory.kind;
@@ -1119,12 +1116,24 @@ $generatorJava.clusterDataSources = function (caches, res) {
if (beanClassName && !_.contains(datasources, beanClassName)) {
datasources.push(beanClassName);
- if (factoryKind === 'CacheJdbcPojoStoreFactory' || factoryKind === 'CacheJdbcBlobStoreFactory')
+ if (factoryKind === 'CacheJdbcPojoStoreFactory' || factoryKind === 'CacheJdbcBlobStoreFactory') {
+ if (!storeFound) {
+ res.line('/** Helper class for datasource creation. */');
+ res.startBlock('public static class DataSources {');
+
+ storeFound = true;
+ }
+
$generatorJava.cacheStoreDataSource(storeFactory, res);
+ }
}
}
});
+ if (storeFound) {
+ res.endBlock('}');
+ }
+
return res;
};
@@ -1161,7 +1170,7 @@ $generatorJava.cacheStore = function (cache, domains, cacheVarName, res) {
var beanClassName = $generatorJava.dataSourceClassName(res, storeFactory);
- res.line('setDataSource(' + beanClassName + '.INSTANCE);');
+ res.line('setDataSource(DataSources.INSTANCE_' + storeFactory.dataSourceBean + ');');
res.needEmptyLine = true;
@@ -1212,7 +1221,7 @@ $generatorJava.cacheStore = function (cache, domains, cacheVarName, res) {
beanClassName = $generatorJava.dataSourceClassName(res, storeFactory);
- res.line('setDataSource(' + beanClassName + '.INSTANCE);');
+ res.line('setDataSource(DataSources.INSTANCE_' + storeFactory.dataSourceBean + ');');
res.needEmptyLine = true;
[06/10] ignite git commit: IGNITE-843 Minor fix.
Posted by an...@apache.org.
IGNITE-843 Minor fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/49b83a3c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/49b83a3c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/49b83a3c
Branch: refs/heads/ignite-843-rc3
Commit: 49b83a3c867bb02d223ab064f0323b453474520f
Parents: 9d9f604
Author: Andrey <an...@gridgain.com>
Authored: Thu Jan 21 11:57:58 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Jan 21 11:57:58 2016 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/controllers/common-module.js | 4 ++++
1 file changed, 4 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/49b83a3c/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 ba7e58a..e74223b 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
@@ -2094,6 +2094,10 @@ consoleModule.service('$agentDownload', [
if (_modal.skipSingleError)
_modal.skipSingleError = false;
else if (!_modal.$isShown) {
+ // Don't show missing node dialog on SQL demo enabling.
+ if (_modal.check.params && _modal.check.params.demo && timedOut)
+ return;
+
$loading.finish('loading');
_modal.$promise.then(_modal.show);
[02/10] ignite git commit: IGNITE-2284 Update store on save of cache
or domain.
Posted by an...@apache.org.
IGNITE-2284 Update store on save of cache or domain.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/87df9d4a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/87df9d4a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/87df9d4a
Branch: refs/heads/ignite-843-rc3
Commit: 87df9d4a589bc452bc9cbca28ce7edd1ed90ef36
Parents: 97f2ab9
Author: Andrey <an...@gridgain.com>
Authored: Thu Jan 21 10:06:27 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Jan 21 10:06:27 2016 +0700
----------------------------------------------------------------------
.../main/js/controllers/caches-controller.js | 30 +--------------
.../src/main/js/controllers/common-module.js | 40 ++++++++++++++++----
.../main/js/controllers/domains-controller.js | 32 ++++++++++++++--
modules/control-center-web/src/main/js/db.js | 2 +-
.../src/main/js/routes/domains.js | 21 +++++++++-
5 files changed, 83 insertions(+), 42 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/87df9d4a/modules/control-center-web/src/main/js/controllers/caches-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/caches-controller.js b/modules/control-center-web/src/main/js/controllers/caches-controller.js
index e9e0fb2..f0732db 100644
--- a/modules/control-center-web/src/main/js/controllers/caches-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/caches-controller.js
@@ -379,33 +379,6 @@ consoleModule.controller('cachesController', [
$scope.preview.statistics.allDefaults = $common.isEmptyString($scope.preview.statistics.xml);
}
}, true);
-
- $scope.$watchCollection('backupItem.domains', function (val) {
- if ($scope.selectedItemWatchGuard)
- $scope.selectedItemWatchGuard = false;
- else {
- var item = $scope.backupItem;
-
- var cacheStoreFactory = $common.isDefined(item) &&
- $common.isDefined(item.cacheStoreFactory) &&
- $common.isDefined(item.cacheStoreFactory.kind);
-
- if (val && !cacheStoreFactory) {
- if (_.findIndex(cacheDomains(item), $common.domainForStoreConfigured) >= 0) {
- item.cacheStoreFactory.kind = 'CacheJdbcPojoStoreFactory';
-
- if (!item.readThrough && !item.writeThrough) {
- item.readThrough = true;
- item.writeThrough = true;
- }
-
- $timeout(function () {
- $common.ensureActivePanel($scope.panels, 'store');
- });
- }
- }
- }
- });
})
.error(function (errMsg) {
$common.showError(errMsg);
@@ -629,9 +602,10 @@ consoleModule.controller('cachesController', [
// Save cache.
$scope.saveItem = function () {
if ($scope.tableReset(true)) {
-
var item = $scope.backupItem;
+ angular.extend(item, $common.autoCacheStoreConfiguration(item, cacheDomains(item)));
+
if (validate(item))
save(item);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/87df9d4a/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 1399f58..ba7e58a 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
@@ -695,6 +695,15 @@ consoleModule.service('$common', [
{value: 'H2', label: 'H2 database'}
];
+ function domainForStoreConfigured(domain) {
+ var isEmpty = !isDefined(domain) || (isEmptyString(domain.databaseSchema) &&
+ isEmptyString(domain.databaseTable) &&
+ isEmptyArray(domain.keyFields) &&
+ isEmptyArray(domain.valueFields));
+
+ return !isEmpty;
+ }
+
return {
getModel: getModel,
joinTip: function (arr) {
@@ -788,14 +797,7 @@ consoleModule.service('$common', [
return !isEmpty;
},
- domainForStoreConfigured: function (domain) {
- var isEmpty = !isDefined(domain) || (isEmptyString(domain.databaseSchema) &&
- isEmptyString(domain.databaseTable) &&
- isEmptyArray(domain.keyFields) &&
- isEmptyArray(domain.valueFields));
-
- return !isEmpty;
- },
+ domainForStoreConfigured: domainForStoreConfigured,
/**
* Cut class name by width in pixel or width in symbol count.
*
@@ -1061,6 +1063,28 @@ consoleModule.service('$common', [
}));
return res;
+ },
+ autoCacheStoreConfiguration: function (cache, domains) {
+ var change;
+
+ var cacheStoreFactory = isDefined(cache.cacheStoreFactory) &&
+ isDefined(cache.cacheStoreFactory.kind);
+
+ if (!cacheStoreFactory && _.findIndex(domains, domainForStoreConfigured) >= 0) {
+ var dflt = !cache.readThrough && !cache.writeThrough;
+
+ return {
+ cacheStoreFactory: {
+ kind: 'CacheJdbcPojoStoreFactory',
+ CacheJdbcPojoStoreFactory: {
+ dataSourceBean: cache.name + 'DS',
+ dialect: 'Generic'
+ }
+ },
+ readThrough: dflt || cache.readThrough,
+ writeThrough: dflt || cache.writeThrough
+ };
+ }
}
};
}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/87df9d4a/modules/control-center-web/src/main/js/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/domains-controller.js b/modules/control-center-web/src/main/js/controllers/domains-controller.js
index a3a982d..bd88bbf 100644
--- a/modules/control-center-web/src/main/js/controllers/domains-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/domains-controller.js
@@ -816,6 +816,7 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
var batch = [];
var tables = [];
+ var checkedCaches = [];
var dupCnt = 0;
var containKey = true;
@@ -942,14 +943,28 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
newDomain.newCache.cacheStoreFactory = {
kind: 'CacheJdbcPojoStoreFactory',
CacheJdbcPojoStoreFactory: {
- dataSourceBean: 'dataSource' + dialect,
+ dataSourceBean: newDomain.newCache.name + 'DS',
dialect: dialect
}
};
}
}
- else if (table.cache !== IMPORT_DM_DO_NOT_GENERATE._id)
- newDomain.caches = [table.cache];
+ else if (table.cache !== IMPORT_DM_DO_NOT_GENERATE._id) {
+ var cacheId = table.cache;
+
+ newDomain.caches = [cacheId];
+
+ if (!_.contains(checkedCaches, cacheId)) {
+ var cache = _.find($scope.caches, {value: cacheId}).cache;
+
+ var change = $common.autoCacheStoreConfiguration(cache, [newDomain]);
+
+ if (change)
+ newDomain.cacheStoreChanges = [{cacheId: cacheId, change: change}];
+
+ checkedCaches.push(cacheId)
+ }
+ }
}
batch.push(newDomain);
@@ -1324,6 +1339,17 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
if ($scope.tableReset(true)) {
var item = $scope.backupItem;
+ item.cacheStoreChanges = [];
+
+ _.forEach(item.caches, function (cacheId) {
+ var cache = _.find($scope.caches, {value: cacheId}).cache;
+
+ var change = $common.autoCacheStoreConfiguration(cache, [item]);
+
+ if (change)
+ item.cacheStoreChanges.push({cacheId: cacheId, change: change});
+ });
+
if (validate(item))
save(item);
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/87df9d4a/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 8ecb71e..6d5ad65 100644
--- a/modules/control-center-web/src/main/js/db.js
+++ b/modules/control-center-web/src/main/js/db.js
@@ -74,7 +74,7 @@ exports.Space = mongoose.model('Space', new Schema({
var DomainModelSchema = new Schema({
space: {type: ObjectId, ref: 'Space'},
caches: [{type: ObjectId, ref: 'Cache'}],
- queryMetadata: {type: String, enum: ['Annotations', 'Config']},
+ queryMetadata: {type: String, enum: ['Annotations', 'Configuration']},
kind: {type: String, enum: ['query', 'store', 'both']},
databaseSchema: String,
databaseTable: String,
http://git-wip-us.apache.org/repos/asf/ignite/blob/87df9d4a/modules/control-center-web/src/main/js/routes/domains.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/domains.js b/modules/control-center-web/src/main/js/routes/domains.js
index 4867807..e52f7ee 100644
--- a/modules/control-center-web/src/main/js/routes/domains.js
+++ b/modules/control-center-web/src/main/js/routes/domains.js
@@ -76,6 +76,8 @@ function _saveDomainModel(domain, savedDomains, callback) {
var domainId = domain._id;
var caches = domain.caches;
+ var cacheStoreChanges = domain.cacheStoreChanges;
+
if (domainId)
db.DomainModel.update({_id: domain._id}, domain, {upsert: true}, function (err) {
if (err)
@@ -91,7 +93,7 @@ function _saveDomainModel(domain, savedDomains, callback) {
else {
savedDomains.push(domain);
- callback();
+ _updateCacheStore(cacheStoreChanges, callback);
}
});
});
@@ -115,7 +117,7 @@ function _saveDomainModel(domain, savedDomains, callback) {
else {
savedDomains.push(domain);
- callback();
+ _updateCacheStore(cacheStoreChanges, callback);
}
});
}
@@ -123,6 +125,21 @@ function _saveDomainModel(domain, savedDomains, callback) {
});
}
+function _updateCacheStore(cacheStoreChanges, callback) {
+ if (cacheStoreChanges && cacheStoreChanges.length > 0) {
+ async.forEachOf(cacheStoreChanges, function (change, idx, callback) {
+ db.Cache.update({_id: {$eq: change.cacheId}}, change.change, {}, function (err) {
+ if (err)
+ callback(err);
+ else
+ callback();
+ });
+ }, callback);
+ }
+ else
+ callback();
+}
+
function _save(domains, res) {
var savedDomains = [];
var generatedCaches = [];
[04/10] ignite git commit: IGNITE-2360 Show all metadata on fix of
last without keyfields.
Posted by an...@apache.org.
IGNITE-2360 Show all metadata on fix of last without keyfields.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/02838a0d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/02838a0d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/02838a0d
Branch: refs/heads/ignite-843-rc3
Commit: 02838a0d6508a5dd7201bcb2e3f80de97f1af05a
Parents: 965e307
Author: Vasiliy Sisko <vs...@gridgain.com>
Authored: Thu Jan 21 10:10:03 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Jan 21 10:10:03 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/domains-controller.js | 16 +++++++++++-----
1 file changed, 11 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/02838a0d/modules/control-center-web/src/main/js/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/domains-controller.js b/modules/control-center-web/src/main/js/controllers/domains-controller.js
index bd88bbf..e792f32 100644
--- a/modules/control-center-web/src/main/js/controllers/domains-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/domains-controller.js
@@ -1328,6 +1328,8 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
$scope.selectItem(savedMeta);
$common.showInfo('Domain model "' + item.valueType + '" saved.');
+
+ _checkShowValidPresentation();
})
.error(function (errMsg) {
$common.showError(errMsg);
@@ -1406,11 +1408,7 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
$scope.selectItem(undefined, undefined);
}
- if (!$scope.ui.showValid) {
- var validFilter = $filter('domainsValidation');
-
- $scope.ui.showValid = validFilter($scope.domains, false, true).length === 0;
- }
+ _checkShowValidPresentation();
})
.error(function (errMsg) {
$common.showError(errMsg);
@@ -1418,6 +1416,14 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
});
};
+ function _checkShowValidPresentation() {
+ if (!$scope.ui.showValid) {
+ var validFilter = $filter('domainsValidation');
+
+ $scope.ui.showValid = validFilter($scope.domains, false, true).length === 0;
+ }
+ }
+
// Remove all domain models from db.
$scope.removeAllItems = function () {
$table.tableReset();
[09/10] ignite git commit: IGNITE-843 Missed fields fixed domain
index focus
Posted by an...@apache.org.
IGNITE-843 Missed fields fixed domain index focus
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/e9673013
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/e9673013
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/e9673013
Branch: refs/heads/ignite-843-rc3
Commit: e9673013c08f0bc72ce3fc5e95e83088c968d9a0
Parents: bfd9b54
Author: Andrey <an...@gridgain.com>
Authored: Fri Jan 22 09:53:10 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jan 22 09:53:10 2016 +0700
----------------------------------------------------------------------
.../main/js/controllers/clusters-controller.js | 7 +++++++
.../main/js/controllers/domains-controller.js | 10 +++++-----
.../src/main/js/controllers/models/caches.json | 21 +++++++++++++++++++-
.../main/js/controllers/models/clusters.json | 1 +
modules/control-center-web/src/main/js/db.js | 2 ++
.../main/js/helpers/generator/generator-java.js | 16 ++++++++-------
.../main/js/helpers/generator/generator-xml.js | 16 ++++++++-------
7 files changed, 53 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9673013/modules/control-center-web/src/main/js/controllers/clusters-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/clusters-controller.js b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
index 295ff9a..73f6f8c 100644
--- a/modules/control-center-web/src/main/js/controllers/clusters-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/clusters-controller.js
@@ -660,6 +660,13 @@ consoleModule.controller('clustersController', function ($http, $timeout, $scope
}
}
+ if (item.rebalanceThreadPoolSize && item.systemThreadPoolSize && item.systemThreadPoolSize <= item.rebalanceThreadPoolSize) {
+ $scope.ui.expanded = true;
+
+ return showPopoverMessage($scope.panels, 'pools', 'rebalanceThreadPoolSize',
+ 'Rebalance thread pool size exceed or equals System thread pool size');
+ }
+
return true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9673013/modules/control-center-web/src/main/js/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/domains-controller.js b/modules/control-center-web/src/main/js/controllers/domains-controller.js
index e792f32..e638f32 100644
--- a/modules/control-center-web/src/main/js/controllers/domains-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/domains-controller.js
@@ -907,10 +907,10 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
var dupSfx = (dup ? '_' + dupCnt : '');
- newDomain.keyType = valType + 'Key' + dupSfx;
newDomain.keyType = valType + 'Key' + dupSfx;
newDomain.valueType = valType + dupSfx;
+ newDomain.queryMetadata = 'Configuration';
newDomain.databaseSchema = table.schema;
newDomain.databaseTable = tableName;
newDomain.fields = qryFields;
@@ -943,7 +943,7 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
newDomain.newCache.cacheStoreFactory = {
kind: 'CacheJdbcPojoStoreFactory',
CacheJdbcPojoStoreFactory: {
- dataSourceBean: newDomain.newCache.name + 'DS',
+ dataSourceBean: 'ds' + dialect,
dialect: dialect
}
};
@@ -1658,7 +1658,7 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
var index = $scope.backupItem.indexes[indexIdx];
$table.tableState(field, -1, 'table-index-fields');
- $table.tableFocusInvalidField('FieldName' + (index.indexType === 'SORTED' ? 'S' : ''), indexIdx);
+ $table.tableFocusInvalidField(-1, 'FieldName' + (index.indexType === 'SORTED' ? 'S' : '') + indexIdx);
field.newFieldName = null;
field.newDirection = true;
@@ -1741,6 +1741,8 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
$table.tableReset();
+ field.indexIdx = -1;
+
if (curIdx < 0) {
if (index.fields)
index.fields.push(indexItemValue);
@@ -1761,8 +1763,6 @@ consoleModule.controller('domainsController', function ($filter, $http, $timeout
}
}
- field.indexIdx = -1;
-
return true;
};
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9673013/modules/control-center-web/src/main/js/controllers/models/caches.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/caches.json b/modules/control-center-web/src/main/js/controllers/models/caches.json
index e89130a..dc17a61 100644
--- a/modules/control-center-web/src/main/js/controllers/models/caches.json
+++ b/modules/control-center-web/src/main/js/controllers/models/caches.json
@@ -367,6 +367,15 @@
]
},
{
+ "label": "Snapshotable index",
+ "id": "snapshotableIndex",
+ "type": "check",
+ "model": "snapshotableIndex",
+ "tip": [
+ "Flag indicating whether SQL indexes should support snapshots"
+ ]
+ },
+ {
"label": "Escape table and filed names",
"id": "sqlEscapeAll",
"type": "check",
@@ -616,7 +625,6 @@
"id": "storeKeepBinary",
"type": "check",
"model": "storeKeepBinary",
- "placeholder": true,
"tip": [
"Flag indicating that CacheStore implementation is working with binary objects instead of Java objects"
]
@@ -826,6 +834,17 @@
]
},
{
+ "label": "Batches prefetch count",
+ "id": "rebalanceBatchesPrefetchCount",
+ "type": "number",
+ "model": "rebalanceBatchesPrefetchCount",
+ "placeholder": "2",
+ "min": 1,
+ "tip": [
+ "number of batches generated by supply node at rebalancing start"
+ ]
+ },
+ {
"label": "Order",
"id": "rebalanceOrder",
"type": "number",
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9673013/modules/control-center-web/src/main/js/controllers/models/clusters.json
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/models/clusters.json b/modules/control-center-web/src/main/js/controllers/models/clusters.json
index bcb69a0..b9a2778 100644
--- a/modules/control-center-web/src/main/js/controllers/models/clusters.json
+++ b/modules/control-center-web/src/main/js/controllers/models/clusters.json
@@ -1834,6 +1834,7 @@
"type": "number",
"model": "rebalanceThreadPoolSize",
"placeholder": 1,
+ "min": 1,
"tip": [
"Max count of threads can be used at rebalancing"
]
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9673013/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 6d5ad65..7e0c30f 100644
--- a/modules/control-center-web/src/main/js/db.js
+++ b/modules/control-center-web/src/main/js/db.js
@@ -127,6 +127,7 @@ var CacheSchema = new Schema({
rebalanceMode: {type: String, enum: ['SYNC', 'ASYNC', 'NONE']},
rebalanceBatchSize: Number,
+ rebalanceBatchesPrefetchCount: Number,
rebalanceOrder: Number,
rebalanceDelay: Number,
rebalanceTimeout: Number,
@@ -185,6 +186,7 @@ var CacheSchema = new Schema({
sqlOnheapRowCacheSize: Number,
longQueryWarningTimeout: Number,
sqlFunctionClasses: [String],
+ snapshotableIndex: Boolean,
statisticsEnabled: Boolean,
managementEnabled: Boolean,
readFromBackup: Boolean,
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9673013/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 fe1bf4a..7343e7a 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
@@ -985,6 +985,7 @@ $generatorJava.cacheQuery = function (cache, varName, res) {
$generatorJava.property(res, varName, cache, 'sqlSchema');
$generatorJava.property(res, varName, cache, 'sqlOnheapRowCacheSize');
$generatorJava.property(res, varName, cache, 'longQueryWarningTimeout');
+ $generatorJava.property(res, varName, cache, 'snapshotableIndex', null, null, false);
var indexedTypes = _.filter(cache.domains, function (domain) {
return domain.queryMetadata === 'Annotations'
@@ -1300,13 +1301,14 @@ $generatorJava.cacheRebalance = function (cache, varName, res) {
res = $generatorCommon.builder();
if (cache.cacheMode !== 'LOCAL') {
- $generatorJava.property(res, varName, cache, 'rebalanceMode', 'org.apache.ignite.cache.CacheRebalanceMode');
- $generatorJava.property(res, varName, cache, 'rebalanceThreadPoolSize');
- $generatorJava.property(res, varName, cache, 'rebalanceBatchSize');
- $generatorJava.property(res, varName, cache, 'rebalanceOrder');
- $generatorJava.property(res, varName, cache, 'rebalanceDelay');
- $generatorJava.property(res, varName, cache, 'rebalanceTimeout');
- $generatorJava.property(res, varName, cache, 'rebalanceThrottle');
+ $generatorJava.property(res, varName, cache, 'rebalanceMode', 'org.apache.ignite.cache.CacheRebalanceMode', null, 'ASYNC');
+ $generatorJava.property(res, varName, cache, 'rebalanceThreadPoolSize', null, null, 1);
+ $generatorJava.property(res, varName, cache, 'rebalanceBatchSize', null, null, 524288);
+ $generatorJava.property(res, varName, cache, 'rebalanceBatchesPrefetchCount', null, null, 2);
+ $generatorJava.property(res, varName, cache, 'rebalanceOrder', null, null, 0);
+ $generatorJava.property(res, varName, cache, 'rebalanceDelay', null, null, 0);
+ $generatorJava.property(res, varName, cache, 'rebalanceTimeout', null, null, 10000);
+ $generatorJava.property(res, varName, cache, 'rebalanceThrottle', null, null, 0);
res.needEmptyLine = true;
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/e9673013/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 cb41ea8..16986f2 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
@@ -764,6 +764,7 @@ $generatorXml.cacheQuery = function(cache, res) {
$generatorXml.property(res, cache, 'sqlSchema');
$generatorXml.property(res, cache, 'sqlOnheapRowCacheSize');
$generatorXml.property(res, cache, 'longQueryWarningTimeout');
+ $generatorXml.property(res, cache, 'snapshotableIndex', null, false);
var indexedTypes = _.filter(cache.domains, function (domain) {
return domain.queryMetadata === 'Annotations'
@@ -922,13 +923,14 @@ $generatorXml.cacheRebalance = function(cache, res) {
res = $generatorCommon.builder();
if (cache.cacheMode !== 'LOCAL') {
- $generatorXml.property(res, cache, 'rebalanceMode');
- $generatorXml.property(res, cache, 'rebalanceThreadPoolSize');
- $generatorXml.property(res, cache, 'rebalanceBatchSize');
- $generatorXml.property(res, cache, 'rebalanceOrder');
- $generatorXml.property(res, cache, 'rebalanceDelay');
- $generatorXml.property(res, cache, 'rebalanceTimeout');
- $generatorXml.property(res, cache, 'rebalanceThrottle');
+ $generatorXml.property(res, cache, 'rebalanceMode', null, 'ASYNC');
+ $generatorXml.property(res, cache, 'rebalanceThreadPoolSize', null, 1);
+ $generatorXml.property(res, cache, 'rebalanceBatchSize', null, 524288);
+ $generatorXml.property(res, cache, 'rebalanceBatchesPrefetchCount', null, 2);
+ $generatorXml.property(res, cache, 'rebalanceOrder', null, 0);
+ $generatorXml.property(res, cache, 'rebalanceDelay', null, 0);
+ $generatorXml.property(res, cache, 'rebalanceTimeout', null, 10000);
+ $generatorXml.property(res, cache, 'rebalanceThrottle', null, 0);
res.needEmptyLine = true;
}
[10/10] ignite git commit: IGNITE-1177 Rename
Posted by an...@apache.org.
IGNITE-1177 Rename
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9ef6c9c9
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9ef6c9c9
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9ef6c9c9
Branch: refs/heads/ignite-843-rc3
Commit: 9ef6c9c9afcda03e1ae24a70e246cbe6118c8077
Parents: e967301
Author: Andrey <an...@gridgain.com>
Authored: Fri Jan 22 13:52:35 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jan 22 13:52:35 2016 +0700
----------------------------------------------------------------------
.../src/main/js/app/modules/configuration/sidebar/main.js | 2 +-
.../src/main/js/views/configuration/caches.jade | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9ef6c9c9/modules/control-center-web/src/main/js/app/modules/configuration/sidebar/main.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/configuration/sidebar/main.js b/modules/control-center-web/src/main/js/app/modules/configuration/sidebar/main.js
index 9a5d745..5130d91 100644
--- a/modules/control-center-web/src/main/js/app/modules/configuration/sidebar/main.js
+++ b/modules/control-center-web/src/main/js/app/modules/configuration/sidebar/main.js
@@ -25,7 +25,7 @@ angular
const items = [
{ text: 'Clusters', sref: 'base.configuration.clusters' },
{ text: 'Caches', sref: 'base.configuration.caches' },
- { text: 'Domain model', sref: 'base.configuration.domains' },
+ { text: 'Model', sref: 'base.configuration.domains' },
{ text: 'IGFS', sref: 'base.configuration.igfs' }
];
http://git-wip-us.apache.org/repos/asf/ignite/blob/9ef6c9c9/modules/control-center-web/src/main/js/views/configuration/caches.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/configuration/caches.jade b/modules/control-center-web/src/main/js/views/configuration/caches.jade
index 4b2803a..721165b 100644
--- a/modules/control-center-web/src/main/js/views/configuration/caches.jade
+++ b/modules/control-center-web/src/main/js/views/configuration/caches.jade
@@ -22,17 +22,17 @@ include ../includes/controls
ignite-callout
ignite-callout-cel(data-title='On This Screen')
li Configure Caches
- li Link Domain models to Caches
+ li Link Domain model to Caches
li Link Caches to Clusters
li
ignite-dialog More info
ignite-dialog-title Caches screen
ignite-dialog-content
- | Caches can be linked with specified #[a(ui-sref='base.configuration.clusters') clusters] and #[a(ui-sref='base.configuration.domains') domain models].#[br]
+ | Caches can be linked with specified #[a(ui-sref='base.configuration.clusters') clusters] and #[a(ui-sref='base.configuration.domains') domain model].#[br]
| Generated cluster with caches configuration available on #[a(ui-sref='base.configuration.summary') summary] screen.
ignite-callout-cel(data-title='Next Steps')
- li Continue to #[a(ui-sref='base.configuration.domains') Domain models]
+ li Continue to #[a(ui-sref='base.configuration.domains') Domain model]
li Continue to #[a(ui-sref='base.configuration.summary') Summary]
li Back to #[a(ui-sref='base.configuration.clusters') Clusters]
[05/10] ignite git commit: IGNITE-843 Added JVM_OPTS to console agent.
Posted by an...@apache.org.
IGNITE-843 Added JVM_OPTS to console agent.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9d9f604c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9d9f604c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9d9f604c
Branch: refs/heads/ignite-843-rc3
Commit: 9d9f604cb4ce3158e8c88a5f32d12fa3c9f8fefc
Parents: 02838a0
Author: Andrey <an...@gridgain.com>
Authored: Thu Jan 21 10:48:00 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Jan 21 10:48:00 2016 +0700
----------------------------------------------------------------------
modules/control-center-agent/bin/ignite-web-agent.bat | 9 ++++++++-
modules/control-center-agent/bin/ignite-web-agent.sh | 11 ++++++++++-
2 files changed, 18 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/9d9f604c/modules/control-center-agent/bin/ignite-web-agent.bat
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/bin/ignite-web-agent.bat b/modules/control-center-agent/bin/ignite-web-agent.bat
index 796ddf9..8be3066 100644
--- a/modules/control-center-agent/bin/ignite-web-agent.bat
+++ b/modules/control-center-agent/bin/ignite-web-agent.bat
@@ -15,4 +15,11 @@
:: limitations under the License.
::
-java -jar ignite-web-agent-${version}.jar %*
+::
+:: JVM options. See http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp for more details.
+::
+:: ADD YOUR/CHANGE ADDITIONAL OPTIONS HERE
+::
+if "%JVM_OPTS%" == "" set JVM_OPTS=-Xms1g -Xmx1g -server -XX:+AggressiveOpts -XX:MaxPermSize=256m
+
+java %JVM_OPTS% -jar ignite-web-agent-${version}.jar %*
http://git-wip-us.apache.org/repos/asf/ignite/blob/9d9f604c/modules/control-center-agent/bin/ignite-web-agent.sh
----------------------------------------------------------------------
diff --git a/modules/control-center-agent/bin/ignite-web-agent.sh b/modules/control-center-agent/bin/ignite-web-agent.sh
index a7bae1f..eb7530f 100644
--- a/modules/control-center-agent/bin/ignite-web-agent.sh
+++ b/modules/control-center-agent/bin/ignite-web-agent.sh
@@ -33,4 +33,13 @@ DIR="$( cd -P "$( dirname "$SOURCE" )" && pwd )"
cd $DIR
-java -jar ignite-web-agent-${version}.jar "$@"
+#
+# JVM options. See http://java.sun.com/javase/technologies/hotspot/vmoptions.jsp for more details.
+#
+# ADD YOUR/CHANGE ADDITIONAL OPTIONS HERE
+#
+if [ -z "$JVM_OPTS" ] ; then
+ JVM_OPTS="-Xms1g -Xmx1g -server -XX:+AggressiveOpts -XX:MaxPermSize=256m"
+fi
+
+java ${JVM_OPTS} -jar ignite-web-agent-${version}.jar "$@"
[08/10] ignite git commit: IGNITE-2348 Fixed ui.
Posted by an...@apache.org.
IGNITE-2348 Fixed ui.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/bfd9b54d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/bfd9b54d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/bfd9b54d
Branch: refs/heads/ignite-843-rc3
Commit: bfd9b54d4a49342ad350a2e39056809caa8950b5
Parents: c45e4dc
Author: Andrey <an...@gridgain.com>
Authored: Fri Jan 22 09:35:52 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Fri Jan 22 09:35:52 2016 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/common-module.js | 8 ++++++--
.../src/main/js/public/stylesheets/style.scss | 10 ++++++++++
.../src/main/js/views/includes/header.jade | 2 +-
.../src/main/js/views/templates/dropdown.jade | 2 +-
4 files changed, 18 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/bfd9b54d/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 e74223b..ef460a1 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
@@ -2229,8 +2229,7 @@ consoleModule.controller('notebooks', ['$scope', '$modal', '$state', '$http', '$
$scope.$root.rebuildDropdown = function() {
$scope.notebookDropdown = [
{text: 'Create new notebook', click: 'inputNotebookName()'},
- {divider: true},
- {text: 'SQL demo', sref: 'base.sql.demo'}
+ {divider: true}
];
_.forEach($scope.$root.notebooks, function (notebook) {
@@ -2239,6 +2238,11 @@ consoleModule.controller('notebooks', ['$scope', '$modal', '$state', '$http', '$
sref: 'base.sql.notebook({noteId:"' + notebook._id + '"})'
});
});
+
+ if ($scope.$root.notebooks.length > 0)
+ $scope.notebookDropdown.push({divider: true});
+
+ $scope.notebookDropdown.push({text: 'SQL demo', sref: 'base.sql.demo', custom: true});
};
$scope.$root.reloadNotebooks = function() {
http://git-wip-us.apache.org/repos/asf/ignite/blob/bfd9b54d/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index b37b1ad..02c3410 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -552,6 +552,16 @@ button.form-control {
}
}
+.theme-line .sql-notebooks {
+ li.custom > a {
+ color: $brand-info;
+ }
+
+ li.custom > a:hover {
+ color: darken($brand-info, 15%);
+ }
+}
+
.theme-line .paragraphs {
.panel-group .panel + .panel {
margin-top: 30px;
http://git-wip-us.apache.org/repos/asf/ignite/blob/bfd9b54d/modules/control-center-web/src/main/js/views/includes/header.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/includes/header.jade b/modules/control-center-web/src/main/js/views/includes/header.jade
index 857f7a4..9566611 100644
--- a/modules/control-center-web/src/main/js/views/includes/header.jade
+++ b/modules/control-center-web/src/main/js/views/includes/header.jade
@@ -28,7 +28,7 @@ header#header.header
a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='sidebar.items' data-placement='bottom-right') Configuration
span.caret
- li(ng-class='{active: $state.includes("base.sql")}' ng-controller='notebooks')
+ li.sql-notebooks(ng-class='{active: $state.includes("base.sql")}' ng-controller='notebooks')
a.dropdown-toggle(data-toggle='dropdown' bs-dropdown='notebookDropdown' data-placement='bottom-left') SQL
span.caret
http://git-wip-us.apache.org/repos/asf/ignite/blob/bfd9b54d/modules/control-center-web/src/main/js/views/templates/dropdown.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/templates/dropdown.jade b/modules/control-center-web/src/main/js/views/templates/dropdown.jade
index 708695f..862dbcd 100644
--- a/modules/control-center-web/src/main/js/views/templates/dropdown.jade
+++ b/modules/control-center-web/src/main/js/views/templates/dropdown.jade
@@ -1,5 +1,5 @@
ul.dropdown-menu(tabindex='-1' role='menu' ng-show='content && content.length')
- li(role='presentation' ui-sref-active='active' ng-class='{divider: item.divider, active: item.active}' ng-repeat='item in content')
+ li(role='presentation' ui-sref-active='active' ng-class='{divider: item.divider, active: item.active, custom: item.custom}' ng-repeat='item in content')
a(role='menuitem' tabindex='-1' ui-sref='{{item.sref}}' ng-if='!item.divider && item.sref' ng-bind='item.text')
a(role='menuitem' tabindex='-1' ng-href='{{item.href}}' ng-if='!item.divider && item.href' target="{{item.target || ''}}" ng-bind='item.text')
a(role='menuitem' tabindex='-1' href='javascript:void(0)' ng-if='!item.divider && item.click' ng-click='$eval(item.click);$hide()' ng-bind='item.text')
[07/10] ignite git commit: IGNITE-2362 Fixed error.
Posted by an...@apache.org.
IGNITE-2362 Fixed error.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c45e4dc5
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c45e4dc5
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c45e4dc5
Branch: refs/heads/ignite-843-rc3
Commit: c45e4dc50df601d41a9041e0b2bd7db7f384ab48
Parents: 49b83a3
Author: Andrey <an...@gridgain.com>
Authored: Thu Jan 21 12:40:21 2016 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Thu Jan 21 12:40:21 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/app/index.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c45e4dc5/modules/control-center-web/src/main/js/app/index.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/index.js b/modules/control-center-web/src/main/js/app/index.js
index 6fcaad5..7c56081 100644
--- a/modules/control-center-web/src/main/js/app/index.js
+++ b/modules/control-center-web/src/main/js/app/index.js
@@ -147,7 +147,7 @@ angular
templateUrl: '/base.html'
});
- $urlRouterProvider.when('/', '/configuration/clusters');
+ $urlRouterProvider.when('/', '/login');
$locationProvider.html5Mode(true);
}])