From 504c4f227f82a44e7851dafb1614af7a944080e7 Mon Sep 17 00:00:00 2001 From: tobi <31960611+tsmethurst@users.noreply.github.com> Date: Wed, 28 Feb 2024 12:53:46 +0100 Subject: [PATCH] [chore] re-add `statuses_account_id_id_idx` if removed (#2699) * [chore] re-add `statuses_account_id_id_idx` if removed * if not exists --- ..._statuses_mentions_is_null_or_empty_idx.go | 12 +--- ...113608_readd_statuses_account_id_id_idx.go | 58 +++++++++++++++++++ 2 files changed, 59 insertions(+), 11 deletions(-) create mode 100644 internal/db/bundb/migrations/20240228113608_readd_statuses_account_id_id_idx.go diff --git a/internal/db/bundb/migrations/20240220204526_add_statuses_mentions_is_null_or_empty_idx.go b/internal/db/bundb/migrations/20240220204526_add_statuses_mentions_is_null_or_empty_idx.go index 8bf1abca5d..fb09d6b120 100644 --- a/internal/db/bundb/migrations/20240220204526_add_statuses_mentions_is_null_or_empty_idx.go +++ b/internal/db/bundb/migrations/20240220204526_add_statuses_mentions_is_null_or_empty_idx.go @@ -39,17 +39,7 @@ func init() { } return db.RunInTx(ctx, nil, func(ctx context.Context, tx bun.Tx) error { - log.Info(ctx, "reindexing statuses_account_id_id_idx -> statuses_account_view_idx; this may take a few minutes, please don't interrupt this migration!") - - // Remove previous index for viewing - // statuses created by account. - if _, err := tx. - NewDropIndex(). - Index("statuses_account_id_id_idx"). - IfExists(). - Exec(ctx); err != nil { - return err - } + log.Info(ctx, "reindexing statuses (statuses_account_view_idx); this may take a few minutes, please don't interrupt this migration!") // Add new index for viewing statuses created // by account, which includes mentions in the index. diff --git a/internal/db/bundb/migrations/20240228113608_readd_statuses_account_id_id_idx.go b/internal/db/bundb/migrations/20240228113608_readd_statuses_account_id_id_idx.go new file mode 100644 index 0000000000..6df74fc4d3 --- /dev/null +++ b/internal/db/bundb/migrations/20240228113608_readd_statuses_account_id_id_idx.go @@ -0,0 +1,58 @@ +// 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" + + gtsmodel "github.com/superseriousbusiness/gotosocial/internal/gtsmodel" + "github.com/superseriousbusiness/gotosocial/internal/log" + "github.com/uptrace/bun" +) + +func init() { + up := func(ctx context.Context, db *bun.DB) error { + log.Info(ctx, "reindexing statuses (statuses_account_id_id_idx); this may take a few minutes, please don't interrupt this migration!") + + // Re-add index removed in a different + // version of previous migration. + if _, err := db. + NewCreateIndex(). + Model(>smodel.Status{}). + Index("statuses_account_id_id_idx"). + Column("account_id"). + ColumnExpr("id DESC"). + 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) + } +}