diff --git a/src/upgrades/4.8.2/clean_ap_tids_from_topic_zsets.js b/src/upgrades/4.8.2/clean_ap_tids_from_topic_zsets.js index b87924901b..d598ba1e80 100644 --- a/src/upgrades/4.8.2/clean_ap_tids_from_topic_zsets.js +++ b/src/upgrades/4.8.2/clean_ap_tids_from_topic_zsets.js @@ -14,7 +14,7 @@ module.exports = { ]); progress.total = recent + views + posts + votes; - async function cleanupSet(setName, count) { + async function cleanupSet(setName) { const tidsToRemove = []; await batch.processSortedSet(setName, async (tids) => { const topicData = await db.getObjectsFields(tids.map(tid => `topic:${tid}`), ['tid', 'cid']); @@ -22,7 +22,7 @@ module.exports = { t => t && (!t.cid || !utils.isNumber(t.cid) || t.cid === -1) ).map(t => t.tid); tidsToRemove.push(...batchTids); - progress.incr(batchTids.length); + progress.incr(tids.length); }, { batch: 500, }); @@ -32,11 +32,11 @@ module.exports = { }, { batch: 500, }); - progress.incr(count); + } - await cleanupSet('topics:recent', recent); - await cleanupSet('topics:views', views); - await cleanupSet('topics:posts', posts); - await cleanupSet('topics:votes', votes); + await cleanupSet('topics:recent'); + await cleanupSet('topics:views'); + await cleanupSet('topics:posts'); + await cleanupSet('topics:votes'); }, };