mirror of
https://github.com/superseriousbusiness/gotosocial.git
synced 2025-10-29 14:52:26 -05:00
[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 <tobi.smethurst@protonmail.com>
This commit is contained in:
parent
d0bb8f0973
commit
f4fcffc8b5
17 changed files with 207 additions and 98 deletions
|
|
@ -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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
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)
|
||||
}
|
||||
}
|
||||
|
|
@ -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) {
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -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,
|
||||
|
|
|
|||
|
|
@ -27,9 +27,6 @@ type Poll interface {
|
|||
// GetPollByID fetches the Poll with given ID from the database.
|
||||
GetPollByID(ctx context.Context, id string) (*gtsmodel.Poll, error)
|
||||
|
||||
// GetPollByStatusID fetches the Poll with given status ID column value from the database.
|
||||
GetPollByStatusID(ctx context.Context, statusID string) (*gtsmodel.Poll, error)
|
||||
|
||||
// GetOpenPolls fetches all local Polls in the database with an unset `closed_at` column.
|
||||
GetOpenPolls(ctx context.Context) ([]*gtsmodel.Poll, error)
|
||||
|
||||
|
|
|
|||
|
|
@ -25,15 +25,18 @@ import (
|
|||
|
||||
// Status contains functions for getting statuses, creating statuses, and checking various other fields on statuses.
|
||||
type Status interface {
|
||||
// GetStatusByID returns one status from the database, with no rel fields populated, only their linking ID / URIs
|
||||
// GetStatusByID fetches the status from the database with matching id column.
|
||||
GetStatusByID(ctx context.Context, id string) (*gtsmodel.Status, error)
|
||||
|
||||
// GetStatusByURI returns one status from the database, with no rel fields populated, only their linking ID / URIs
|
||||
// GetStatusByURI fetches the status from the database with matching uri column.
|
||||
GetStatusByURI(ctx context.Context, uri string) (*gtsmodel.Status, error)
|
||||
|
||||
// GetStatusByURL returns one status from the database, with no rel fields populated, only their linking ID / URIs
|
||||
// GetStatusByURL fetches the status from the database with matching url column.
|
||||
GetStatusByURL(ctx context.Context, uri string) (*gtsmodel.Status, error)
|
||||
|
||||
// GetStatusByPollID fetches the status from the database with matching poll_id column.
|
||||
GetStatusByPollID(ctx context.Context, pollID string) (*gtsmodel.Status, error)
|
||||
|
||||
// GetStatusBoost fetches the status whose boost_of_id column refers to boostOfID, authored by given account ID.
|
||||
GetStatusBoost(ctx context.Context, boostOfID string, byAccountID string) (*gtsmodel.Status, error)
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue