Delete Labels & IssueLabels on Repo Delete too (#15039)

* Doctor: find IssueLabels without existing label

* on Repo Delete: delete labels & issue_labels too

* performance nits

* Add Migration: Delete orphaned IssueLabels

* Migration v174: use Sync2

* USE sess !!!

* better func name

* code format & comment

* RAW SQL

* Update models/migrations/v176.go

* next try?
mj-v1.14.3
6543 3 years ago committed by GitHub
parent dace0ce1b1
commit a3a65137ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -224,6 +224,23 @@ func DeleteOrphanedLabels() error {
return nil return nil
} }
// CountOrphanedIssueLabels return count of IssueLabels witch have no label behind anymore
func CountOrphanedIssueLabels() (int64, error) {
return x.Table("issue_label").
Join("LEFT", "label", "issue_label.label_id = label.id").
Where(builder.IsNull{"label.id"}).Count()
}
// DeleteOrphanedIssueLabels delete IssueLabels witch have no label behind anymore
func DeleteOrphanedIssueLabels() error {
_, err := x.In("id", builder.Select("issue_label.id").From("issue_label").
Join("LEFT", "label", "issue_label.label_id = label.id").
Where(builder.IsNull{"label.id"})).
Delete(IssueLabel{})
return err
}
// CountOrphanedIssues count issues without a repo // CountOrphanedIssues count issues without a repo
func CountOrphanedIssues() (int64, error) { func CountOrphanedIssues() (int64, error) {
return x.Table("issue"). return x.Table("issue").

@ -780,3 +780,15 @@ func DeleteIssueLabel(issue *Issue, label *Label, doer *User) (err error) {
return sess.Commit() return sess.Commit()
} }
func deleteLabelsByRepoID(sess Engine, repoID int64) error {
deleteCond := builder.Select("id").From("label").Where(builder.Eq{"label.repo_id": repoID})
if _, err := sess.In("label_id", deleteCond).
Delete(&IssueLabel{}); err != nil {
return err
}
_, err := sess.Delete(&Label{RepoID: repoID})
return err
}

@ -295,11 +295,13 @@ var migrations = []Migration{
// v173 -> v174 // v173 -> v174
NewMigration("Add time_id column to Comment", addTimeIDCommentColumn), NewMigration("Add time_id column to Comment", addTimeIDCommentColumn),
// v174 -> v175 // v174 -> v175
NewMigration("create repo transfer table", addRepoTransfer), NewMigration("Create repo transfer table", addRepoTransfer),
// v175 -> v176 // v175 -> v176
NewMigration("Fix Postgres ID Sequences broken by recreate-table", fixPostgresIDSequences), NewMigration("Fix Postgres ID Sequences broken by recreate-table", fixPostgresIDSequences),
// v176 -> v177 // v176 -> v177
NewMigration("Remove invalid labels from comments", removeInvalidLabels), NewMigration("Remove invalid labels from comments", removeInvalidLabels),
// v177 -> v178
NewMigration("Delete orphaned IssueLabels", deleteOrphanedIssueLabels),
} }
// GetCurrentDBVersion returns the current db version // GetCurrentDBVersion returns the current db version

@ -5,6 +5,8 @@
package migrations package migrations
import ( import (
"fmt"
"xorm.io/xorm" "xorm.io/xorm"
) )
@ -19,5 +21,15 @@ func addRepoTransfer(x *xorm.Engine) error {
UpdatedUnix int64 `xorm:"INDEX NOT NULL updated"` UpdatedUnix int64 `xorm:"INDEX NOT NULL updated"`
} }
return x.Sync(new(RepoTransfer)) sess := x.NewSession()
defer sess.Close()
if err := sess.Begin(); err != nil {
return err
}
if err := sess.Sync2(new(RepoTransfer)); err != nil {
return fmt.Errorf("Sync2: %v", err)
}
return sess.Commit()
} }

@ -0,0 +1,42 @@
// Copyright 2021 The Gitea Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package migrations
import (
"fmt"
"xorm.io/xorm"
)
func deleteOrphanedIssueLabels(x *xorm.Engine) error {
type IssueLabel struct {
ID int64 `xorm:"pk autoincr"`
IssueID int64 `xorm:"UNIQUE(s)"`
LabelID int64 `xorm:"UNIQUE(s)"`
}
sess := x.NewSession()
defer sess.Close()
if err := sess.Begin(); err != nil {
return err
}
if err := sess.Sync2(new(IssueLabel)); err != nil {
return fmt.Errorf("Sync2: %v", err)
}
if _, err := sess.Exec(`DELETE FROM issue_label WHERE issue_label.id IN (
SELECT ill.id FROM (
SELECT il.id
FROM issue_label AS il
LEFT JOIN label ON il.label_id = label.id
WHERE
label.id IS NULL
) AS ill)`); err != nil {
return err
}
return sess.Commit()
}

@ -1447,11 +1447,11 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
releaseAttachments = append(releaseAttachments, attachments[i].RelativePath()) releaseAttachments = append(releaseAttachments, attachments[i].RelativePath())
} }
if _, err = sess.Exec("UPDATE `user` SET num_stars=num_stars-1 WHERE id IN (SELECT `uid` FROM `star` WHERE repo_id = ?)", repo.ID); err != nil { if _, err := sess.Exec("UPDATE `user` SET num_stars=num_stars-1 WHERE id IN (SELECT `uid` FROM `star` WHERE repo_id = ?)", repo.ID); err != nil {
return err return err
} }
if err = deleteBeans(sess, if err := deleteBeans(sess,
&Access{RepoID: repo.ID}, &Access{RepoID: repo.ID},
&Action{RepoID: repo.ID}, &Action{RepoID: repo.ID},
&Watch{RepoID: repoID}, &Watch{RepoID: repoID},
@ -1475,28 +1475,33 @@ func DeleteRepository(doer *User, uid, repoID int64) error {
return fmt.Errorf("deleteBeans: %v", err) return fmt.Errorf("deleteBeans: %v", err)
} }
// Delete Labels and related objects
if err := deleteLabelsByRepoID(sess, repoID); err != nil {
return err
}
// Delete Issues and related objects // Delete Issues and related objects
var attachmentPaths []string var attachmentPaths []string
if attachmentPaths, err = deleteIssuesByRepoID(sess, repoID); err != nil { if attachmentPaths, err = deleteIssuesByRepoID(sess, repoID); err != nil {
return err return err
} }
if _, err = sess.Where("repo_id = ?", repoID).Delete(new(RepoUnit)); err != nil { if _, err := sess.Where("repo_id = ?", repoID).Delete(new(RepoUnit)); err != nil {
return err return err
} }
if repo.IsFork { if repo.IsFork {
if _, err = sess.Exec("UPDATE `repository` SET num_forks=num_forks-1 WHERE id=?", repo.ForkID); err != nil { if _, err := sess.Exec("UPDATE `repository` SET num_forks=num_forks-1 WHERE id=?", repo.ForkID); err != nil {
return fmt.Errorf("decrease fork count: %v", err) return fmt.Errorf("decrease fork count: %v", err)
} }
} }
if _, err = sess.Exec("UPDATE `user` SET num_repos=num_repos-1 WHERE id=?", uid); err != nil { if _, err := sess.Exec("UPDATE `user` SET num_repos=num_repos-1 WHERE id=?", uid); err != nil {
return err return err
} }
if len(repo.Topics) > 0 { if len(repo.Topics) > 0 {
if err = removeTopicsFromRepo(sess, repo.ID); err != nil { if err := removeTopicsFromRepo(sess, repo.ID); err != nil {
return err return err
} }
} }

@ -26,7 +26,6 @@ func checkDBConsistency(logger log.Logger, autofix bool) error {
logger.Critical("Error: %v whilst counting orphaned labels") logger.Critical("Error: %v whilst counting orphaned labels")
return err return err
} }
if count > 0 { if count > 0 {
if autofix { if autofix {
if err = models.DeleteOrphanedLabels(); err != nil { if err = models.DeleteOrphanedLabels(); err != nil {
@ -39,6 +38,24 @@ func checkDBConsistency(logger log.Logger, autofix bool) error {
} }
} }
// find IssueLabels without existing label
count, err = models.CountOrphanedIssueLabels()
if err != nil {
logger.Critical("Error: %v whilst counting orphaned issue_labels")
return err
}
if count > 0 {
if autofix {
if err = models.DeleteOrphanedIssueLabels(); err != nil {
logger.Critical("Error: %v whilst deleting orphaned issue_labels")
return err
}
logger.Info("%d issue_labels without existing label deleted", count)
} else {
logger.Warn("%d issue_labels without existing label", count)
}
}
// find issues without existing repository // find issues without existing repository
count, err = models.CountOrphanedIssues() count, err = models.CountOrphanedIssues()
if err != nil { if err != nil {

Loading…
Cancel
Save