Comments on review should have the same sha (#13448)
* When replying to an outdated comment it should not appear on the files page This happened because the comment took the latest commitID as its base instead of the reviewID that it was replying to. There was also no way of creating an already outdated comment - and a reply to a review on an outdated line should be outdated. Signed-off-by: Andrew Thornton <art27@cantab.net> * fix test Signed-off-by: Andrew Thornton <art27@cantab.net> * Fix broken migration Signed-off-by: Andrew Thornton <art27@cantab.net> * fix mssql Signed-off-by: Andrew Thornton <art27@cantab.net> * Create temporary table because ... well MSSQL ... Signed-off-by: Andrew Thornton <art27@cantab.net> * Create temporary table because ... well MSSQL ... Signed-off-by: Andrew Thornton <art27@cantab.net> * Create temporary table because ... well MSSQL ... Signed-off-by: Andrew Thornton <art27@cantab.net> * fix mssql Signed-off-by: Andrew Thornton <art27@cantab.net> * move session within the batch Signed-off-by: Andrew Thornton <art27@cantab.net> * regen the sqlcmd each time round the loop Signed-off-by: Andrew Thornton <art27@cantab.net> * as per @lunny Signed-off-by: Andrew Thornton <art27@cantab.net> Co-authored-by: techknowlogick <techknowlogick@gitea.io> Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>mj-v1.14.3
zeripath
3 years ago
committed by
GitHub
parent
1213301b50
commit
b091c994b5
@ -0,0 +1,110 @@
|
||||
// Copyright 2020 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"
|
||||
"strconv"
|
||||
|
||||
"code.gitea.io/gitea/modules/log"
|
||||
"code.gitea.io/gitea/modules/setting"
|
||||
|
||||
"xorm.io/xorm"
|
||||
)
|
||||
|
||||
func updateCodeCommentReplies(x *xorm.Engine) error {
|
||||
type Comment struct {
|
||||
ID int64 `xorm:"pk autoincr"`
|
||||
CommitSHA string `xorm:"VARCHAR(40)"`
|
||||
Patch string `xorm:"TEXT patch"`
|
||||
Invalidated bool
|
||||
|
||||
// Not extracted but used in the below query
|
||||
Type int `xorm:"INDEX"`
|
||||
Line int64 // - previous line / + proposed line
|
||||
TreePath string
|
||||
ReviewID int64 `xorm:"index"`
|
||||
}
|
||||
|
||||
if err := x.Sync2(new(Comment)); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
sqlSelect := `SELECT comment.id as id, first.commit_sha as commit_sha, first.patch as patch, first.invalidated as invalidated`
|
||||
sqlTail := ` FROM comment INNER JOIN (
|
||||
SELECT C.id, C.review_id, C.line, C.tree_path, C.patch, C.commit_sha, C.invalidated
|
||||
FROM comment AS C
|
||||
WHERE C.type = 21
|
||||
AND C.created_unix =
|
||||
(SELECT MIN(comment.created_unix)
|
||||
FROM comment
|
||||
WHERE comment.review_id = C.review_id
|
||||
AND comment.type = 21
|
||||
AND comment.line = C.line
|
||||
AND comment.tree_path = C.tree_path)
|
||||
) AS first
|
||||
ON comment.review_id = first.review_id
|
||||
AND comment.tree_path = first.tree_path AND comment.line = first.line
|
||||
WHERE comment.type = 21
|
||||
AND comment.id != first.id
|
||||
AND comment.commit_sha != first.commit_sha`
|
||||
|
||||
var sqlCmd string
|
||||
var start = 0
|
||||
var batchSize = 100
|
||||
sess := x.NewSession()
|
||||
defer sess.Close()
|
||||
for {
|
||||
if err := sess.Begin(); err != nil {
|
||||
return err
|
||||
}
|
||||
|
||||
if setting.Database.UseMSSQL {
|
||||
if _, err := sess.Exec(sqlSelect + " INTO #temp_comments" + sqlTail); err != nil {
|
||||
log.Error("unable to create temporary table")
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
var comments = make([]*Comment, 0, batchSize)
|
||||
|
||||
switch {
|
||||
case setting.Database.UseMySQL:
|
||||
sqlCmd = sqlSelect + sqlTail + " LIMIT " + strconv.Itoa(batchSize) + ", " + strconv.Itoa(start)
|
||||
case setting.Database.UsePostgreSQL:
|
||||
fallthrough
|
||||
case setting.Database.UseSQLite3:
|
||||
sqlCmd = sqlSelect + sqlTail + " LIMIT " + strconv.Itoa(batchSize) + " OFFSET " + strconv.Itoa(start)
|
||||
case setting.Database.UseMSSQL:
|
||||
sqlCmd = "SELECT TOP " + strconv.Itoa(batchSize) + " * FROM #temp_comments WHERE " +
|
||||
"(id NOT IN ( SELECT TOP " + strconv.Itoa(start) + " id FROM #temp_comments ORDER BY id )) ORDER BY id"
|
||||
default:
|
||||
return fmt.Errorf("Unsupported database type")
|
||||
}
|
||||
|
||||
if err := sess.SQL(sqlCmd).Find(&comments); err != nil {
|
||||
log.Error("failed to select: %v", err)
|
||||
return err
|
||||
}
|
||||
|
||||
for _, comment := range comments {
|
||||
if _, err := sess.Table("comment").ID(comment.ID).Cols("commit_sha", "patch", "invalidated").Update(comment); err != nil {
|
||||
log.Error("failed to update comment[%d]: %v %v", comment.ID, comment, err)
|
||||
return err
|
||||
}
|
||||
}
|
||||
|
||||
start += len(comments)
|
||||
|
||||
if err := sess.Commit(); err != nil {
|
||||
return err
|
||||
}
|
||||
if len(comments) < batchSize {
|
||||
break
|
||||
}
|
||||
}
|
||||
|
||||
return nil
|
||||
}
|
||||
Loading…
Reference in new issue