OpenCloud
/
PeerTube
mirror of https://github.com/Chocobozzz/PeerTube
1
0
Fork 0
Code Issues Releases Wiki Activity

Optimize local sql query

pull/2356/head
Chocobozzz 2019-12-23 11:24:54 +01:00
parent 1c5fed88c5
commit 0dfee3a3ac
No known key found for this signature in database
GPG Key ID: 583A612D890159BE
1 changed files with 9 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -143,7 +143,6 @@ import { MThumbnail } from '../../typings/models/video/thumbnail'
import { VideoFile } from '@shared/models/videos/video-file.model' import { VideoFile } from '@shared/models/videos/video-file.model'
import { getHLSDirectory, getTorrentFileName, getTorrentFilePath, getVideoFilename, getVideoFilePath } from '@server/lib/video-paths' import { getHLSDirectory, getTorrentFileName, getTorrentFilePath, getVideoFilename, getVideoFilePath } from '@server/lib/video-paths'
import * as validator from 'validator' import * as validator from 'validator'
import { ActorFollowModel } from '@server/models/activitypub/actor-follow'
// FIXME: Define indexes here because there is an issue with TS and Sequelize.literal when called directly in the annotation // FIXME: Define indexes here because there is an issue with TS and Sequelize.literal when called directly in the annotation
const indexes: (ModelIndexesOptions & { where?: WhereOptions })[] = [ const indexes: (ModelIndexesOptions & { where?: WhereOptions })[] = [
@ -216,7 +215,6 @@ export enum ScopeNames {
WITH_WEBTORRENT_FILES = 'WITH_WEBTORRENT_FILES', WITH_WEBTORRENT_FILES = 'WITH_WEBTORRENT_FILES',
WITH_SCHEDULED_UPDATE = 'WITH_SCHEDULED_UPDATE', WITH_SCHEDULED_UPDATE = 'WITH_SCHEDULED_UPDATE',
WITH_BLACKLISTED = 'WITH_BLACKLISTED', WITH_BLACKLISTED = 'WITH_BLACKLISTED',
WITH_BLOCKLIST = 'WITH_BLOCKLIST',
WITH_USER_HISTORY = 'WITH_USER_HISTORY', WITH_USER_HISTORY = 'WITH_USER_HISTORY',
WITH_STREAMING_PLAYLISTS = 'WITH_STREAMING_PLAYLISTS', WITH_STREAMING_PLAYLISTS = 'WITH_STREAMING_PLAYLISTS',
WITH_USER_ID = 'WITH_USER_ID', WITH_USER_ID = 'WITH_USER_ID',
@ -399,7 +397,13 @@ export type AvailableForListIDsOptions = {
query.subQuery = false query.subQuery = false
} }
if (options.filter || options.accountId || options.videoChannelId) { if (options.filter && (options.filter === 'local' || options.filter === 'all-local')) {
whereAnd.push({
remote: false
})
}
if (options.accountId || options.videoChannelId) {
const videoChannelInclude: IncludeOptions = { const videoChannelInclude: IncludeOptions = {
attributes: [], attributes: [],
model: VideoChannelModel.unscoped(), model: VideoChannelModel.unscoped(),
@ -412,28 +416,14 @@ export type AvailableForListIDsOptions = {
} }
} }
if (options.filter || options.accountId) { if (options.accountId) {
const accountInclude: IncludeOptions = { const accountInclude: IncludeOptions = {
attributes: [], attributes: [],
model: AccountModel.unscoped(), model: AccountModel.unscoped(),
required: true required: true
} }
if (options.filter) { accountInclude.where = { id: options.accountId }
accountInclude.include = [
{
attributes: [],
model: ActorModel.unscoped(),
required: true,
where: VideoModel.buildActorWhereWithFilter(options.filter)
}
]
}
if (options.accountId) {
accountInclude.where = { id: options.accountId }
}
videoChannelInclude.include = [ accountInclude ] videoChannelInclude.include = [ accountInclude ]
} }
@ -592,9 +582,6 @@ export type AvailableForListIDsOptions = {
} }
return query return query
},
[ScopeNames.WITH_BLOCKLIST]: {
}, },
[ ScopeNames.WITH_THUMBNAILS ]: { [ ScopeNames.WITH_THUMBNAILS ]: {
include: [ include: [
@ -1713,16 +1700,6 @@ export class VideoModel extends Model<VideoModel> {
} }
} }
private static buildActorWhereWithFilter (filter?: VideoFilter) {
if (filter && (filter === 'local' || filter === 'all-local')) {
return {
serverId: null
}
}
return {}
}
private static async getAvailableForApi ( private static async getAvailableForApi (
query: FindOptions & { where?: null }, // Forbid where field in query query: FindOptions & { where?: null }, // Forbid where field in query
options: AvailableForListIDsOptions, options: AvailableForListIDsOptions,