MM-60171: Using a generic function to allocate values (#28245)
We sprinkle a bit of generic magic to refactor a lot of duplicate code. To avoid exposing unnecessary code, I duplicated the function twice. But let me know if you have strong opinions about this. https://mattermost.atlassian.net/browse/MM-60171 ```release-note NONE ``` --------- Co-authored-by: Mattermost Build <build@mattermost.com>
Этот коммит содержится в:
коммит произвёл
GitHub
родитель
e0e0b57b8b
Коммит
9447cb9074
@@ -63,14 +63,9 @@ func (ps *PlatformService) ClearUserSessionCacheLocal(userID string) {
|
||||
return nil
|
||||
}
|
||||
|
||||
toPass := make([]any, 0, len(keys))
|
||||
for i := 0; i < len(keys); i++ {
|
||||
// This always needs to be a pointer to a value.
|
||||
// Otherwise the msp unmarshaler will fail to work.
|
||||
var session model.Session
|
||||
toPass = append(toPass, &session)
|
||||
}
|
||||
|
||||
// This always needs to be model.Session, not *model.Session.
|
||||
// Otherwise the msp unmarshaler will fail to work.
|
||||
toPass := allocateCacheTargets[model.Session](len(keys))
|
||||
errs := ps.sessionCache.GetMulti(keys, toPass)
|
||||
for i, err := range errs {
|
||||
if err != nil {
|
||||
|
||||
@@ -46,11 +46,7 @@ func (ps *PlatformService) GetAllStatuses() map[string]*model.Status {
|
||||
return nil
|
||||
}
|
||||
|
||||
toPass := make([]any, 0, len(keys))
|
||||
for i := 0; i < len(keys); i++ {
|
||||
var status *model.Status
|
||||
toPass = append(toPass, &status)
|
||||
}
|
||||
toPass := allocateCacheTargets[*model.Status](len(keys))
|
||||
errs := ps.statusCache.GetMulti(keys, toPass)
|
||||
for i, err := range errs {
|
||||
if err != nil {
|
||||
@@ -84,11 +80,7 @@ func (ps *PlatformService) GetStatusesByIds(userIDs []string) (map[string]any, *
|
||||
metrics := ps.Metrics()
|
||||
missingUserIds := []string{}
|
||||
|
||||
toPass := make([]any, 0, len(userIDs))
|
||||
for i := 0; i < len(userIDs); i++ {
|
||||
var status *model.Status
|
||||
toPass = append(toPass, &status)
|
||||
}
|
||||
toPass := allocateCacheTargets[*model.Status](len(userIDs))
|
||||
// First, we do a GetMulti to get all the status objects.
|
||||
errs := ps.statusCache.GetMulti(userIDs, toPass)
|
||||
for i, err := range errs {
|
||||
@@ -147,11 +139,7 @@ func (ps *PlatformService) GetUserStatusesByIds(userIDs []string) ([]*model.Stat
|
||||
metrics := ps.Metrics()
|
||||
|
||||
missingUserIds := []string{}
|
||||
toPass := make([]any, 0, len(userIDs))
|
||||
for i := 0; i < len(userIDs); i++ {
|
||||
var status *model.Status
|
||||
toPass = append(toPass, &status)
|
||||
}
|
||||
toPass := allocateCacheTargets[*model.Status](len(userIDs))
|
||||
// First, we do a GetMulti to get all the status objects.
|
||||
errs := ps.statusCache.GetMulti(userIDs, toPass)
|
||||
for i, err := range errs {
|
||||
|
||||
@@ -20,3 +20,13 @@ func maxInt(a, b int) int {
|
||||
}
|
||||
return b
|
||||
}
|
||||
|
||||
// allocateCacheTargets is used to fill target value types
|
||||
// for getting items from cache.
|
||||
func allocateCacheTargets[T any](l int) []any {
|
||||
toPass := make([]any, 0, l)
|
||||
for i := 0; i < l; i++ {
|
||||
toPass = append(toPass, new(T))
|
||||
}
|
||||
return toPass
|
||||
}
|
||||
|
||||
Ссылка в новой задаче
Block a user