From 54dd0fc88bdef7e9ab92003a9cc79c41423899e6 Mon Sep 17 00:00:00 2001 From: singuliere <35190819+singuliere@users.noreply.github.com> Date: Mon, 21 Feb 2022 14:00:05 +0100 Subject: [PATCH] migrations: remove dead code in gitea uploader (#18725) When migrating, g.issues is a map with all issues created during the migration. If an issue is not found in g.issues when inserting a comment or a review, it cannot exist in the database and trying to get it via GetIssueByIndex() will always fail and return an error. Signed-off-by: singuliere --- services/migrations/gitea_uploader.go | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/services/migrations/gitea_uploader.go b/services/migrations/gitea_uploader.go index 42b55e96b..34f507e83 100644 --- a/services/migrations/gitea_uploader.go +++ b/services/migrations/gitea_uploader.go @@ -416,12 +416,7 @@ func (g *GiteaLocalUploader) CreateComments(comments ...*base.Comment) error { var issue *models.Issue issue, ok := g.issues[comment.IssueIndex] if !ok { - var err error - issue, err = models.GetIssueByIndex(g.repo.ID, comment.IssueIndex) - if err != nil { - return err - } - g.issues[comment.IssueIndex] = issue + return fmt.Errorf("comment references non existent IssueIndex %d", comment.IssueIndex) } if comment.Created.IsZero() { @@ -685,19 +680,14 @@ func convertReviewState(state string) models.ReviewType { } } -// CreateReviews create pull request reviews +// CreateReviews create pull request reviews of currently migrated issues func (g *GiteaLocalUploader) CreateReviews(reviews ...*base.Review) error { cms := make([]*models.Review, 0, len(reviews)) for _, review := range reviews { var issue *models.Issue issue, ok := g.issues[review.IssueIndex] if !ok { - var err error - issue, err = models.GetIssueByIndex(g.repo.ID, review.IssueIndex) - if err != nil { - return err - } - g.issues[review.IssueIndex] = issue + return fmt.Errorf("review references non existent IssueIndex %d", review.IssueIndex) } if review.CreatedAt.IsZero() { review.CreatedAt = time.Unix(int64(issue.CreatedUnix), 0)