IntenseWebs/PeerTube
3
0
Fork 0
mirror of https://github.com/Chocobozzz/PeerTube.git synced 2025-02-25 18:55:32 -06:00
Code Issues Packages Projects Releases Wiki Activity

Revert SQL optimization in videos list :(

Browse Source
This commit is contained in:
Chocobozzz 2018-07-27 12:01:31 +02:00
parent f771466891
commit 18dbb5b972
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
server/models/video/video.ts
View File

@ -215,8 +215,8 @@ type AvailableForListOptions = {
'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' + 'INNER JOIN "videoChannel" ON "videoChannel"."id" = "video"."channelId" ' +
'INNER JOIN "account" ON "account"."id" = "videoChannel"."accountId" ' + 'INNER JOIN "account" ON "account"."id" = "videoChannel"."accountId" ' +
'INNER JOIN "actor" ON "account"."actorId" = "actor"."id" ' + 'INNER JOIN "actor" ON "account"."actorId" = "actor"."id" ' +
'WHERE "actor"."serverId" IS NULL OR ' + 'LEFT JOIN "actorFollow" ON "actorFollow"."targetActorId" = "actor"."id" ' +
'"actor"."id" IN (SELECT "targetActorId" FROM "actorFollow" WHERE "actorId" = 1)' + // Subquery for optimization 'WHERE "actor"."serverId" IS NULL OR "actorFollow"."actorId" = ' + actorIdNumber +
')' ')'
) )
}, },
@ -632,7 +632,7 @@ export class VideoModel extends Model<VideoModel> {
// Do not wait video deletion because we could be in a transaction // Do not wait video deletion because we could be in a transaction
Promise.all(tasks) Promise.all(tasks)
.catch(err => { .catch(err => {
logger.error('Some errors when removing files of video %s in after destroy hook.', instance.uuid, { err }) logger.error('Some errors when removing files of video %s in before destroy hook.', instance.uuid, { err })
}) })
return undefined return undefined