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

fix: upgrade script, get rid of nested processSortedSet

Browse Source
isekai-main
Barış Soner Uşaklı 1 year ago
parent 38149a57c5
commit 78a7cfe9c2
2 changed files with 63 additions and 66 deletions
Show Stats Download Patch File Download Diff File

58
src/upgrades/3.3.0/chat_message_mids.js
Unescape Escape View File

@ -11,36 +11,36 @@ module.exports = {
method: async function () { method: async function () {
const { progress } = this; const { progress } = this;
progress.total = await db.sortedSetCard(`chat:rooms`); const allRoomIds = await db.getSortedSetRange(`chat:rooms`, 0, -1);
await batch.processSortedSet(`chat:rooms`, async (roomIds) => {
progress.incr(roomIds.length); progress.total = allRoomIds.length;
for (const roomId of roomIds) {
await batch.processSortedSet(`chat:room:${roomId}:mids`, async (mids) => { for (const roomId of allRoomIds) {
let messageData = await db.getObjects(mids.map(mid => `message:${mid}`)); await batch.processSortedSet(`chat:room:${roomId}:mids`, async (mids) => {
messageData.forEach((m, idx) => { let messageData = await db.getObjects(mids.map(mid => `message:${mid}`));
if (m) { messageData.forEach((m, idx) => {
m.mid = parseInt(mids[idx], 10); if (m) {
} m.mid = parseInt(mids[idx], 10);
}); }
messageData = messageData.filter(Boolean);
const bulkSet = messageData.map(
msg => [`message:${msg.mid}`, { mid: msg.mid }]
);
await db.setObjectBulk(bulkSet);
await db.sortedSetAdd(
'messages:mid',
messageData.map(msg => msg.timestamp),
messageData.map(msg => msg.mid)
);
}, {
batch: 500,
}); });
} messageData = messageData.filter(Boolean);
}, {
batch: 500, const bulkSet = messageData.map(
}); msg => [`message:${msg.mid}`, { mid: msg.mid }]
);
await db.setObjectBulk(bulkSet);
await db.sortedSetAdd(
'messages:mid',
messageData.map(msg => msg.timestamp),
messageData.map(msg => msg.mid)
);
}, {
batch: 500,
});
progress.incr(1);
}
const count = await db.sortedSetCard(`messages:mid`); const count = await db.sortedSetCard(`messages:mid`);
await db.setObjectField('global', 'messageCount', count); await db.setObjectField('global', 'messageCount', count);
}, },

71
src/upgrades/3.3.0/chat_room_refactor.js
Unescape Escape View File

@ -38,47 +38,44 @@ module.exports = {
if (roomData) { if (roomData) {
const midsSeen = {}; const midsSeen = {};
const { roomId } = roomData; const { roomId } = roomData;
await batch.processSortedSet(`chat:room:${roomId}:uids`, async (uids) => { const uids = await db.getSortedSetRange(`chat:room:${roomId}:uids`, 0, -1);
for (const uid of uids) { for (const uid of uids) {
await batch.processSortedSet(`uid:${uid}:chat:room:${roomId}:mids`, async (mids) => { await batch.processSortedSet(`uid:${uid}:chat:room:${roomId}:mids`, async (mids) => {
const uniqMids = mids.filter(mid => !midsSeen.hasOwnProperty(mid)); const uniqMids = mids.filter(mid => !midsSeen.hasOwnProperty(mid));
if (!uniqMids.length) { if (!uniqMids.length) {
return; return;
} }
let messageData = await db.getObjects(uniqMids.map(mid => `message:${mid}`)); let messageData = await db.getObjects(uniqMids.map(mid => `message:${mid}`));
messageData.forEach((m, idx) => { messageData.forEach((m, idx) => {
if (m) { if (m) {
m.mid = parseInt(uniqMids[idx], 10); m.mid = parseInt(uniqMids[idx], 10);
} }
}); });
messageData = messageData.filter(Boolean); messageData = messageData.filter(Boolean);
const bulkSet = messageData.map( const bulkSet = messageData.map(
msg => [`message:${msg.mid}`, { roomId: roomId }] msg => [`message:${msg.mid}`, { roomId: roomId }]
); );
await db.setObjectBulk(bulkSet); await db.setObjectBulk(bulkSet);
await db.sortedSetAdd( await db.sortedSetAdd(
`chat:room:${roomId}:mids`, `chat:room:${roomId}:mids`,
messageData.map(m => m.timestamp), messageData.map(m => m.timestamp),
messageData.map(m => m.mid), messageData.map(m => m.mid),
); );
uniqMids.forEach((mid) => { uniqMids.forEach((mid) => {
midsSeen[mid] = 1; midsSeen[mid] = 1;
});
}, {
batch: 500,
}); });
// eslint-disable-next-line no-await-in-loop }, {
await db.deleteAll(`uid:${uid}:chat:room:${roomId}:mids`); batch: 500,
} });
progress.incr(uids.length); // eslint-disable-next-line no-await-in-loop
}, { await db.deleteAll(`uid:${uid}:chat:room:${roomId}:mids`);
batch: 500, progress.incr(1);
}); }
const userCount = await db.sortedSetCard(`chat:room:${roomId}:uids`);
await db.setObjectField(`chat:room:${roomId}`, 'userCount', userCount); await db.setObjectField(`chat:room:${roomId}`, 'userCount', uids.length);
} }
} }
}, { }, {

Write Preview
Loading…
Cancel
Save