From 996da6e0291b158093d917ca76933584f464d668 Mon Sep 17 00:00:00 2001 From: kim Date: Tue, 24 Jun 2025 17:24:34 +0200 Subject: [performance] filter model and database table improvements (#4277) - removes unnecessary fields / columns (created_at, updated_at) - replaces filter.context_* columns with singular filter.contexts bit field which should save both struct memory and database space - replaces filter.action string with integer enum type which should save both struct memory and database space - adds links from filter to filter_* tables with Filter{}.KeywordIDs and Filter{}.StatusIDs fields (this also means we now have those ID slices cached, which reduces some lookups) - removes account_id fields from filter_* tables, since there's a more direct connection between filter and filter_* tables, and filter.account_id already exists - refactors a bunch of the filter processor logic to save on code repetition, factor in the above changes, fix a few bugs with missed error returns and bring it more in-line with some of our newer code Reviewed-on: https://codeberg.org/superseriousbusiness/gotosocial/pulls/4277 Co-authored-by: kim Co-committed-by: kim --- internal/processing/processor.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'internal/processing/processor.go') diff --git a/internal/processing/processor.go b/internal/processing/processor.go index b8adb9bb8..22574f1d7 100644 --- a/internal/processing/processor.go +++ b/internal/processing/processor.go @@ -34,6 +34,7 @@ import ( "code.superseriousbusiness.org/gotosocial/internal/processing/common" "code.superseriousbusiness.org/gotosocial/internal/processing/conversations" "code.superseriousbusiness.org/gotosocial/internal/processing/fedi" + filterCommon "code.superseriousbusiness.org/gotosocial/internal/processing/filters/common" filtersv1 "code.superseriousbusiness.org/gotosocial/internal/processing/filters/v1" filtersv2 "code.superseriousbusiness.org/gotosocial/internal/processing/filters/v2" "code.superseriousbusiness.org/gotosocial/internal/processing/interactionrequests" @@ -224,6 +225,7 @@ func NewProcessor( processor.account = account.New(&common, state, converter, mediaManager, federator, visFilter, parseMentionFunc) processor.media = media.New(&common, state, converter, federator, mediaManager, federator.TransportController()) processor.stream = stream.New(state, oauthServer) + filterCommon := filterCommon.New(state) // Instantiate the rest of the sub // processors + pin them to this struct. @@ -232,8 +234,8 @@ func NewProcessor( processor.application = application.New(state, converter) processor.conversations = conversations.New(state, converter, visFilter, muteFilter) processor.fedi = fedi.New(state, &common, converter, federator, visFilter) - processor.filtersv1 = filtersv1.New(state, converter, &processor.stream) - processor.filtersv2 = filtersv2.New(state, converter, &processor.stream) + processor.filtersv1 = filtersv1.New(state, converter, filterCommon, &processor.stream) + processor.filtersv2 = filtersv2.New(state, converter, filterCommon, &processor.stream) processor.interactionRequests = interactionrequests.New(&common, state, converter) processor.list = list.New(state, converter) processor.markers = markers.New(state, converter) -- cgit v1.2.3