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

MM-38624 Migrate ChannelMemberHistoryStore to sqlx (#18496)

Просмотр исходного кода 
Automatic Merge
Этот коммит содержится в:
Pijus Kamandulis
2021-10-06 20:50:02 +03:00
коммит произвёл GitHub
родитель ffe9d3adea
Коммит d639a08064
1 изменённых файлов: 15 добавлений и 13 удалений
Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

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

@@ -41,7 +41,10 @@ func (s SqlChannelMemberHistoryStore) LogJoinEvent(userId string, channelId stri
JoinTime: joinTime, JoinTime: joinTime,
} }
if err := s.GetMaster().Insert(channelMemberHistory); err != nil { if _, err := s.GetMasterX().NamedExec(`INSERT INTO ChannelMemberHistory
(UserId, ChannelId, JoinTime)
VALUES
(:UserId, :ChannelId, :JoinTime)`, channelMemberHistory); err != nil {
return errors.Wrapf(err, "LogJoinEvent userId=%s channelId=%s joinTime=%d", userId, channelId, joinTime) return errors.Wrapf(err, "LogJoinEvent userId=%s channelId=%s joinTime=%d", userId, channelId, joinTime)
} }
return nil return nil
@@ -59,7 +62,7 @@ func (s SqlChannelMemberHistoryStore) LogLeaveEvent(userId string, channelId str
if err != nil { if err != nil {
return errors.Wrap(err, "channel_member_history_to_sql") return errors.Wrap(err, "channel_member_history_to_sql")
} }
sqlResult, err := s.GetMaster().Exec(query, params...) sqlResult, err := s.GetMasterX().Exec(query, params...)
if err != nil { if err != nil {
return errors.Wrapf(err, "LogLeaveEvent userId=%s channelId=%s leaveTime=%d", userId, channelId, leaveTime) return errors.Wrapf(err, "LogLeaveEvent userId=%s channelId=%s leaveTime=%d", userId, channelId, leaveTime)
} }
@@ -105,7 +108,7 @@ func (s SqlChannelMemberHistoryStore) hasDataAtOrBefore(time int64) (bool, error
return false, errors.Wrap(err, "channel_member_history_to_sql") return false, errors.Wrap(err, "channel_member_history_to_sql")
} }
var result NullableCountResult var result NullableCountResult
if err := s.GetReplica().SelectOne(&result, query); err != nil { if err := s.GetReplicaX().Get(&result, query); err != nil {
return false, err return false, err
} else if result.Min.Valid { } else if result.Min.Valid {
return result.Min.Int64 <= time, nil return result.Min.Int64 <= time, nil
@@ -117,7 +120,7 @@ func (s SqlChannelMemberHistoryStore) hasDataAtOrBefore(time int64) (bool, error
func (s SqlChannelMemberHistoryStore) getFromChannelMemberHistoryTable(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistoryResult, error) { func (s SqlChannelMemberHistoryStore) getFromChannelMemberHistoryTable(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistoryResult, error) {
query, args, err := s.getQueryBuilder(). query, args, err := s.getQueryBuilder().
Select("cmh.*, u.Email, u.Username, Bots.UserId IS NOT NULL AS IsBot, u.DeleteAt AS UserDeleteAt"). Select(`cmh.*, u.Email AS "Email", u.Username, Bots.UserId IS NOT NULL AS IsBot, u.DeleteAt AS UserDeleteAt`).
From("ChannelMemberHistory cmh"). From("ChannelMemberHistory cmh").
Join("Users u ON cmh.UserId = u.Id"). Join("Users u ON cmh.UserId = u.Id").
LeftJoin("Bots ON Bots.UserId = u.Id"). LeftJoin("Bots ON Bots.UserId = u.Id").
@@ -133,8 +136,8 @@ func (s SqlChannelMemberHistoryStore) getFromChannelMemberHistoryTable(startTime
if err != nil { if err != nil {
return nil, errors.Wrap(err, "channel_member_history_to_sql") return nil, errors.Wrap(err, "channel_member_history_to_sql")
} }
var histories []*model.ChannelMemberHistoryResult histories := []*model.ChannelMemberHistoryResult{}
if _, err := s.GetReplica().Select(&histories, query, args...); err != nil { if err := s.GetReplicaX().Select(&histories, query, args...); err != nil {
return nil, err return nil, err
} }
@@ -143,7 +146,7 @@ func (s SqlChannelMemberHistoryStore) getFromChannelMemberHistoryTable(startTime
func (s SqlChannelMemberHistoryStore) getFromChannelMembersTable(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistoryResult, error) { func (s SqlChannelMemberHistoryStore) getFromChannelMembersTable(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistoryResult, error) {
query, args, err := s.getQueryBuilder(). query, args, err := s.getQueryBuilder().
Select("ch.ChannelId, ch.UserId, u.Email, u.Username, Bots.UserId IS NOT NULL AS IsBot, u.DeleteAt AS UserDeleteAt"). Select(`ch.ChannelId, ch.UserId, u.Email AS "Email", u.Username, Bots.UserId IS NOT NULL AS IsBot, u.DeleteAt AS UserDeleteAt`).
Distinct(). Distinct().
From("ChannelMembers ch"). From("ChannelMembers ch").
Join("Users u ON ch.UserId = u.id"). Join("Users u ON ch.UserId = u.id").
@@ -153,8 +156,8 @@ func (s SqlChannelMemberHistoryStore) getFromChannelMembersTable(startTime int64
return nil, errors.Wrap(err, "channel_member_history_to_sql") return nil, errors.Wrap(err, "channel_member_history_to_sql")
} }
var histories []*model.ChannelMemberHistoryResult histories := []*model.ChannelMemberHistoryResult{}
if _, err := s.GetReplica().Select(&histories, query, args...); err != nil { if err := s.GetReplicaX().Select(&histories, query, args...); err != nil {
return nil, err return nil, err
} }
// we have to fill in the join/leave times, because that data doesn't exist in the channel members table // we have to fill in the join/leave times, because that data doesn't exist in the channel members table
@@ -193,11 +196,10 @@ func (s SqlChannelMemberHistoryStore) DeleteOrphanedRows(limit int) (deleted int
SELECT ChannelId, UserId, JoinTime FROM ChannelMemberHistory SELECT ChannelId, UserId, JoinTime FROM ChannelMemberHistory
LEFT JOIN Channels ON ChannelMemberHistory.ChannelId = Channels.Id LEFT JOIN Channels ON ChannelMemberHistory.ChannelId = Channels.Id
WHERE Channels.Id IS NULL WHERE Channels.Id IS NULL
LIMIT :Limit LIMIT ?
) AS A ) AS A
)` )`
props := map[string]interface{}{"Limit": limit} result, err := s.GetMasterX().Exec(query, limit)
result, err := s.GetMaster().Exec(query, props)
if err != nil { if err != nil {
return return
} }
@@ -242,7 +244,7 @@ func (s SqlChannelMemberHistoryStore) PermanentDeleteBatch(endTime int64, limit
if err != nil { if err != nil {
return 0, errors.Wrap(err, "channel_member_history_to_sql") return 0, errors.Wrap(err, "channel_member_history_to_sql")
} }
sqlResult, err := s.GetMaster().Exec(query, args...) sqlResult, err := s.GetMasterX().Exec(query, args...)
if err != nil { if err != nil {
return 0, errors.Wrapf(err, "PermanentDeleteBatch endTime=%d limit=%d", endTime, limit) return 0, errors.Wrapf(err, "PermanentDeleteBatch endTime=%d limit=%d", endTime, limit)
} }