You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2016/02/16 08:14:15 UTC
[1/2] ignite git commit: IGNITE-843 Optimize getting data from server
side.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 f80a0384e -> 31c6d78f8
IGNITE-843 Optimize getting data from server side.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7d539d7c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7d539d7c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7d539d7c
Branch: refs/heads/ignite-843-rc2
Commit: 7d539d7ce7af77954f4ac40ae82fa9d08ee430b1
Parents: 3e9942e
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Feb 16 14:14:01 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Feb 16 14:14:01 2016 +0700
----------------------------------------------------------------------
modules/control-center-web/src/main/js/serve/mongo.js | 2 +-
modules/control-center-web/src/main/js/serve/routes/admin.js | 2 +-
.../control-center-web/src/main/js/serve/routes/caches.js | 6 +++---
.../control-center-web/src/main/js/serve/routes/clusters.js | 8 ++++----
.../control-center-web/src/main/js/serve/routes/domains.js | 6 +++---
modules/control-center-web/src/main/js/serve/routes/igfs.js | 4 ++--
.../control-center-web/src/main/js/serve/routes/notebooks.js | 2 +-
7 files changed, 15 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d539d7c/modules/control-center-web/src/main/js/serve/mongo.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/mongo.js b/modules/control-center-web/src/main/js/serve/mongo.js
index 5dc1209..9021016 100644
--- a/modules/control-center-web/src/main/js/serve/mongo.js
+++ b/modules/control-center-web/src/main/js/serve/mongo.js
@@ -541,7 +541,7 @@ module.exports.factory = function(deepPopulatePlugin, passportMongo, settings, p
* @returns {Promise}
*/
result.spaces = function(userId) {
- return result.Space.find({owner: userId}).exec();
+ return result.Space.find({owner: userId}).lean().exec();
};
/**
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d539d7c/modules/control-center-web/src/main/js/serve/routes/admin.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/admin.js b/modules/control-center-web/src/main/js/serve/routes/admin.js
index 50488b1..a7972ef 100644
--- a/modules/control-center-web/src/main/js/serve/routes/admin.js
+++ b/modules/control-center-web/src/main/js/serve/routes/admin.js
@@ -32,7 +32,7 @@ module.exports.factory = function(_, express, nodemailer, settings, mongo) {
* Get list of user accounts.
*/
router.post('/list', (req, res) => {
- mongo.Account.find({}).sort('username').exec()
+ mongo.Account.find({}).sort('username').lean().exec()
.then((users) => res.json(users))
.catch((err) => mongo.handleError(res, err));
});
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d539d7c/modules/control-center-web/src/main/js/serve/routes/caches.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/caches.js b/modules/control-center-web/src/main/js/serve/routes/caches.js
index 4411a61..69a37e2 100644
--- a/modules/control-center-web/src/main/js/serve/routes/caches.js
+++ b/modules/control-center-web/src/main/js/serve/routes/caches.js
@@ -44,17 +44,17 @@ module.exports.factory = function(_, express, mongo) {
result.spaces = spaces;
spacesIds = mongo.spacesIds(spaces);
- return mongo.Cluster.find({space: {$in: spacesIds}}).sort('name').exec();
+ return mongo.Cluster.find({space: {$in: spacesIds}}).sort('name').lean().exec();
})
.then((clusters) => {
result.clusters = clusters;
- return mongo.DomainModel.find({space: {$in: spacesIds}}).sort('name').exec();
+ return mongo.DomainModel.find({space: {$in: spacesIds}}).sort('name').lean().exec();
})
.then((domains) => {
result.domains = domains;
- return mongo.Cache.find({space: {$in: spacesIds}}).sort('name').exec();
+ return mongo.Cache.find({space: {$in: spacesIds}}).sort('name').lean().exec();
})
.then((caches) => {
result.caches = caches;
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d539d7c/modules/control-center-web/src/main/js/serve/routes/clusters.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/clusters.js b/modules/control-center-web/src/main/js/serve/routes/clusters.js
index 08d0051..fd936a1 100644
--- a/modules/control-center-web/src/main/js/serve/routes/clusters.js
+++ b/modules/control-center-web/src/main/js/serve/routes/clusters.js
@@ -43,12 +43,12 @@ module.exports.factory = function(_, express, mongo) {
result.spaces = spaces;
spacesIds = mongo.spacesIds(spaces);
- return mongo.DomainModel.find({space: {$in: spacesIds}}).sort('valueType').exec();
+ return mongo.DomainModel.find({space: {$in: spacesIds}}).sort('valueType').lean().exec();
})
.then((domains) => {
result.domains = domains;
- return mongo.Cache.find({space: {$in: spacesIds}}).sort('name').exec();
+ return mongo.Cache.find({space: {$in: spacesIds}}).sort('name').lean().exec();
})
.then((caches) => {
_.forEach(caches, (cache) => {
@@ -59,12 +59,12 @@ module.exports.factory = function(_, express, mongo) {
result.caches = caches;
- return mongo.Igfs.find({space: {$in: spacesIds}}).sort('name').exec();
+ return mongo.Igfs.find({space: {$in: spacesIds}}).sort('name').lean().exec();
})
.then((igfss) => {
result.igfss = igfss;
- return mongo.Cluster.find({space: {$in: spacesIds}}).sort('name').deepPopulate(mongo.ClusterDefaultPopulate).exec();
+ return mongo.Cluster.find({space: {$in: spacesIds}}).sort('name').deepPopulate(mongo.ClusterDefaultPopulate).lean().exec();
})
.then((clusters) => {
result.clusters = clusters;
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d539d7c/modules/control-center-web/src/main/js/serve/routes/domains.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/domains.js b/modules/control-center-web/src/main/js/serve/routes/domains.js
index 3953665..1b3d1d1 100644
--- a/modules/control-center-web/src/main/js/serve/routes/domains.js
+++ b/modules/control-center-web/src/main/js/serve/routes/domains.js
@@ -43,17 +43,17 @@ module.exports.factory = function(_, express, mongo) {
result.spaces = spaces;
spacesIds = mongo.spacesIds(spaces);
- return mongo.Cluster.find({space: {$in: spacesIds}}, '_id name').sort('name').exec();
+ return mongo.Cluster.find({space: {$in: spacesIds}}, '_id name').sort('name').lean().exec();
})
.then((clusters) => {
result.clusters = clusters;
- return mongo.Cache.find({space: {$in: spacesIds}}).sort('name').exec();
+ return mongo.Cache.find({space: {$in: spacesIds}}).sort('name').lean().exec();
})
.then((caches) => {
result.caches = caches;
- return mongo.DomainModel.find({space: {$in: spacesIds}}).sort('valueType').exec();
+ return mongo.DomainModel.find({space: {$in: spacesIds}}).sort('valueType').lean().exec();
})
.then((domains) => {
result.domains = domains;
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d539d7c/modules/control-center-web/src/main/js/serve/routes/igfs.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/igfs.js b/modules/control-center-web/src/main/js/serve/routes/igfs.js
index 39cc978..c44620d 100644
--- a/modules/control-center-web/src/main/js/serve/routes/igfs.js
+++ b/modules/control-center-web/src/main/js/serve/routes/igfs.js
@@ -44,12 +44,12 @@ module.exports.factory = function(_, express, mongo) {
result.spaces = spaces;
spacesIds = mongo.spacesIds(spaces);
- return mongo.Cluster.find({space: {$in: spacesIds}}, '_id name').sort('name').exec();
+ return mongo.Cluster.find({space: {$in: spacesIds}}, '_id name').sort('name').lean().exec();
})
.then((clusters) => {
result.clusters = clusters;
- return mongo.Igfs.find({space: {$in: spacesIds}}).sort('name').exec();
+ return mongo.Igfs.find({space: {$in: spacesIds}}).sort('name').lean().exec();
})
.then((igfss) => {
result.igfss = igfss;
http://git-wip-us.apache.org/repos/asf/ignite/blob/7d539d7c/modules/control-center-web/src/main/js/serve/routes/notebooks.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/serve/routes/notebooks.js b/modules/control-center-web/src/main/js/serve/routes/notebooks.js
index 5070bcc..67dbaf7 100644
--- a/modules/control-center-web/src/main/js/serve/routes/notebooks.js
+++ b/modules/control-center-web/src/main/js/serve/routes/notebooks.js
@@ -36,7 +36,7 @@ module.exports.factory = function(express, mongo) {
*/
router.post('/list', (req, res) => {
mongo.spaces(req.currentUserId())
- .then((spaces) => mongo.Notebook.find({space: {$in: spaces.map((value) => value._id)}}).select('_id name').sort('name').exec())
+ .then((spaces) => mongo.Notebook.find({space: {$in: spaces.map((value) => value._id)}}).select('_id name').sort('name').lean().exec())
.then((notebooks) => res.json(notebooks))
.catch((err) => mongo.handleError(res, err));
[2/2] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc2' into ignite-843-rc2
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc2' into ignite-843-rc2
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/31c6d78f
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/31c6d78f
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/31c6d78f
Branch: refs/heads/ignite-843-rc2
Commit: 31c6d78f83990fe2c5ebcb68716ae89420e6dbed
Parents: 7d539d7 f80a038
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Feb 16 14:14:35 2016 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Feb 16 14:14:35 2016 +0700
----------------------------------------------------------------------
.../src/main/js/serve/mail.js | 71 +++++++++++++++++
.../src/main/js/serve/routes/admin.js | 83 ++++++--------------
.../src/main/js/serve/routes/public.js | 69 ++++------------
.../src/main/js/serve/settings.js | 1 +
4 files changed, 114 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/31c6d78f/modules/control-center-web/src/main/js/serve/routes/admin.js
----------------------------------------------------------------------