From f4fcffc8b56ef73c184ae17892b69181961c15c7 Mon Sep 17 00:00:00 2001 From: kim <89579420+NyaaaWhatsUpDoc@users.noreply.github.com> Date: Fri, 15 Dec 2023 14:24:39 +0000 Subject: [bugfix] use a much shorter refresh limit for statuses with polls (#2453) * specifically use a much shorter refresh limit for statuses with polls * allow specifying whether status must be upToDate in calls to Get(Visible)?TargetStatusBy_(), limit force refresh to 5 minute cooldown * remove the PollID check from statusUpToDate() * remove unnecessary force flag checks * remove unused field * check refresh status error * use argument name 'refresh' instead of 'upToDate' to better fit with the codebase * add statuses_poll_id_idx * remove the definitely-not copy-pasted comment i accidentally typed out in full * only synchronously refresh if the refresh flag is provided, otherwise do async * fix wrong force value being provided for async --------- Co-authored-by: tobi --- .../20231215115920_add_status_poll_index.go | 66 ++++++++++++++++++++++ internal/db/bundb/poll.go | 14 ----- internal/db/bundb/poll_test.go | 8 --- internal/db/bundb/status.go | 11 ++++ 4 files changed, 77 insertions(+), 22 deletions(-) create mode 100644 internal/db/bundb/migrations/20231215115920_add_status_poll_index.go (limited to 'internal/db/bundb') diff --git a/internal/db/bundb/migrations/20231215115920_add_status_poll_index.go b/internal/db/bundb/migrations/20231215115920_add_status_poll_index.go new file mode 100644 index 000000000..54b585d60 --- /dev/null +++ b/internal/db/bundb/migrations/20231215115920_add_status_poll_index.go @@ -0,0 +1,66 @@ +// GoToSocial +// Copyright (C) GoToSocial Authors admin@gotosocial.org +// SPDX-License-Identifier: AGPL-3.0-or-later +// +// This program is free software: you can redistribute it and/or modify +// it under the terms of the GNU Affero General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Affero General Public License for more details. +// +// You should have received a copy of the GNU Affero General Public License +// along with this program. If not, see . + +package migrations + +import ( + "context" + + "github.com/uptrace/bun" +) + +func init() { + up := func(ctx context.Context, db *bun.DB) error { + return db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error { + type spec struct { + index string + table string + columns []string + } + + for _, spec := range []spec{ + { + index: "statuses_poll_id_idx", + table: "statuses", + columns: []string{"poll_id"}, + }, + } { + if _, err := tx. + NewCreateIndex(). + Table(spec.table). + Index(spec.index). + Column(spec.columns...). + IfNotExists(). + Exec(ctx); err != nil { + return err + } + } + + return nil + }) + } + + down := func(ctx context.Context, db *bun.DB) error { + return db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error { + return nil + }) + } + + if err := Migrations.Register(up, down); err != nil { + panic(err) + } +} diff --git a/internal/db/bundb/poll.go b/internal/db/bundb/poll.go index 830fb88ec..3e77fb6c5 100644 --- a/internal/db/bundb/poll.go +++ b/internal/db/bundb/poll.go @@ -50,20 +50,6 @@ func (p *pollDB) GetPollByID(ctx context.Context, id string) (*gtsmodel.Poll, er ) } -func (p *pollDB) GetPollByStatusID(ctx context.Context, statusID string) (*gtsmodel.Poll, error) { - return p.getPoll( - ctx, - "StatusID", - func(poll *gtsmodel.Poll) error { - return p.db.NewSelect(). - Model(poll). - Where("? = ?", bun.Ident("poll.status_id"), statusID). - Scan(ctx) - }, - statusID, - ) -} - func (p *pollDB) getPoll(ctx context.Context, lookup string, dbQuery func(*gtsmodel.Poll) error, keyParts ...any) (*gtsmodel.Poll, error) { // Fetch poll from database cache with loader callback poll, err := p.state.Caches.GTS.Poll().Load(lookup, func() (*gtsmodel.Poll, error) { diff --git a/internal/db/bundb/poll_test.go b/internal/db/bundb/poll_test.go index 479557c55..6bdbdb983 100644 --- a/internal/db/bundb/poll_test.go +++ b/internal/db/bundb/poll_test.go @@ -67,10 +67,6 @@ func (suite *PollTestSuite) TestGetPollBy() { "id": func() (*gtsmodel.Poll, error) { return suite.db.GetPollByID(ctx, poll.ID) }, - - "status_id": func() (*gtsmodel.Poll, error) { - return suite.db.GetPollByStatusID(ctx, poll.StatusID) - }, } { // Clear database caches. @@ -287,10 +283,6 @@ func (suite *PollTestSuite) TestDeletePoll() { // Ensure that afterwards we cannot fetch poll. _, err = suite.db.GetPollByID(ctx, poll.ID) suite.ErrorIs(err, db.ErrNoEntries) - - // Or again by the status it's attached to. - _, err = suite.db.GetPollByStatusID(ctx, poll.StatusID) - suite.ErrorIs(err, db.ErrNoEntries) } } diff --git a/internal/db/bundb/status.go b/internal/db/bundb/status.go index dd161e1ec..da252c7f7 100644 --- a/internal/db/bundb/status.go +++ b/internal/db/bundb/status.go @@ -87,6 +87,17 @@ func (s *statusDB) GetStatusByURL(ctx context.Context, url string) (*gtsmodel.St ) } +func (s *statusDB) GetStatusByPollID(ctx context.Context, pollID string) (*gtsmodel.Status, error) { + return s.getStatus( + ctx, + "PollID", + func(status *gtsmodel.Status) error { + return s.db.NewSelect().Model(status).Where("? = ?", bun.Ident("status.poll_id"), pollID).Scan(ctx) + }, + pollID, + ) +} + func (s *statusDB) GetStatusBoost(ctx context.Context, boostOfID string, byAccountID string) (*gtsmodel.Status, error) { return s.getStatus( ctx, -- cgit v1.3