diff options
| author | 2025-06-24 17:24:34 +0200 | |
|---|---|---|
| committer | 2025-06-24 17:24:34 +0200 | |
| commit | 996da6e0291b158093d917ca76933584f464d668 (patch) | |
| tree | 38c12b20f76076f08ef5c8b8715ba3d8629fa0fb /internal/processing/workers | |
| parent | [bugfix] update the default configuration to not set a db type or address, to... (diff) | |
| download | gotosocial-996da6e0291b158093d917ca76933584f464d668.tar.xz | |
[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 <grufwub@gmail.com>
Co-committed-by: kim <grufwub@gmail.com>
Diffstat (limited to 'internal/processing/workers')
| -rw-r--r-- | internal/processing/workers/fromclientapi_test.go | 3 | ||||
| -rw-r--r-- | internal/processing/workers/surfacenotify.go | 2 | ||||
| -rw-r--r-- | internal/processing/workers/surfacetimeline.go | 12 |
3 files changed, 8 insertions, 9 deletions
diff --git a/internal/processing/workers/fromclientapi_test.go b/internal/processing/workers/fromclientapi_test.go index 3f6964259..1c30c11be 100644 --- a/internal/processing/workers/fromclientapi_test.go +++ b/internal/processing/workers/fromclientapi_test.go @@ -27,7 +27,6 @@ import ( "code.superseriousbusiness.org/gotosocial/internal/ap" "code.superseriousbusiness.org/gotosocial/internal/config" "code.superseriousbusiness.org/gotosocial/internal/db" - statusfilter "code.superseriousbusiness.org/gotosocial/internal/filter/status" "code.superseriousbusiness.org/gotosocial/internal/gtsmodel" "code.superseriousbusiness.org/gotosocial/internal/id" "code.superseriousbusiness.org/gotosocial/internal/messages" @@ -213,7 +212,7 @@ func (suite *FromClientAPITestSuite) statusJSON( ctx, status, requestingAccount, - statusfilter.FilterContextNone, + gtsmodel.FilterContextNone, nil, ) if err != nil { diff --git a/internal/processing/workers/surfacenotify.go b/internal/processing/workers/surfacenotify.go index 044315349..b11fb103e 100644 --- a/internal/processing/workers/surfacenotify.go +++ b/internal/processing/workers/surfacenotify.go @@ -743,7 +743,7 @@ func (s *Surface) Notify( } } - filters, err := s.State.DB.GetFiltersForAccountID(ctx, targetAccount.ID) + filters, err := s.State.DB.GetFiltersByAccountID(ctx, targetAccount.ID) if err != nil { return gtserror.Newf("couldn't retrieve filters for account %s: %w", targetAccount.ID, err) } diff --git a/internal/processing/workers/surfacetimeline.go b/internal/processing/workers/surfacetimeline.go index 7ef5fee87..7f9bcd596 100644 --- a/internal/processing/workers/surfacetimeline.go +++ b/internal/processing/workers/surfacetimeline.go @@ -180,7 +180,7 @@ func (s *Surface) timelineAndNotifyStatusForFollowers( follow.Account, status, stream.TimelineHome, - statusfilter.FilterContextHome, + gtsmodel.FilterContextHome, filters, ); homeTimelined { @@ -275,7 +275,7 @@ func (s *Surface) listTimelineStatusForFollow( follow.Account, status, stream.TimelineList+":"+list.ID, // key streamType to this specific list - statusfilter.FilterContextHome, + gtsmodel.FilterContextHome, filters, ) @@ -288,7 +288,7 @@ func (s *Surface) listTimelineStatusForFollow( // getFiltersAndMutes returns an account's filters and mutes. func (s *Surface) getFilters(ctx context.Context, accountID string) ([]*gtsmodel.Filter, error) { - filters, err := s.State.DB.GetFiltersForAccountID(ctx, accountID) + filters, err := s.State.DB.GetFiltersByAccountID(ctx, accountID) if err != nil { return nil, gtserror.Newf("couldn't retrieve filters for account %s: %w", accountID, err) } @@ -369,7 +369,7 @@ func (s *Surface) timelineStatus( account *gtsmodel.Account, status *gtsmodel.Status, streamType string, - filterCtx statusfilter.FilterContext, + filterCtx gtsmodel.FilterContext, filters []*gtsmodel.Filter, ) bool { @@ -436,7 +436,7 @@ func (s *Surface) timelineAndNotifyStatusForTagFollowers( tagFollowerAccount, status, stream.TimelineHome, - statusfilter.FilterContextHome, + gtsmodel.FilterContextHome, filters, ) } @@ -731,7 +731,7 @@ func (s *Surface) timelineStreamStatusUpdate( apiStatus, err := s.Converter.StatusToAPIStatus(ctx, status, account, - statusfilter.FilterContextHome, + gtsmodel.FilterContextHome, filters, ) |
