mirrors/mostlymatter
1
0
Форкнуть 0
Код Задачи Запросы на слияние Действия Пакеты Проекты Релизы Вики Активность

Migrate from gorp to sqlx in store/sqlstore/job_store.go (#18518)

Просмотр исходного кода
Этот коммит содержится в:
Shobhit Gupta
2021-10-19 06:59:24 -07:00
коммит произвёл GitHub
родитель 93f956e478
Коммит e12e0df447
3 изменённых файлов: 69 добавлений и 34 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

18
model/job.go
Просмотреть файл

@@ -58,15 +58,15 @@ var AllJobTypes = [...]string{
} }
type Job struct { type Job struct {
Id string `json:"id"` Id string `json:"id"`
Type string `json:"type"` Type string `json:"type"`
Priority int64 `json:"priority"` Priority int64 `json:"priority"`
CreateAt int64 `json:"create_at"` CreateAt int64 `json:"create_at"`
StartAt int64 `json:"start_at"` StartAt int64 `json:"start_at"`
LastActivityAt int64 `json:"last_activity_at"` LastActivityAt int64 `json:"last_activity_at"`
Status string `json:"status"` Status string `json:"status"`
Progress int64 `json:"progress"` Progress int64 `json:"progress"`
Data map[string]string `json:"data"` Data StringMap `json:"data"`
} }
func (j *Job) IsValid() *AppError { func (j *Job) IsValid() *AppError {

19
model/utils.go
Просмотреть файл

@@ -98,6 +98,25 @@ func (sa *StringArray) Scan(value interface{}) error {
return errors.New("received value is neither a byte slice nor string") return errors.New("received value is neither a byte slice nor string")
} }
// Scan converts database column value to StringMap
func (m *StringMap) Scan(value interface{}) error {
if value == nil {
return nil
}
buf, ok := value.([]byte)
if ok {
return json.Unmarshal(buf, m)
}
str, ok := value.(string)
if ok {
return json.Unmarshal([]byte(str), m)
}
return errors.New("received value is neither a byte slice nor string")
}
var translateFunc i18n.TranslateFunc var translateFunc i18n.TranslateFunc
var translateFuncOnce sync.Once var translateFuncOnce sync.Once

66
store/sqlstore/job_store.go
Просмотреть файл

@@ -11,7 +11,6 @@ import (
"time" "time"
sq "github.com/Masterminds/squirrel" sq "github.com/Masterminds/squirrel"
"github.com/mattermost/gorp"
"github.com/pkg/errors" "github.com/pkg/errors"
"github.com/mattermost/mattermost-server/v6/model" "github.com/mattermost/mattermost-server/v6/model"
@@ -46,9 +45,24 @@ func (jss SqlJobStore) createIndexesIfNotExists() {
} }
func (jss SqlJobStore) Save(job *model.Job) (*model.Job, error) { func (jss SqlJobStore) Save(job *model.Job) (*model.Job, error) {
if err := jss.GetMaster().Insert(job); err != nil { jsonData, err := json.Marshal(job.Data)
return nil, errors.Wrap(err, "failed to save Job") if err != nil {
return nil, errors.Wrap(err, "failed marshalling job data")
} }
query := jss.getQueryBuilder().
Insert("Jobs").
Columns("Id", "Type", "Priority", "CreateAt", "StartAt", "LastActivityAt", "Status", "Progress", "Data").
Values(job.Id, job.Type, job.Priority, job.CreateAt, job.StartAt, job.LastActivityAt, job.Status, job.Progress, string(jsonData))
queryString, args, err := query.ToSql()
if err != nil {
return nil, errors.Wrap(err, "failed to generate sqlquery")
}
if _, err = jss.GetMasterX().Exec(queryString, args...); err != nil {
return nil, errors.Wrap(err, "failed to save Preference")
}
return job, nil return job, nil
} }
@@ -67,7 +81,7 @@ func (jss SqlJobStore) UpdateOptimistically(job *model.Job, currentStatus string
if err != nil { if err != nil {
return false, errors.Wrap(err, "job_tosql") return false, errors.Wrap(err, "job_tosql")
} }
sqlResult, err := jss.GetMaster().Exec(query, args...) sqlResult, err := jss.GetMasterX().Exec(query, args...)
if err != nil { if err != nil {
return false, errors.Wrap(err, "failed to update Job") return false, errors.Wrap(err, "failed to update Job")
} }
@@ -92,9 +106,9 @@ func (jss SqlJobStore) UpdateStatus(id string, status string) (*model.Job, error
LastActivityAt: model.GetMillis(), LastActivityAt: model.GetMillis(),
} }
if _, err := jss.GetMaster().UpdateColumns(func(col *gorp.ColumnMap) bool { if _, err := jss.GetMasterX().NamedExec(`UPDATE Jobs
return col.ColumnName == "Status" || col.ColumnName == "LastActivityAt" SET Status=:Status, LastActivityAt=:LastActivityAt
}, job); err != nil { WHERE Id=:Id`, job); err != nil {
return nil, errors.Wrapf(err, "failed to update Job with id=%s", id) return nil, errors.Wrapf(err, "failed to update Job with id=%s", id)
} }
@@ -116,7 +130,7 @@ func (jss SqlJobStore) UpdateStatusOptimistically(id string, currentStatus strin
return false, errors.Wrap(err, "job_tosql") return false, errors.Wrap(err, "job_tosql")
} }
sqlResult, err := jss.GetMaster().Exec(query, args...) sqlResult, err := jss.GetMasterX().Exec(query, args...)
if err != nil { if err != nil {
return false, errors.Wrapf(err, "failed to update Job with id=%s", id) return false, errors.Wrapf(err, "failed to update Job with id=%s", id)
} }
@@ -139,14 +153,14 @@ func (jss SqlJobStore) Get(id string) (*model.Job, error) {
if err != nil { if err != nil {
return nil, errors.Wrap(err, "job_tosql") return nil, errors.Wrap(err, "job_tosql")
} }
var status *model.Job var status model.Job
if err = jss.GetReplica().SelectOne(&status, query, args...); err != nil { if err = jss.GetReplicaX().Get(&status, query, args...); err != nil {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return nil, store.NewErrNotFound("Job", id) return nil, store.NewErrNotFound("Job", id)
} }
return nil, errors.Wrapf(err, "failed to get Job with id=%s", id) return nil, errors.Wrapf(err, "failed to get Job with id=%s", id)
} }
return status, nil return &status, nil
} }
func (jss SqlJobStore) GetAllPage(offset int, limit int) ([]*model.Job, error) { func (jss SqlJobStore) GetAllPage(offset int, limit int) ([]*model.Job, error) {
@@ -160,8 +174,8 @@ func (jss SqlJobStore) GetAllPage(offset int, limit int) ([]*model.Job, error) {
return nil, errors.Wrap(err, "job_tosql") return nil, errors.Wrap(err, "job_tosql")
} }
var statuses []*model.Job statuses := []*model.Job{}
if _, err = jss.GetReplica().Select(&statuses, query, args...); err != nil { if err = jss.GetReplicaX().Select(&statuses, query, args...); err != nil {
return nil, errors.Wrap(err, "failed to find Jobs") return nil, errors.Wrap(err, "failed to find Jobs")
} }
return statuses, nil return statuses, nil
@@ -180,7 +194,7 @@ func (jss SqlJobStore) GetAllByTypesPage(jobTypes []string, offset int, limit in
} }
var jobs []*model.Job var jobs []*model.Job
if _, err = jss.GetReplica().Select(&jobs, query, args...); err != nil { if err = jss.GetReplicaX().Select(&jobs, query, args...); err != nil {
return nil, errors.Wrapf(err, "failed to find Jobs with types") return nil, errors.Wrapf(err, "failed to find Jobs with types")
} }
return jobs, nil return jobs, nil
@@ -195,8 +209,8 @@ func (jss SqlJobStore) GetAllByType(jobType string) ([]*model.Job, error) {
if err != nil { if err != nil {
return nil, errors.Wrap(err, "job_tosql") return nil, errors.Wrap(err, "job_tosql")
} }
var statuses []*model.Job statuses := []*model.Job{}
if _, err = jss.GetReplica().Select(&statuses, query, args...); err != nil { if err = jss.GetReplicaX().Select(&statuses, query, args...); err != nil {
return nil, errors.Wrapf(err, "failed to find Jobs with type=%s", jobType) return nil, errors.Wrapf(err, "failed to find Jobs with type=%s", jobType)
} }
return statuses, nil return statuses, nil
@@ -214,15 +228,15 @@ func (jss SqlJobStore) GetAllByTypePage(jobType string, offset int, limit int) (
return nil, errors.Wrap(err, "job_tosql") return nil, errors.Wrap(err, "job_tosql")
} }
var statuses []*model.Job statuses := []*model.Job{}
if _, err = jss.GetReplica().Select(&statuses, query, args...); err != nil { if err = jss.GetReplicaX().Select(&statuses, query, args...); err != nil {
return nil, errors.Wrapf(err, "failed to find Jobs with type=%s", jobType) return nil, errors.Wrapf(err, "failed to find Jobs with type=%s", jobType)
} }
return statuses, nil return statuses, nil
} }
func (jss SqlJobStore) GetAllByStatus(status string) ([]*model.Job, error) { func (jss SqlJobStore) GetAllByStatus(status string) ([]*model.Job, error) {
var statuses []*model.Job statuses := []*model.Job{}
query, args, err := jss.getQueryBuilder(). query, args, err := jss.getQueryBuilder().
Select("*"). Select("*").
From("Jobs"). From("Jobs").
@@ -232,7 +246,7 @@ func (jss SqlJobStore) GetAllByStatus(status string) ([]*model.Job, error) {
return nil, errors.Wrap(err, "job_tosql") return nil, errors.Wrap(err, "job_tosql")
} }
if _, err = jss.GetReplica().Select(&statuses, query, args...); err != nil { if err = jss.GetReplicaX().Select(&statuses, query, args...); err != nil {
return nil, errors.Wrapf(err, "failed to find Jobs with status=%s", status) return nil, errors.Wrapf(err, "failed to find Jobs with status=%s", status)
} }
return statuses, nil return statuses, nil
@@ -253,14 +267,14 @@ func (jss SqlJobStore) GetNewestJobByStatusesAndType(status []string, jobType st
return nil, errors.Wrap(err, "job_tosql") return nil, errors.Wrap(err, "job_tosql")
} }
var job *model.Job var job model.Job
if err = jss.GetReplica().SelectOne(&job, query, args...); err != nil { if err = jss.GetReplicaX().Get(&job, query, args...); err != nil {
if err == sql.ErrNoRows { if err == sql.ErrNoRows {
return nil, store.NewErrNotFound("Job", fmt.Sprintf("<status, type>=<%s, %s>", strings.Join(status, ","), jobType)) return nil, store.NewErrNotFound("Job", fmt.Sprintf("<status, type>=<%s, %s>", strings.Join(status, ","), jobType))
} }
return nil, errors.Wrapf(err, "failed to find Job with statuses=%s and type=%s", strings.Join(status, ","), jobType) return nil, errors.Wrapf(err, "failed to find Job with statuses=%s and type=%s", strings.Join(status, ","), jobType)
} }
return job, nil return &job, nil
} }
func (jss SqlJobStore) GetCountByStatusAndType(status string, jobType string) (int64, error) { func (jss SqlJobStore) GetCountByStatusAndType(status string, jobType string) (int64, error) {
@@ -271,7 +285,9 @@ func (jss SqlJobStore) GetCountByStatusAndType(status string, jobType string) (i
if err != nil { if err != nil {
return 0, errors.Wrap(err, "job_tosql") return 0, errors.Wrap(err, "job_tosql")
} }
count, err := jss.GetReplica().SelectInt(query, args...)
var count int64
err = jss.GetReplicaX().Get(&count, query, args...)
if err != nil { if err != nil {
return int64(0), errors.Wrapf(err, "failed to count Jobs with status=%s and type=%s", status, jobType) return int64(0), errors.Wrapf(err, "failed to count Jobs with status=%s and type=%s", status, jobType)
} }
@@ -286,7 +302,7 @@ func (jss SqlJobStore) Delete(id string) (string, error) {
return "", errors.Wrap(err, "job_tosql") return "", errors.Wrap(err, "job_tosql")
} }
if _, err = jss.GetMaster().Exec(query, args...); err != nil { if _, err = jss.GetMasterX().Exec(query, args...); err != nil {
return "", errors.Wrapf(err, "failed to delete Job with id=%s", id) return "", errors.Wrapf(err, "failed to delete Job with id=%s", id)
} }
return id, nil return id, nil