Tune query (#4192)

* showReplayInPublicTimeline index * SLOWPLAN * a * a * a * apiLogger * a * a * a * a * a * a * a * SLOWTL * a * x * x * o * a * o * a * s * x * x * a
mei23 · Nov 24, 2022 · fbf837c · fbf837c
1 parent 2da0997
commit fbf837c
Show file tree

Hide file tree

Showing 5 changed files with 39 additions and 11 deletions.
diff --git a/src/server/api/common/get-timeline.ts b/src/server/api/common/get-timeline.ts
@@ -1,8 +1,9 @@
 import Note, { INote, packMany } from '../../../models/note';
 import { ILocalUser } from '../../../models/user';
+import { apiLogger } from '../logger';
 
-export async function getPackedTimeline(me: ILocalUser | null, query: any, sort: Record<string, number>, limit: number) {
-	const timeline = await Note.aggregate<INote[]>([
+function getStages(query: any, sort: Record<string, number>, limit: number) {
+	return [
 		{
 			$match: { $and: [
 				query,
@@ -46,10 +47,37 @@ export async function getPackedTimeline(me: ILocalUser | null, query: any, sort:
 				path: '$__user'
 			}
 		}
-	],	// aggregates
+	];
+}
+
+export async function getPackedTimeline(me: ILocalUser | null, query: any, sort: Record<string, number>, limit: number, hint: string | undefined = undefined) {
+	const begin = performance.now();
+
+	// Query
+	const timeline = await Note.aggregate<INote[]>(getStages(query, sort, limit),
 	{
 		maxTimeMS: 55000,
+		hint,
 	});
 
-	return await packMany(timeline, me);
+	const queryEnd = performance.now();
+
+	// Pack
+	const packed = await packMany(timeline, me);
+
+	const packEnd = performance.now();
+
+	if (queryEnd - begin > 1000) {
+		apiLogger.warn(`SLOWTL: query=${(queryEnd - begin).toFixed()}, pack=${(packEnd - queryEnd).toFixed()}`);
+	}
+
+	return packed;
+}
+
+export async function explainTimeline(me: ILocalUser | null, query: any, sort: Record<string, number>, limit: number, hint: string | undefined = undefined) {
+	return await Note.aggregate<INote[]>(getStages(query, sort, limit),
+	{
+		explain: true,
+		hint,
+	}) as unknown;
 }
diff --git a/src/server/api/endpoints/notes/global-timeline.ts b/src/server/api/endpoints/notes/global-timeline.ts
@@ -119,6 +119,8 @@ export default define(meta, async (ps, user) => {
 
 	if (!m.showReplayInPublicTimeline) {
 		query.replyId = null;
+	} else {
+		query.replyId = { $ne: null };
 	}
 
 	if (hideUserIds && hideUserIds.length > 0) {

diff --git a/src/server/api/endpoints/notes/local-timeline.ts b/src/server/api/endpoints/notes/local-timeline.ts
@@ -122,6 +122,8 @@ export default define(meta, async (ps, user) => {
 
 	if (!m.showReplayInPublicTimeline) {
 		query.replyId = null;
+	} else {
+		query.replyId = { $ne: null };
 	}
 
 	if (hideUserIds && hideUserIds.length > 0) {

diff --git a/src/server/api/endpoints/notes/locao-timeline.ts b/src/server/api/endpoints/notes/locao-timeline.ts
@@ -122,6 +122,8 @@ export default define(meta, async (ps, user) => {
 
 	if (!m.showReplayInPublicTimeline) {
 		query.replyId = null;
+	} else {
+		query.replyId = { $ne: null };
 	}
 
 	if (hideUserIds && hideUserIds.length > 0) {

diff --git a/src/server/api/endpoints/notes/timeline.ts b/src/server/api/endpoints/notes/timeline.ts
@@ -7,7 +7,6 @@ import UserList from '../../../../models/user-list';
 import { concat } from '../../../../prelude/array';
 import { isSelfHost } from '../../../../misc/convert-host';
 import { getHideRenoteUserIds } from '../../common/get-hide-renote-users';
-import { oidIncludes } from '../../../../prelude/oid';
 import { getPackedTimeline } from '../../common/get-timeline';
 import config from '../../../../config';
 
@@ -174,13 +173,8 @@ export default define(meta, async (ps, user) => {
 		_id: -1
 	};
 
-	// どうせフィルタされるユーザーはフォローしてない扱いにして最初のuserのIXSCANの精度を少しでも高くする
-	const realFollowingIds = followingIds
-		.filter(x => !oidIncludes(hideUserIds, x))
-		.filter(x => !oidIncludes(hideFromHomeUsers, x));
-
 	const followQuery = [{
-		userId: { $in: realFollowingIds }
+		userId: { $in: followingIds }
 	}];
 
 	const visibleQuery = user == null ? [{