usbharu
/
misskey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: db fallback not working

This commit is contained in:
anatawa12 2023-11-29 22:56:00 +09:00
parent f6b7725e72
commit d196900986
No known key found for this signature in database
GPG Key ID: 9CA909848B8E4EA6
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
packages/backend/src/core/FanoutTimelineEndpointService.ts
View File

@ -53,7 +53,7 @@ export class FanoutTimelineEndpointService {
let shouldFallbackToDb = false; let shouldFallbackToDb = false;
// 呼び出し元と以下の処理をシンプルにするためにdbFallbackを置き換える // 呼び出し元と以下の処理をシンプルにするためにdbFallbackを置き換える
if (ps.useDbFallback) ps.dbFallback = () => Promise.resolve([]); if (!ps.useDbFallback) ps.dbFallback = () => Promise.resolve([]);
const timelines = ps.redisTimelines.map(x => typeof x === 'string' ? x : x.name); const timelines = ps.redisTimelines.map(x => typeof x === 'string' ? x : x.name);
@ -79,6 +79,7 @@ export class FanoutTimelineEndpointService {
const redisTimeline: MiNote[] = []; const redisTimeline: MiNote[] = [];
let readFromRedis = 0; let readFromRedis = 0;
let lastSuccessfulRate = 1; // rateをキャッシュする？ let lastSuccessfulRate = 1; // rateをキャッシュする？
let trialCount = 1;
while ((redisResultIds.length - readFromRedis) !== 0) { while ((redisResultIds.length - readFromRedis) !== 0) {
const remainingToRead = ps.limit - redisTimeline.length; const remainingToRead = ps.limit - redisTimeline.length;
@ -93,6 +94,8 @@ export class FanoutTimelineEndpointService {
redisTimeline.push(...gotFromDb); redisTimeline.push(...gotFromDb);
lastSuccessfulRate = gotFromDb.length / noteIds.length; lastSuccessfulRate = gotFromDb.length / noteIds.length;
console.log(`fanoutTimelineTrial#${trialCount++}: req: ${ps.limit}, tried: ${noteIds.length}, got: ${gotFromDb.length}, rate: ${lastSuccessfulRate}, total: ${redisTimeline.length}, fromRedis: ${redisResultIds.length}`);
if (redisTimeline.length >= ps.limit) { if (redisTimeline.length >= ps.limit) {
// 十分Redisからとれた // 十分Redisからとれた
return redisTimeline.slice(0, ps.limit); return redisTimeline.slice(0, ps.limit);
@ -100,7 +103,11 @@ export class FanoutTimelineEndpointService {
} }
// まだ足りない分はDBにフォールバック // まだ足りない分はDBにフォールバック
return await ps.dbFallback(noteIds[noteIds.length - 1], ps.sinceId, ps.limit); const remainingToRead = ps.limit - redisTimeline.length;
const gotFromDb = await ps.dbFallback(noteIds[noteIds.length - 1], ps.sinceId, remainingToRead);
redisTimeline.push(...gotFromDb);
console.log(`fanoutTimelineTrial#db: req: ${ps.limit}, tried: ${remainingToRead}, got: ${gotFromDb.length}, since: ${noteIds[noteIds.length - 1]}, until: ${ps.untilId}, total: ${redisTimeline.length}`);
return redisTimeline;
} }
return await ps.dbFallback(ps.untilId, ps.sinceId, ps.limit); return await ps.dbFallback(ps.untilId, ps.sinceId, ps.limit);