hyperzlib
/
nodebb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: cleanup, use bulk

Browse Source
v1.18.x
Barış Soner Uşaklı 6 years ago
parent 3ecd703ea3
commit 198d05875f
12 changed files with 63 additions and 129 deletions
Show Stats Download Patch File Download Diff File

24
src/categories/topics.js
Unescape Escape View File

@ -209,10 +209,14 @@ module.exports = function (Categories) {
async.parallel([
function (next) {
db.sortedSetAdd('cid:' + cid + ':pids', postData.timestamp, postData.pid, next);
},
function (next) {
db.sortedSetAdd('cid:' + cid + ':tids:lastposttime', postData.timestamp, postData.tid, next);
const bulk = [
['cid:' + cid + ':pids', postData.timestamp, postData.pid],
['cid:' + cid + ':tids:lastposttime', postData.timestamp, postData.tid],
];
if (!pinned) {
bulk.push(['cid:' + cid + ':tids', postData.timestamp, postData.tid]);
}
db.sortedSetAddBulk(bulk, next);
},
function (next) {
db.incrObjectField('category:' + cid, 'post_count', next);
@ -221,17 +225,7 @@ module.exports = function (Categories) {
if (pinned) {
return setImmediate(next);
}
async.parallel([
function (next) {
db.sortedSetAdd('cid:' + cid + ':tids', postData.timestamp, postData.tid, next);
},
function (next) {
db.sortedSetIncrBy('cid:' + cid + ':tids:posts', 1, postData.tid, next);
},
], function (err) {
next(err);
});
db.sortedSetIncrBy('cid:' + cid + ':tids:posts', 1, postData.tid, err => next(err));
},
function (next) {
Categories.updateRecentTid(cid, postData.tid, next);

20
src/categories/update.js
Unescape Escape View File

@ -150,22 +150,12 @@ module.exports = function (Categories) {
Categories.getCategoryField(cid, 'parentCid', next);
},
function (parentCid, next) {
async.parallel([
function (next) {
db.sortedSetAdd('categories:cid', order, cid, next);
},
function (next) {
db.sortedSetAdd('cid:' + parentCid + ':children', order, cid, next);
},
function (next) {
cache.del(['categories:cid', 'cid:' + parentCid + ':children']);
next();
},
], next);
db.sortedSetsAdd(['categories:cid', 'cid:' + parentCid + ':children'], order, cid, function (err) {
cache.del(['categories:cid', 'cid:' + parentCid + ':children']);
next(err);
});
},
], function (err) {
callback(err);
});
], err => callback(err));
}
Categories.parseDescription = function (cid, description, callback) {

13
src/database/mongo/sorted/remove.js
Unescape Escape View File

@ -18,15 +18,10 @@ module.exports = function (db, module) {
value = helpers.valueToString(value);
}
if (Array.isArray(key) && Array.isArray(value)) {
db.collection('objects').deleteMany({ _key: { $in: key }, value: { $in: value } }, done);
} else if (Array.isArray(value)) {
db.collection('objects').deleteMany({ _key: key, value: { $in: value } }, done);
} else if (Array.isArray(key)) {
db.collection('objects').deleteMany({ _key: { $in: key }, value: value }, done);
} else {
db.collection('objects').deleteOne({ _key: key, value: value }, done);
}
db.collection('objects').deleteMany({
_key: Array.isArray(key) ? { $in: key } : key,
value: Array.isArray(value) ? { $in: value } : value,
}, done);
};
module.sortedSetsRemove = function (keys, value, callback) {

11
src/groups/update.js
Unescape Escape View File

@ -88,8 +88,7 @@ module.exports = function (Groups) {
function updateVisibility(groupName, hidden, callback) {
if (hidden) {
async.parallel([
async.apply(db.sortedSetRemove, 'groups:visible:createtime', groupName),
async.apply(db.sortedSetRemove, 'groups:visible:memberCount', groupName),
async.apply(db.sortedSetsRemove, ['groups:visible:createtime', 'groups:visible:memberCount'], groupName),
async.apply(db.sortedSetRemove, 'groups:visible:name', groupName.toLowerCase() + ':' + groupName),
], callback);
} else {
@ -98,10 +97,10 @@ module.exports = function (Groups) {
db.getObjectFields('group:' + groupName, ['createtime', 'memberCount'], next);
},
function (groupData, next) {
async.parallel([
async.apply(db.sortedSetAdd, 'groups:visible:createtime', groupData.createtime, groupName),
async.apply(db.sortedSetAdd, 'groups:visible:memberCount', groupData.memberCount, groupName),
async.apply(db.sortedSetAdd, 'groups:visible:name', 0, groupName.toLowerCase() + ':' + groupName),
db.sortedSetAddBulk([
['groups:visible:createtime', groupData.createtime, groupName],
['groups:visible:memberCount', groupData.memberCount, groupName],
['groups:visible:name', 0, groupName.toLowerCase() + ':' + groupName],
], next);
},
], callback);

4
src/install.js
Unescape Escape View File

@ -527,9 +527,7 @@ function enableDefaultPlugins(next) {
winston.info('[install/enableDefaultPlugins] activating default plugins', defaultEnabled);
var db = require('./database');
var order = defaultEnabled.map(function (plugin, index) {
return index;
});
var order = defaultEnabled.map((plugin, index) => index);
db.sortedSetAdd('plugins:active', order, defaultEnabled, next);
}

6
src/messaging/rooms.js
Unescape Escape View File

@ -124,10 +124,8 @@ module.exports = function (Messaging) {
if (!inRoom) {
return next(new Error('[[error:cant-add-users-to-chat-room]]'));
}
var now = Date.now();
var timestamps = uids.map(function () {
return now;
});
const now = Date.now();
const timestamps = uids.map(() => now);
db.sortedSetAdd('chat:room:' + roomId + ':uids', timestamps, uids, next);
},
function (next) {

47
src/notifications.js
Unescape Escape View File

@ -108,10 +108,7 @@ Notifications.filterExists = function (nids, callback) {
db.isSortedSetMembers('notifications', nids, next);
},
function (exists, next) {
nids = nids.filter(function (notifId, idx) {
return exists[idx];
});
nids = nids.filter((notifId, idx) => exists[idx]);
next(null, nids);
},
], callback);
@ -397,52 +394,32 @@ Notifications.markReadMultiple = function (nids, uid, callback) {
return callback();
}
var notificationKeys = nids.map(function (nid) {
return 'notifications:' + nid;
});
let notificationKeys = nids.map(nid => 'notifications:' + nid);
async.waterfall([
async.apply(db.getObjectsFields, notificationKeys, ['mergeId']),
function (mergeIds, next) {
// Isolate mergeIds and find related notifications
mergeIds = mergeIds.map(function (set) {
return set.mergeId;
}).reduce(function (memo, mergeId, idx, arr) {
if (mergeId && idx === arr.indexOf(mergeId)) {
memo.push(mergeId);
}
return memo;
}, []);
mergeIds = _.uniq(mergeIds.map(set => set.mergeId));
Notifications.findRelated(mergeIds, 'uid:' + uid + ':notifications:unread', next);
},
function (relatedNids, next) {
notificationKeys = _.union(nids, relatedNids).map(function (nid) {
return 'notifications:' + nid;
});
notificationKeys = _.union(nids, relatedNids).map(nid => 'notifications:' + nid);
db.getObjectsFields(notificationKeys, ['nid', 'datetime'], next);
},
function (notificationData, next) {
// Filter out notifications that didn't exist
notificationData = notificationData.filter(function (notification) {
return notification && notification.nid;
});
notificationData = notificationData.filter(n => n && n.nid);
// Extract nid
nids = notificationData.map(function (notification) {
return notification.nid;
});
var datetimes = notificationData.map(function (notification) {
return (notification && notification.datetime) || Date.now();
});
nids = notificationData.map(n => n.nid);
async.parallel([
function (next) {
db.sortedSetRemove('uid:' + uid + ':notifications:unread', nids, next);
},
function (next) {
const datetimes = notificationData.map(n => (n && n.datetime) || Date.now());
db.sortedSetAdd('uid:' + uid + ':notifications:read', datetimes, nids, next);
},
], next);
@ -465,12 +442,11 @@ Notifications.markAllRead = function (uid, callback) {
Notifications.prune = function (callback) {
callback = callback || function () {};
var week = 604800000;
var cutoffTime = Date.now() - week;
async.waterfall([
function (next) {
const week = 604800000;
const cutoffTime = Date.now() - week;
db.getSortedSetRangeByScore('notifications', 0, 500, '-inf', cutoffTime, next);
},
function (nids, next) {
@ -478,15 +454,12 @@ Notifications.prune = function (callback) {
return callback();
}
var keys = nids.map(function (nid) {
return 'notifications:' + nid;
});
async.parallel([
function (next) {
db.sortedSetRemove('notifications', nids, next);
},
function (next) {
const keys = nids.map(nid => 'notifications:' + nid);
db.deleteAll(keys, next);
},
], next);

12
src/topics/delete.js
Unescape Escape View File

@ -68,13 +68,11 @@ module.exports = function (Topics) {
Topics.updateRecent(tid, topicData.lastposttime, next);
},
function (next) {
db.sortedSetAdd('topics:posts', topicData.postcount, tid, next);
},
function (next) {
db.sortedSetAdd('topics:views', topicData.viewcount, tid, next);
},
function (next) {
db.sortedSetAdd('topics:votes', parseInt(topicData.votes, 10) || 0, tid, next);
db.sortedSetAddBulk([
['topics:posts', topicData.postcount, tid],
['topics:views', topicData.viewcount, tid],
['topics:votes', parseInt(topicData.votes, 10) || 0, tid],
], next);
},
function (next) {
async.waterfall([

14
src/topics/tools.js
Unescape Escape View File

@ -188,15 +188,11 @@ module.exports = function (Topics) {
} else {
async.parallel([
async.apply(db.sortedSetRemove, 'cid:' + topicData.cid + ':tids:pinned', tid),
async.apply(db.sortedSetsAdd, [
'cid:' + topicData.cid + ':tids',
'cid:' + topicData.cid + ':tids:posts',
'cid:' + topicData.cid + ':tids:votes',
], [
topicData.lastposttime,
topicData.postcount,
parseInt(topicData.votes, 10) || 0,
], tid),
async.apply(db.sortedSetAddBulk, [
['cid:' + topicData.cid + ':tids', topicData.lastposttime, tid],
['cid:' + topicData.cid + ':tids:posts', topicData.postcount, tid],
['cid:' + topicData.cid + ':tids:votes', parseInt(topicData.votes, 10) || 0, tid],
]),
], next);
}
},

19
src/user/admin.js
Unescape Escape View File

@ -14,18 +14,13 @@ module.exports = function (User) {
return setImmediate(callback);
}
var now = Date.now();
async.waterfall([
function (next) {
db.sortedSetAdd('uid:' + uid + ':ip', now, ip || 'Unknown', next);
},
function (next) {
if (ip) {
db.sortedSetAdd('ip:' + ip + ':uid', now, uid, next);
} else {
next();
}
},
], callback);
const bulk = [
['uid:' + uid + ':ip', now, ip || 'Unknown'],
];
if (ip) {
bulk.push(['ip:' + ip + ':uid', now, uid]);
}
db.sortedSetAddBulk(bulk, callback);
};
User.getIPs = function (uid, stop, callback) {

6
src/user/follow.js
Unescape Escape View File

@ -40,8 +40,10 @@ module.exports = function (User) {
}
var now = Date.now();
async.parallel([
async.apply(db.sortedSetAdd, 'following:' + uid, now, theiruid),
async.apply(db.sortedSetAdd, 'followers:' + theiruid, now, uid),
async.apply(db.sortedSetAddBulk, [
['following:' + uid, now, theiruid],
['followers:' + theiruid, now, uid],
]),
async.apply(User.incrementUserFieldBy, uid, 'followingCount', 1),
async.apply(User.incrementUserFieldBy, theiruid, 'followerCount', 1),
], next);

16
src/user/profile.js
Unescape Escape View File

@ -206,13 +206,12 @@ module.exports = function (User) {
function (next) {
async.parallel([
function (next) {
db.sortedSetAdd('email:uid', uid, newEmail.toLowerCase(), next);
},
function (next) {
db.sortedSetAdd('email:sorted', 0, newEmail.toLowerCase() + ':' + uid, next);
},
function (next) {
db.sortedSetAdd('user:' + uid + ':emails', Date.now(), newEmail + ':' + Date.now(), next);
db.sortedSetAddBulk([
['email:uid', uid, newEmail.toLowerCase()],
['email:sorted', 0, newEmail.toLowerCase() + ':' + uid],
['user:' + uid + ':emails', Date.now(), newEmail + ':' + Date.now()],
['users:notvalidated', Date.now(), uid],
], next);
},
function (next) {
User.setUserField(uid, 'email', newEmail, next);
@ -227,9 +226,6 @@ module.exports = function (User) {
}
User.setUserField(uid, 'email:confirmed', 0, next);
},
function (next) {
db.sortedSetAdd('users:notvalidated', Date.now(), uid, next);
},
function (next) {
User.reset.cleanByUid(uid, next);
},

Write Preview
Loading…
Cancel
Save