Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 22:15:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

faster notif prune

Browse Source 
no need to loop tru and check datetime since notifications is a sorted
set now
This commit is contained in:
barisusakli
2014-09-11 17:16:28 -04:00
parent 35a903f9c8
commit 9466d7ced4
1 changed files with 22 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

58
src/notifications.js
View File

@@ -228,54 +228,40 @@ var async = require('async'),
var cutoffTime = Date.now() - week;
db.getSortedSetRange('notifications', 0, 499, function(err, nids) {
db.getSortedSetRangeByScore('notifications', 0, 500, 0, cutoffTime, function(err, nids) {
if (err) {
return winston.error(err.message);
}
if (!Array.isArray(nids) || !nids.length) {
events.log('No notifications to prune');
return;
return events.log('No notifications to prune');
}
var keys = nids.map(function(nid) {
var keys = nids.map(function(nid) {
return 'notifications:' + nid;
});
db.getObjectsFields(keys, ['nid', 'datetime'], function(err, notifs) {
numPruned = nids.length;
events.log('Notification pruning. Expired Nids = ' + numPruned);
async.parallel([
function(next) {
db.sortedSetRemove('notifications', nids, next);
},
function(next) {
db.deleteAll(keys, next);
}
], function(err) {
if (err) {
return winston.error(err.message);
return winston.error('Encountered error pruning notifications: ' + err.message);
}
var expiredNids = nids.filter(function(nid, index) {
return !notifs[index].nid || parseInt(notifs[index].datetime, 10) < cutoffTime;
}).filter(Boolean);
keys = expiredNids.map(function(nid) {
return 'notifications:' + nid;
});
numPruned = expiredNids.length;
events.log('Notification pruning. Expired Nids = ' + numPruned);
async.parallel([
function(next) {
db.sortedSetRemove('notifications', expiredNids, next);
},
function(next) {
db.deleteAll(keys, next);
}
], function(err) {
if (err) {
return winston.error('Encountered error pruning notifications: ' + err.message);
}
if (process.env.NODE_ENV === 'development') {
winston.info('[notifications.prune] Notification pruning completed. ' + numPruned + ' expired notification' + (numPruned !== 1 ? 's' : '') + ' removed.');
}
var diff = process.hrtime(start);
events.log('Pruning '+ numPruned + ' notifications took : ' + (diff[0] * 1e3 + diff[1] / 1e6) + ' ms');
});
if (process.env.NODE_ENV === 'development') {
winston.info('[notifications.prune] Notification pruning completed. ' + numPruned + ' expired notification' + (numPruned !== 1 ? 's' : '') + ' removed.');
}
var diff = process.hrtime(start);
events.log('Pruning '+ numPruned + ' notifications took : ' + (diff[0] * 1e3 + diff[1] / 1e6) + ' ms');
});
});
};