mirrors/etherpad-lite
1
0
Fork 0
mirror of https://github.com/ether/etherpad-lite.git synced 2025-04-21 16:06:16 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 26

allow some operations to proceed in parallel

Browse source 
some code chunks previously used `async.parallel` but if you
use `await` that forces them to be run serially.  Instead,
you can initiate the operation (getting a Promise) and then
_later_ `await` the result of that Promise.
This commit is contained in:
Ray Bellis 2019-02-01 09:57:50 +00:00
parent e7c2fad7b0
commit 769933786c
3 changed files with 37 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/node/handler/PadMessageHandler.js
View file

@ -890,8 +890,6 @@ async function handleClientReady(client, message)
return;
}
var historicalAuthorData = {};
hooks.callAll("clientReady", message);
// Get ro/rw id:s
@ -915,12 +913,12 @@ async function handleClientReady(client, message)
let author = statusObject.authorID;
// get all authordata of this new user, and load the pad-object from the database
// get all authordata of this new user
let value = await authorManager.getAuthor(author);
let authorColorId = value.colorId;
let authorName = value.name;
// get pad
// load the pad-object from the database
let pad = await padManager.getPad(padIds.padId);
// these db requests all need the pad object (timestamp of latest revision, author data)
@ -930,6 +928,7 @@ async function handleClientReady(client, message)
let currentTime = await pad.getRevisionDate(pad.getHeadRevisionNumber());
// get all author data out of the database (in parallel)
let historicalAuthorData = {};
await Promise.all(authors.map(authorId => {
return authorManager.getAuthor(authorId).then(author => {
if (!author) {
@ -1010,12 +1009,15 @@ async function handleClientReady(client, message)
changesets[r] = {};
}
// get changesets, author and timestamp needed for pending revisions
// get changesets, author and timestamp needed for pending revisions (in parallel)
let promises = [];
for (let revNum of revisionsNeeded) {
changesets[revNum]['changeset'] = await pad.getRevisionChangeset(revNum);
changesets[revNum]['author'] = await pad.getRevisionAuthor(revNum);
changesets[revNum]['timestamp'] = await pad.getRevisionDate(revNum);
let cs = changesets[revNum];
promises.push( pad.getRevisionChangeset(revNum).then(result => cs.changeset = result ));
promises.push( pad.getRevisionAuthor(revNum).then(result => cs.author = result ));
promises.push( pad.getRevisionDate(revNum).then(result => cs.timestamp = result ));
}
await Promise.all(promises);
// return pending changesets
for (let r of revisionsNeeded) {