diff options
author | Chocobozzz <me@florianbigard.com> | 2020-01-03 13:47:45 +0100 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-01-03 13:47:45 +0100 |
commit | 35f28e94c763370616d25d5820f4b9ef70cedca9 (patch) | |
tree | 7ade51d5e60a5856d74c5776dd62fcaaa3ae0858 /server/models | |
parent | 562724a1ed13fe93aba08ca1a0f8e029819e9f32 (diff) | |
download | PeerTube-35f28e94c763370616d25d5820f4b9ef70cedca9.tar.gz PeerTube-35f28e94c763370616d25d5820f4b9ef70cedca9.tar.zst PeerTube-35f28e94c763370616d25d5820f4b9ef70cedca9.zip |
Add infohash cache
Diffstat (limited to 'server/models')
-rw-r--r-- | server/models/video/video-file.ts | 9 | ||||
-rw-r--r-- | server/models/video/video-streaming-playlist.ts | 16 |
2 files changed, 23 insertions, 2 deletions
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' | |||
24 | import { VideoRedundancyModel } from '../redundancy/video-redundancy' | 24 | import { VideoRedundancyModel } from '../redundancy/video-redundancy' |
25 | import { VideoStreamingPlaylistModel } from './video-streaming-playlist' | 25 | import { VideoStreamingPlaylistModel } from './video-streaming-playlist' |
26 | import { FindOptions, Op, QueryTypes, Transaction } from 'sequelize' | 26 | import { FindOptions, Op, QueryTypes, Transaction } from 'sequelize' |
27 | import { MIMETYPES } from '../../initializers/constants' | 27 | import { MIMETYPES, MEMOIZE_LENGTH, MEMOIZE_TTL } from '../../initializers/constants' |
28 | import { MVideoFile, MVideoFileStreamingPlaylistVideo, MVideoFileVideo } from '../../typings/models/video/video-file' | 28 | import { MVideoFile, MVideoFileStreamingPlaylistVideo, MVideoFileVideo } from '../../typings/models/video/video-file' |
29 | import { MStreamingPlaylistVideo, MVideo } from '@server/typings/models' | 29 | import { MStreamingPlaylistVideo, MVideo } from '@server/typings/models' |
30 | import * as memoizee from 'memoizee' | ||
30 | 31 | ||
31 | @Table({ | 32 | @Table({ |
32 | tableName: 'videoFile', | 33 | tableName: 'videoFile', |
@@ -138,6 +139,12 @@ export class VideoFileModel extends Model<VideoFileModel> { | |||
138 | }) | 139 | }) |
139 | RedundancyVideos: VideoRedundancyModel[] | 140 | RedundancyVideos: VideoRedundancyModel[] |
140 | 141 | ||
142 | static doesInfohashExistCached = memoizee(VideoFileModel.doesInfohashExist, { | ||
143 | promise: true, | ||
144 | max: MEMOIZE_LENGTH.INFO_HASH_EXISTS, | ||
145 | maxAge: MEMOIZE_TTL.INFO_HASH_EXISTS | ||
146 | }) | ||
147 | |||
141 | static doesInfohashExist (infoHash: string) { | 148 | static doesInfohashExist (infoHash: string) { |
142 | const query = 'SELECT 1 FROM "videoFile" WHERE "infoHash" = $infoHash LIMIT 1' | 149 | const query = 'SELECT 1 FROM "videoFile" WHERE "infoHash" = $infoHash LIMIT 1' |
143 | const options = { | 150 | 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' | |||
5 | import { VideoRedundancyModel } from '../redundancy/video-redundancy' | 5 | import { VideoRedundancyModel } from '../redundancy/video-redundancy' |
6 | import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type' | 6 | import { VideoStreamingPlaylistType } from '../../../shared/models/videos/video-streaming-playlist.type' |
7 | import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' | 7 | import { isActivityPubUrlValid } from '../../helpers/custom-validators/activitypub/misc' |
8 | import { CONSTRAINTS_FIELDS, P2P_MEDIA_LOADER_PEER_VERSION, STATIC_DOWNLOAD_PATHS, STATIC_PATHS } from '../../initializers/constants' | 8 | import { |
9 | CONSTRAINTS_FIELDS, | ||
10 | MEMOIZE_LENGTH, | ||
11 | MEMOIZE_TTL, | ||
12 | P2P_MEDIA_LOADER_PEER_VERSION, | ||
13 | STATIC_DOWNLOAD_PATHS, | ||
14 | STATIC_PATHS | ||
15 | } from '../../initializers/constants' | ||
9 | import { join } from 'path' | 16 | import { join } from 'path' |
10 | import { sha1 } from '../../helpers/core-utils' | 17 | import { sha1 } from '../../helpers/core-utils' |
11 | import { isArrayOf } from '../../helpers/custom-validators/misc' | 18 | import { isArrayOf } from '../../helpers/custom-validators/misc' |
@@ -13,6 +20,7 @@ import { Op, QueryTypes } from 'sequelize' | |||
13 | import { MStreamingPlaylist, MVideoFile } from '@server/typings/models' | 20 | import { MStreamingPlaylist, MVideoFile } from '@server/typings/models' |
14 | import { VideoFileModel } from '@server/models/video/video-file' | 21 | import { VideoFileModel } from '@server/models/video/video-file' |
15 | import { getTorrentFileName, getVideoFilename } from '@server/lib/video-paths' | 22 | import { getTorrentFileName, getVideoFilename } from '@server/lib/video-paths' |
23 | import * as memoizee from 'memoizee' | ||
16 | 24 | ||
17 | @Table({ | 25 | @Table({ |
18 | tableName: 'videoStreamingPlaylist', | 26 | tableName: 'videoStreamingPlaylist', |
@@ -89,6 +97,12 @@ export class VideoStreamingPlaylistModel extends Model<VideoStreamingPlaylistMod | |||
89 | }) | 97 | }) |
90 | RedundancyVideos: VideoRedundancyModel[] | 98 | RedundancyVideos: VideoRedundancyModel[] |
91 | 99 | ||
100 | static doesInfohashExistCached = memoizee(VideoStreamingPlaylistModel.doesInfohashExist, { | ||
101 | promise: true, | ||
102 | max: MEMOIZE_LENGTH.INFO_HASH_EXISTS, | ||
103 | maxAge: MEMOIZE_TTL.INFO_HASH_EXISTS | ||
104 | }) | ||
105 | |||
92 | static doesInfohashExist (infoHash: string) { | 106 | static doesInfohashExist (infoHash: string) { |
93 | const query = 'SELECT 1 FROM "videoStreamingPlaylist" WHERE $infoHash = ANY("p2pMediaLoaderInfohashes") LIMIT 1' | 107 | const query = 'SELECT 1 FROM "videoStreamingPlaylist" WHERE $infoHash = ANY("p2pMediaLoaderInfohashes") LIMIT 1' |
94 | const options = { | 108 | const options = { |