mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-16 10:46:14 +01:00
Async refactor in place (#7736)
* feat: allow both callback&and await
* feat: ignore async key
* feat: callbackify and promisify in same file
* Revert "feat: callbackify and promisify in same file"
This reverts commit cea206a9b8.
* feat: no need to store .callbackify
* feat: change getTopics to async
* feat: remove .async
* fix: byScore
* feat: rewrite topics/index and social with async/await
* fix: rewrite topics/data.js
fix issue with async.waterfall, only pass result if its not undefined
* feat: add callbackify to redis/psql
* feat: psql use await
* fix: redis 🌋
* feat: less returns
* feat: more await rewrite
* fix: redis tests
* feat: convert sortedSetAdd
rewrite psql transaction to async/await
* feat: 🐶
* feat: test
* feat: log client and query
* feat: log bind
* feat: more logs
* feat: more logs
* feat: check perform
* feat: dont callbackify transaction
* feat: remove logs
* fix: main functions
* feat: more logs
* fix: increment
* fix: rename
* feat: remove cls
* fix: remove console.log
* feat: add deprecation message to .async usage
* feat: update more dbal methods
* fix: redis :voodoo:
* feat: fix redis zrem, convert setObject
* feat: upgrade getObject methods
* fix: psql getObjectField
* fix: redis tests
* feat: getObjectKeys
* feat: getObjectValues
* feat: isObjectField
* fix: add missing return
* feat: delObjectField
* feat: incrObjectField
* fix: add missing await
* feat: remove exposed helpers
* feat: list methods
* feat: flush/empty
* feat: delete
* fix: redis delete all
* feat: get/set
* feat: incr/rename
* feat: type
* feat: expire
* feat: setAdd
* feat: setRemove
* feat: isSetMember
* feat: getSetMembers
* feat: setCount, setRemoveRandom
* feat: zcard,zcount
* feat: sortedSetRank
* feat: isSortedSetMember
* feat: zincrby
* feat: sortedSetLex
* feat: processSortedSet
* fix: add mising await
* feat: debug psql
* fix: psql test
* fix: test
* fix: another test
* fix: test fix
* fix: psql tests
* feat: remove logs
* feat: user arrow func
use builtin async promises
* feat: topic bookmarks
* feat: topic.delete
* feat: topic.restore
* feat: topics.purge
* feat: merge
* feat: suggested
* feat: topics/user.js
* feat: topics modules
* feat: topics/follow
* fix: deprecation msg
* feat: fork
* feat: topics/posts
* feat: sorted/recent
* feat: topic/teaser
* feat: topics/tools
* feat: topics/unread
* feat: add back node versions
disable deprecation notice
wrap async controllers in try/catch
* feat: use db directly
* feat: promisify in place
* fix: redis/psql
* feat: deprecation message
logs for psql
* feat: more logs
* feat: more logs
* feat: logs again
* feat: more logs
* fix: call release
* feat: restore travis, remove logs
* fix: loops
* feat: remove .async. usage
This commit is contained in:
Barış Soner Uşaklı
committed by
GitHub
GitHub
parent
43ce5f8af3
commit
805dcd7ca2
@@ -1,86 +1,73 @@
|
||||
'use strict';
|
||||
|
||||
var async = require('async');
|
||||
|
||||
|
||||
module.exports = function (db, module) {
|
||||
var helpers = module.helpers.mongo;
|
||||
var helpers = require('./helpers');
|
||||
|
||||
var _ = require('lodash');
|
||||
const cache = require('../cache').create('mongo');
|
||||
|
||||
module.objectCache = cache;
|
||||
|
||||
module.setObject = function (key, data, callback) {
|
||||
callback = callback || helpers.noop;
|
||||
module.setObject = async function (key, data) {
|
||||
if (!key || !data) {
|
||||
return callback();
|
||||
return;
|
||||
}
|
||||
|
||||
const writeData = helpers.serializeData(data);
|
||||
db.collection('objects').updateOne({ _key: key }, { $set: writeData }, { upsert: true, w: 1 }, function (err) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
cache.delObjectCache(key);
|
||||
callback();
|
||||
});
|
||||
await db.collection('objects').updateOne({ _key: key }, { $set: writeData }, { upsert: true, w: 1 });
|
||||
cache.delObjectCache(key);
|
||||
};
|
||||
|
||||
module.setObjectField = function (key, field, value, callback) {
|
||||
callback = callback || helpers.noop;
|
||||
module.setObjectField = async function (key, field, value) {
|
||||
if (!field) {
|
||||
return callback();
|
||||
return;
|
||||
}
|
||||
var data = {};
|
||||
data[field] = value;
|
||||
module.setObject(key, data, callback);
|
||||
await module.setObject(key, data);
|
||||
};
|
||||
|
||||
module.getObject = function (key, callback) {
|
||||
module.getObject = async function (key) {
|
||||
if (!key) {
|
||||
return setImmediate(callback, null, null);
|
||||
return null;
|
||||
}
|
||||
|
||||
module.getObjects([key], function (err, data) {
|
||||
callback(err, data && data.length ? data[0] : null);
|
||||
});
|
||||
const data = await module.getObjects([key]);
|
||||
return data && data.length ? data[0] : null;
|
||||
};
|
||||
|
||||
module.getObjects = function (keys, callback) {
|
||||
module.getObjectsFields(keys, [], callback);
|
||||
module.getObjects = async function (keys) {
|
||||
return await module.getObjectsFields(keys, []);
|
||||
};
|
||||
|
||||
module.getObjectField = function (key, field, callback) {
|
||||
module.getObjectField = async function (key, field) {
|
||||
if (!key) {
|
||||
return setImmediate(callback, null, null);
|
||||
return null;
|
||||
}
|
||||
const cachedData = {};
|
||||
cache.getUnCachedKeys([key], cachedData);
|
||||
if (cachedData[key]) {
|
||||
return setImmediate(callback, null, cachedData[key].hasOwnProperty(field) ? cachedData[key][field] : null);
|
||||
return cachedData[key].hasOwnProperty(field) ? cachedData[key][field] : null;
|
||||
}
|
||||
field = helpers.fieldToString(field);
|
||||
db.collection('objects').findOne({ _key: key }, { projection: { _id: 0, [field]: 1 } }, function (err, item) {
|
||||
if (err || !item) {
|
||||
return callback(err, null);
|
||||
}
|
||||
callback(null, item.hasOwnProperty(field) ? item[field] : null);
|
||||
});
|
||||
};
|
||||
|
||||
module.getObjectFields = function (key, fields, callback) {
|
||||
if (!key) {
|
||||
return setImmediate(callback, null, null);
|
||||
const item = await db.collection('objects').findOne({ _key: key }, { projection: { _id: 0, [field]: 1 } });
|
||||
if (!item) {
|
||||
return null;
|
||||
}
|
||||
module.getObjectsFields([key], fields, function (err, data) {
|
||||
callback(err, data ? data[0] : null);
|
||||
});
|
||||
return item.hasOwnProperty(field) ? item[field] : null;
|
||||
};
|
||||
|
||||
module.getObjectsFields = function (keys, fields, callback) {
|
||||
module.getObjectFields = async function (key, fields) {
|
||||
if (!key) {
|
||||
return null;
|
||||
}
|
||||
const data = await module.getObjectsFields([key], fields);
|
||||
return data ? data[0] : null;
|
||||
};
|
||||
|
||||
module.getObjectsFields = async function (keys, fields) {
|
||||
if (!Array.isArray(keys) || !keys.length) {
|
||||
return setImmediate(callback, null, []);
|
||||
return [];
|
||||
}
|
||||
const cachedData = {};
|
||||
function returnData() {
|
||||
@@ -97,104 +84,72 @@ module.exports = function (db, module) {
|
||||
return result;
|
||||
});
|
||||
|
||||
callback(null, mapped);
|
||||
return mapped;
|
||||
}
|
||||
|
||||
const unCachedKeys = cache.getUnCachedKeys(keys, cachedData);
|
||||
if (!unCachedKeys.length) {
|
||||
return process.nextTick(returnData);
|
||||
return returnData();
|
||||
}
|
||||
|
||||
var query = { _key: { $in: unCachedKeys } };
|
||||
if (unCachedKeys.length === 1) {
|
||||
query._key = unCachedKeys[0];
|
||||
}
|
||||
db.collection('objects').find(query, { projection: { _id: 0 } }).toArray(function (err, data) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
data = data.map(helpers.deserializeData);
|
||||
var map = helpers.toMap(data);
|
||||
unCachedKeys.forEach(function (key) {
|
||||
cachedData[key] = map[key] || null;
|
||||
cache.set(key, cachedData[key]);
|
||||
});
|
||||
let data = await db.collection('objects').find(query, { projection: { _id: 0 } }).toArray();
|
||||
|
||||
returnData();
|
||||
data = data.map(helpers.deserializeData);
|
||||
var map = helpers.toMap(data);
|
||||
unCachedKeys.forEach(function (key) {
|
||||
cachedData[key] = map[key] || null;
|
||||
cache.set(key, cachedData[key]);
|
||||
});
|
||||
|
||||
return returnData();
|
||||
};
|
||||
|
||||
module.getObjectKeys = function (key, callback) {
|
||||
module.getObject(key, function (err, data) {
|
||||
callback(err, data ? Object.keys(data) : []);
|
||||
});
|
||||
module.getObjectKeys = async function (key) {
|
||||
const data = await module.getObject(key);
|
||||
return data ? Object.keys(data) : [];
|
||||
};
|
||||
|
||||
module.getObjectValues = function (key, callback) {
|
||||
module.getObject(key, function (err, data) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
|
||||
var values = [];
|
||||
for (var key in data) {
|
||||
if (data && data.hasOwnProperty(key)) {
|
||||
values.push(data[key]);
|
||||
}
|
||||
}
|
||||
callback(null, values);
|
||||
});
|
||||
module.getObjectValues = async function (key) {
|
||||
const data = await module.getObject(key);
|
||||
return data ? Object.values(data) : [];
|
||||
};
|
||||
|
||||
module.isObjectField = function (key, field, callback) {
|
||||
module.isObjectField = async function (key, field) {
|
||||
const data = await module.isObjectFields(key, [field]);
|
||||
return Array.isArray(data) && data.length ? data[0] : false;
|
||||
};
|
||||
|
||||
module.isObjectFields = async function (key, fields) {
|
||||
if (!key) {
|
||||
return callback();
|
||||
}
|
||||
var data = {};
|
||||
field = helpers.fieldToString(field);
|
||||
data[field] = 1;
|
||||
db.collection('objects').findOne({ _key: key }, { projection: data }, function (err, item) {
|
||||
callback(err, !!item && item[field] !== undefined && item[field] !== null);
|
||||
});
|
||||
};
|
||||
|
||||
module.isObjectFields = function (key, fields, callback) {
|
||||
if (!key) {
|
||||
return callback();
|
||||
return;
|
||||
}
|
||||
|
||||
var data = {};
|
||||
const data = {};
|
||||
fields.forEach(function (field) {
|
||||
field = helpers.fieldToString(field);
|
||||
data[field] = 1;
|
||||
});
|
||||
|
||||
db.collection('objects').findOne({ _key: key }, { projection: data }, function (err, item) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
var results = [];
|
||||
|
||||
fields.forEach(function (field, index) {
|
||||
results[index] = !!item && item[field] !== undefined && item[field] !== null;
|
||||
});
|
||||
|
||||
callback(null, results);
|
||||
});
|
||||
const item = await db.collection('objects').findOne({ _key: key }, { projection: data });
|
||||
const results = fields.map(f => !!item && item[f] !== undefined && item[f] !== null);
|
||||
return results;
|
||||
};
|
||||
|
||||
module.deleteObjectField = function (key, field, callback) {
|
||||
module.deleteObjectFields(key, [field], callback);
|
||||
module.deleteObjectField = async function (key, field) {
|
||||
await module.deleteObjectFields(key, [field]);
|
||||
};
|
||||
|
||||
module.deleteObjectFields = function (key, fields, callback) {
|
||||
callback = callback || helpers.noop;
|
||||
module.deleteObjectFields = async function (key, fields) {
|
||||
if (!key || !Array.isArray(fields) || !fields.length) {
|
||||
return callback();
|
||||
return;
|
||||
}
|
||||
fields = fields.filter(Boolean);
|
||||
if (!fields.length) {
|
||||
return callback();
|
||||
return;
|
||||
}
|
||||
|
||||
var data = {};
|
||||
@@ -203,68 +158,41 @@ module.exports = function (db, module) {
|
||||
data[field] = '';
|
||||
});
|
||||
|
||||
db.collection('objects').updateOne({ _key: key }, { $unset: data }, function (err) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
cache.delObjectCache(key);
|
||||
callback();
|
||||
});
|
||||
await db.collection('objects').updateOne({ _key: key }, { $unset: data });
|
||||
cache.delObjectCache(key);
|
||||
};
|
||||
|
||||
module.incrObjectField = function (key, field, callback) {
|
||||
module.incrObjectFieldBy(key, field, 1, callback);
|
||||
module.incrObjectField = async function (key, field) {
|
||||
return await module.incrObjectFieldBy(key, field, 1);
|
||||
};
|
||||
|
||||
module.decrObjectField = function (key, field, callback) {
|
||||
module.incrObjectFieldBy(key, field, -1, callback);
|
||||
module.decrObjectField = async function (key, field) {
|
||||
return await module.incrObjectFieldBy(key, field, -1);
|
||||
};
|
||||
|
||||
module.incrObjectFieldBy = function (key, field, value, callback) {
|
||||
callback = callback || helpers.noop;
|
||||
module.incrObjectFieldBy = async function (key, field, value) {
|
||||
value = parseInt(value, 10);
|
||||
if (!key || isNaN(value)) {
|
||||
return callback(null, null);
|
||||
return null;
|
||||
}
|
||||
|
||||
var data = {};
|
||||
var increment = {};
|
||||
field = helpers.fieldToString(field);
|
||||
data[field] = value;
|
||||
increment[field] = value;
|
||||
|
||||
if (Array.isArray(key)) {
|
||||
var bulk = db.collection('objects').initializeUnorderedBulkOp();
|
||||
key.forEach(function (key) {
|
||||
bulk.find({ _key: key }).upsert().update({ $inc: data });
|
||||
bulk.find({ _key: key }).upsert().update({ $inc: increment });
|
||||
});
|
||||
|
||||
async.waterfall([
|
||||
function (next) {
|
||||
bulk.execute(function (err) {
|
||||
next(err);
|
||||
});
|
||||
},
|
||||
function (next) {
|
||||
cache.delObjectCache(key);
|
||||
|
||||
module.getObjectsFields(key, [field], next);
|
||||
},
|
||||
function (data, next) {
|
||||
data = data.map(function (data) {
|
||||
return data && data[field];
|
||||
});
|
||||
next(null, data);
|
||||
},
|
||||
], callback);
|
||||
return;
|
||||
await bulk.execute();
|
||||
cache.delObjectCache(key);
|
||||
const result = await module.getObjectsFields(key, [field]);
|
||||
return result.map(data => data && data[field]);
|
||||
}
|
||||
|
||||
|
||||
db.collection('objects').findOneAndUpdate({ _key: key }, { $inc: data }, { returnOriginal: false, upsert: true }, function (err, result) {
|
||||
if (err) {
|
||||
return callback(err);
|
||||
}
|
||||
cache.delObjectCache(key);
|
||||
callback(null, result && result.value ? result.value[field] : null);
|
||||
});
|
||||
const result = await db.collection('objects').findOneAndUpdate({ _key: key }, { $inc: increment }, { returnOriginal: false, upsert: true });
|
||||
cache.delObjectCache(key);
|
||||
return result && result.value ? result.value[field] : null;
|
||||
};
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user