Skip to content

refactor SearchService to optimize candidate note retrieval #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
PrivateGER merged 1 commit into from
Jan 6, 2026
Merged

refactor SearchService to optimize candidate note retrieval #33

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
70 changes: 51 additions & 19 deletions packages/backend/src/core/SearchService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -276,41 +276,73 @@ export class SearchService {
opts: SearchOpts,
pagination: SearchPagination,
): Promise<MiNote[]> {
const query = this.queryService.makePaginationQuery(this.notesRepository.createQueryBuilder('note'), pagination.sinceId, pagination.untilId);

if (opts.userId) {
query.andWhere('note.userId = :userId', { userId: opts.userId });
} else if (opts.channelId) {
query.andWhere('note.channelId = :channelId', { channelId: opts.channelId });
// Query 1: Get candidate IDs using only indexed columns
// This allows PostgreSQL to use the indexes properly (single massive query confuses the planner)
const candidateQuery = this.notesRepository.createQueryBuilder('note')
.select('note.id');

// Pagination (match makePaginationQuery behavior)
let sortOrder: 'ASC' | 'DESC';
if (pagination.sinceId && pagination.untilId) {
candidateQuery.andWhere('note.id > :sinceId', { sinceId: pagination.sinceId });
candidateQuery.andWhere('note.id < :untilId', { untilId: pagination.untilId });
sortOrder = 'DESC';
} else if (pagination.sinceId) {
candidateQuery.andWhere('note.id > :sinceId', { sinceId: pagination.sinceId });
sortOrder = 'ASC';
} else if (pagination.untilId) {
candidateQuery.andWhere('note.id < :untilId', { untilId: pagination.untilId });
sortOrder = 'DESC';
} else {
sortOrder = 'DESC';
}
candidateQuery.orderBy('note.id', sortOrder);

query
.innerJoinAndSelect('note.user', 'user')
.leftJoinAndSelect('note.reply', 'reply')
.leftJoinAndSelect('note.renote', 'renote')
.leftJoinAndSelect('reply.user', 'replyUser')
.leftJoinAndSelect('renote.user', 'renoteUser');

// Full-text search filter (provider-specific)
if (this.config.fulltextSearch?.provider === 'sqlPgroonga') {
query.andWhere('note.text &@~ :q', { q });
candidateQuery.andWhere('note.text &@~ :q', { q });
} else if (this.config.fulltextSearch?.provider === 'sqlTsvector') {
query.andWhere('note.tsvector_embedding @@ websearch_to_tsquery(:q)', { q });
candidateQuery.andWhere('note.tsvector_embedding @@ websearch_to_tsquery(:q)', { q });
} else {
query.andWhere('note.text ILIKE :q', { q: `%${ sqlLikeEscape(q) }%` });
candidateQuery.andWhere('note.text ILIKE :q', { q: `%${sqlLikeEscape(q)}%` });
}

if (opts.userId) {
candidateQuery.andWhere('note.userId = :userId', { userId: opts.userId });
} else if (opts.channelId) {
candidateQuery.andWhere('note.channelId = :channelId', { channelId: opts.channelId });
}

if (opts.host) {
if (opts.host === '.') {
query.andWhere('note.userHost IS NULL');
candidateQuery.andWhere('note.userHost IS NULL');
} else {
query.andWhere('note.userHost = :host', { host: opts.host });
candidateQuery.andWhere('note.userHost = :host', { host: opts.host });
}
}

if (opts.filetype) {
query.andWhere('note."attachedFileTypes" && :types', { types: fileTypes[opts.filetype] });
candidateQuery.andWhere('note."attachedFileTypes" && :types', { types: fileTypes[opts.filetype] });
}

// Fetch more candidates than needed since some will likely be filtered by visibility checks
const candidateRows = await candidateQuery.limit(pagination.limit * 5).getRawMany();
const candidateIds: string[] = candidateRows.map(r => r.note_id);

if (candidateIds.length === 0) {
return [];
}

// Query 2: Fetch full notes with visibility/blocking/muting checks
const query = this.notesRepository.createQueryBuilder('note')
.where('note.id IN (:...ids)', { ids: candidateIds })
.innerJoinAndSelect('note.user', 'user')
.leftJoinAndSelect('note.reply', 'reply')
.leftJoinAndSelect('note.renote', 'renote')
.leftJoinAndSelect('reply.user', 'replyUser')
.leftJoinAndSelect('renote.user', 'renoteUser')
.orderBy('note.id', sortOrder);

this.queryService.generateVisibilityQuery(query, me);
this.queryService.generateBlockedHostQueryForNote(query);
this.queryService.generateSuspendedUserQueryForNote(query);
Expand Down
Loading