From 35f28e94c763370616d25d5820f4b9ef70cedca9 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Fri, 3 Jan 2020 13:47:45 +0100 Subject: Add infohash cache --- server/models/video/video-file.ts | 9 ++++++++- server/models/video/video-streaming-playlist.ts | 16 +++++++++++++++- 2 files changed, 23 insertions(+), 2 deletions(-) (limited to 'server/models') diff --git a/server/models/video/video-file.ts b/server/models/video/video-file.ts index fa5a6e76d..e08999385 100644 --- a/server/models/video/video-file.ts +++ b/server/models/video/video-file.ts @@ -24,9 +24,10 @@ import { VideoModel } from './video' import { VideoRedundancyModel } from '../redundancy/video-redundancy' import { VideoStreamingPlaylistModel } from './video-streaming-playlist' import { FindOptions, Op, QueryTypes, Transaction } from 'sequelize' -import { MIMETYPES } from '../../initializers/constants' +import { MIMETYPES, MEMOIZE_LENGTH, MEMOIZE_TTL } from '../../initializers/constants' import { MVideoFile, MVideoFileStreamingPlaylistVideo, MVideoFileVideo } from '../../typings/models/video/video-file' import { MStreamingPlaylistVideo, MVideo } from '@server/typings/models' +import * as memoizee from 'memoizee' @Table({ tableName: 'videoFile', @@ -138,6 +139,12 @@ export class VideoFileModel extends Model { }) RedundancyVideos: VideoRedundancyModel[] + static doesInfohashExistCached = memoizee(VideoFileModel.doesInfohashExist, { + promise: true, + max: MEMOIZE_LENGTH.INFO_HASH_EXISTS, + maxAge: MEMOIZE_TTL.INFO_HASH_EXISTS + }) + static doesInfohashExist (infoHash: string) { const query = 'SELECT 1 FROM "videoFile" WHERE "infoHash" = $infoHash LIMIT 1' const options = { diff --git a/server/models/video/video-streaming-playlist.ts b/server/models/video/video-streaming-playlist.ts index faad4cc2d..0099add4e 100644 --- a/server/models/video/video-streaming-playlist.ts +++ b/server/models/video/video-streaming-playlist.ts @@ -5,7 +5,14 @@ import { VideoModel } from './video' import { VideoRedundancyModel } from '../redundancy/video-redundancy' import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type' import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' -import { CONSTRAINTS_FIELDS, P2P_MEDIA_LOADER_PEER_VERSION, STATIC_DOWNLOAD_PATHS, STATIC_PATHS } from '../../initializers/constants' +import { + CONSTRAINTS_FIELDS, + MEMOIZE_LENGTH, + MEMOIZE_TTL, + P2P_MEDIA_LOADER_PEER_VERSION, + STATIC_DOWNLOAD_PATHS, + STATIC_PATHS +} from '../../initializers/constants' import { join } from 'path' import { sha1 } from '../../helpers/core-utils' import { isArrayOf } from '../../helpers/custom-validators/misc' @@ -13,6 +20,7 @@ import { Op, QueryTypes } from 'sequelize' import { MStreamingPlaylist, MVideoFile } from '@server/typings/models' import { VideoFileModel } from '@server/models/video/video-file' import { getTorrentFileName, getVideoFilename } from '@server/lib/video-paths' +import * as memoizee from 'memoizee' @Table({ tableName: 'videoStreamingPlaylist', @@ -89,6 +97,12 @@ export class VideoStreamingPlaylistModel extends Model