mirror/ditto
mirror/ditto
1
0
Fork 0
mirror of https://gitlab.com/soapbox-pub/ditto.git synced 2025-12-06 11:29:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Merge branch 'tag-perf' into 'main'"

Browse source 
This reverts merge request !425
This commit is contained in:
Alex Gleason 2024-07-18 04:11:04 +00:00
parent bf9b816e0b
commit 2d239fcaec
1 changed files with 1 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/storages/EventsDB.ts
View file

@ -7,7 +7,6 @@ import { nip27 } from 'nostr-tools';
import { Conf } from '@/config.ts'; import { Conf } from '@/config.ts';
import { DittoTables } from '@/db/DittoTables.ts'; import { DittoTables } from '@/db/DittoTables.ts';
import { normalizeFilters } from '@/filter.ts';
import { dbEventCounter, dbQueryCounter } from '@/metrics.ts'; import { dbEventCounter, dbQueryCounter } from '@/metrics.ts';
import { RelayError } from '@/RelayError.ts'; import { RelayError } from '@/RelayError.ts';
import { purifyEvent } from '@/storages/hydrate.ts'; import { purifyEvent } from '@/storages/hydrate.ts';
@ -251,7 +250,7 @@ class EventsDB implements NStore {
/** Converts filters to more performant, simpler filters that are better for SQLite. */ /** Converts filters to more performant, simpler filters that are better for SQLite. */
async expandFilters(filters: NostrFilter[]): Promise<NostrFilter[]> { async expandFilters(filters: NostrFilter[]): Promise<NostrFilter[]> {
filters = normalizeFilters(structuredClone(filters)); filters = structuredClone(filters);
for (const filter of filters) { for (const filter of filters) {
if (filter.search) { if (filter.search) {
@ -288,42 +287,10 @@ class EventsDB implements NStore {
// If this results in an empty kinds array, NDatabase will remove the filter before querying and return no results. // If this results in an empty kinds array, NDatabase will remove the filter before querying and return no results.
filter.kinds = filter.kinds.filter((kind) => !NKinds.ephemeral(kind)); filter.kinds = filter.kinds.filter((kind) => !NKinds.ephemeral(kind));
} }
// Convert tag filters into `ids` filter for performance reasons.
const tagEntries = Object.entries(filter).filter(EventsDB.isTagEntry);
if (tagEntries.length) {
const tagIds: string[] = await tagEntries
.map(([key, value]) =>
this.kysely
.selectFrom('nostr_tags')
.select('event_id')
.distinct()
.where('name', '=', key.replace(/^#/, ''))
.where('value', 'in', value)
)
.reduce((result, query) => result.intersect(query))
.execute()
.then((rows) => rows.map(({ event_id }) => event_id));
if (tagIds.length) {
filter.ids = filter.ids ?? [];
filter.ids.push(...tagIds);
}
for (const [key] of tagEntries) {
delete filter[key];
}
}
} }
return filters; return filters;
} }
/** Check if the object entry is a valid tag filter. */
private static isTagEntry(entry: [string, unknown]): entry is [`#${string}`, string[]] {
const [key, value] = entry;
return key.startsWith('#') && Array.isArray(value);
}
} }
export { EventsDB }; export { EventsDB };