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 2017/08/03 04:52:13 UTC
[1/3] ignite git commit: IGNITE-5888 Web Console: Fixed maven project
generation.
Repository: ignite
Updated Branches:
refs/heads/master d2cb2f79b -> 80cc292c0
IGNITE-5888 Web Console: Fixed maven project generation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/20969c07
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/20969c07
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/20969c07
Branch: refs/heads/master
Commit: 20969c0755595ba686d00220287d986327ff2b9d
Parents: 4d323f3
Author: Andrey Novikov <an...@gridgain.com>
Authored: Thu Aug 3 10:42:08 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Aug 3 10:42:08 2017 +0700
----------------------------------------------------------------------
.../modules/configuration/generator/Maven.service.js | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/20969c07/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js b/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js
index abbada9..9bf0a34 100644
--- a/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js
+++ b/modules/web-console/frontend/app/modules/configuration/generator/Maven.service.js
@@ -42,13 +42,18 @@ export default class IgniteMavenGenerator {
deps.push({groupId, artifactId, version, jar});
}
- pickDependency(deps, key, dfltVer, igniteVer) {
+ pickDependency(acc, key, dfltVer, igniteVer) {
+ const deps = POM_DEPENDENCIES[key];
+
+ if (_.isNil(deps))
+ return;
+
const extractVersion = (version) => {
return _.isArray(version) ? _.find(version, (v) => versionService.since(igniteVer, v.range)).version : version;
};
- _.forEach(POM_DEPENDENCIES[key], ({groupId, artifactId, version, jar}) => {
- this.addDependency(deps, groupId || 'org.apache.ignite', artifactId, extractVersion(version) || dfltVer, jar);
+ _.forEach(_.castArray(deps), ({groupId, artifactId, version, jar}) => {
+ this.addDependency(acc, groupId || 'org.apache.ignite', artifactId, extractVersion(version) || dfltVer, jar);
});
}
@@ -140,8 +145,10 @@ export default class IgniteMavenGenerator {
/**
* Add dependency for specified store factory if not exist.
+ *
* @param deps Already added dependencies.
* @param storeFactory Store factory to add dependency.
+ * @param igniteVer Ignite version.
*/
storeFactoryDependency(deps, storeFactory, igniteVer) {
if (storeFactory.dialect && (!storeFactory.connectVia || storeFactory.connectVia === 'DataSource'))
[2/3] ignite git commit: IGNITE-5906 Fixed race on activities merge.
Posted by ak...@apache.org.
IGNITE-5906 Fixed race on activities merge.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6bdad4dd
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6bdad4dd
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6bdad4dd
Branch: refs/heads/master
Commit: 6bdad4dd6a5d6f3210051f47af5a51f0bd52f73c
Parents: 20969c0
Author: Andrey Novikov <an...@gridgain.com>
Authored: Thu Aug 3 10:45:59 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Aug 3 10:45:59 2017 +0700
----------------------------------------------------------------------
modules/web-console/backend/app/mongo.js | 2 +-
modules/web-console/backend/middlewares/api.js | 9 ++++-----
modules/web-console/backend/services/activities.js | 12 ++----------
3 files changed, 7 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdad4dd/modules/web-console/backend/app/mongo.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/app/mongo.js b/modules/web-console/backend/app/mongo.js
index 57af928..0bc0e5c 100644
--- a/modules/web-console/backend/app/mongo.js
+++ b/modules/web-console/backend/app/mongo.js
@@ -1055,7 +1055,7 @@ module.exports.factory = function(passportMongo, settings, pluginMongo, mongoose
date: Date,
group: String,
action: String,
- amount: { type: Number, default: 1 }
+ amount: { type: Number, default: 0 }
});
ActivitiesSchema.index({ owner: 1, group: 1, action: 1, date: 1}, { unique: true });
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdad4dd/modules/web-console/backend/middlewares/api.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/middlewares/api.js b/modules/web-console/backend/middlewares/api.js
index 2c4c1bd..aa599ae 100644
--- a/modules/web-console/backend/middlewares/api.js
+++ b/modules/web-console/backend/middlewares/api.js
@@ -20,16 +20,15 @@
// Fire me up!
module.exports = {
- implements: 'middlewares:api',
- inject: ['require("mongodb-core")']
+ implements: 'middlewares:api'
};
-module.exports.factory = (mongodb) => {
+module.exports.factory = () => {
return (req, res, next) => {
res.api = {
error(err) {
- if (err instanceof mongodb.MongoError)
- res.status(500).send(err.message);
+ if (err.name === 'MongoError')
+ return res.status(500).send(err.message);
res.status(err.httpCode || err.code || 500).send(err.message);
},
http://git-wip-us.apache.org/repos/asf/ignite/blob/6bdad4dd/modules/web-console/backend/services/activities.js
----------------------------------------------------------------------
diff --git a/modules/web-console/backend/services/activities.js b/modules/web-console/backend/services/activities.js
index afde8e7..a049f65 100644
--- a/modules/web-console/backend/services/activities.js
+++ b/modules/web-console/backend/services/activities.js
@@ -50,16 +50,8 @@ module.exports.factory = (_, mongo) => {
const date = Date.UTC(now.getFullYear(), now.getMonth(), 1);
- return mongo.Activities.findOne({owner, action, date}).exec()
- .then((activity) => {
- if (activity) {
- activity.amount++;
-
- return activity.save();
- }
-
- return mongo.Activities.create({owner, action, group, date});
- });
+ return mongo.Activities.findOneAndUpdate({owner, action, date},
+ {$set: {owner, group, action, date}, $inc: {amount: 1}}, {new: true, upsert: true}).exec();
}
static total({startDate, endDate}) {
[3/3] ignite git commit: Merge branches 'ignite-2.1.3' and 'master'.
Posted by ak...@apache.org.
Merge branches 'ignite-2.1.3' and 'master'.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/80cc292c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/80cc292c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/80cc292c
Branch: refs/heads/master
Commit: 80cc292c0d09acdb327047090c1d1448ffffef6b
Parents: d2cb2f7 6bdad4d
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Thu Aug 3 11:52:06 2017 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Thu Aug 3 11:52:06 2017 +0700
----------------------------------------------------------------------
modules/web-console/backend/app/mongo.js | 2 +-
modules/web-console/backend/middlewares/api.js | 9 ++++-----
modules/web-console/backend/services/activities.js | 12 ++----------
.../modules/configuration/generator/Maven.service.js | 13 ++++++++++---
4 files changed, 17 insertions(+), 19 deletions(-)
----------------------------------------------------------------------