IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity

Removed the max/min family of functions (#28679)

Browse Source 
They are in-built in Go now
```release-note
NONE
```
This commit is contained in:
Agniva De Sarker 2024-10-10 22:14:21 +05:30 committed by GitHub
parent 4440ace6a9
commit 3db139f746
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
7 changed files with 5 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
server/channels/app/notification.go
View File

@ -1138,13 +1138,6 @@ func (a *App) getExplicitMentionsAndKeywords(c request.CTX, post *model.Post, ch
return mentions, keywords
}
func max(a, b int64) int64 {
if a < b {
return b
}
return a
}
func (a *App) userAllowsEmail(c request.CTX, user *model.User, channelMemberNotificationProps model.StringMap, post *model.Post) bool {
// if user is a bot account or remote, then we do not send email
if user.IsBot || user.IsRemote() {

4
server/channels/app/platform/service.go
View File

@ -303,7 +303,7 @@ func New(sc ServiceConfig, options ...Option) (*PlatformService, error) {
Name: "Status",
Size: model.StatusCacheSize,
Striped: true,
StripedBuckets: maxInt(runtime.NumCPU()-1, 1),
StripedBuckets: max(runtime.NumCPU()-1, 1),
DefaultExpiry: 30 * time.Minute,
})
if err != nil {
@ -314,7 +314,7 @@ func New(sc ServiceConfig, options ...Option) (*PlatformService, error) {
Name: "Session",
Size: model.SessionCacheSize,
Striped: true,
StripedBuckets: maxInt(runtime.NumCPU()-1, 1),
StripedBuckets: max(runtime.NumCPU()-1, 1),
})
if err != nil {
return nil, fmt.Errorf("could not create session cache: %w", err)

7
server/channels/app/platform/utils.go
View File

@ -14,13 +14,6 @@ func getKeyHash(key string) string {
return base64.StdEncoding.EncodeToString(hash.Sum(nil))
}
func maxInt(a, b int) int {
if a > b {
return a
}
return b
}
// allocateCacheTargets is used to fill target value types
// for getting items from cache.
func allocateCacheTargets[T any](l int) []any {

11
server/channels/store/localcachelayer/layer.go
View File

@ -152,7 +152,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
DefaultExpiry: RoleCacheSec * time.Second,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForRoles,
Striped: true,
StripedBuckets: maxInt(runtime.NumCPU()-1, 1),
StripedBuckets: max(runtime.NumCPU()-1, 1),
}); err != nil {
return
}
@ -336,7 +336,7 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
DefaultExpiry: UserProfileByIDSec * time.Second,
InvalidateClusterEvent: model.ClusterEventInvalidateCacheForProfileByIds,
Striped: true,
StripedBuckets: maxInt(runtime.NumCPU()-1, 1),
StripedBuckets: max(runtime.NumCPU()-1, 1),
}); err != nil {
return
}
@ -394,13 +394,6 @@ func NewLocalCacheLayer(baseStore store.Store, metrics einterfaces.MetricsInterf
return
}
func maxInt(a, b int) int {
if a > b {
return a
}
return b
}
func (s LocalCacheStore) Reaction() store.ReactionStore {
return s.reaction
}

2
server/channels/store/sqlstore/shared_channel_store.go
View File

@ -818,7 +818,7 @@ func (s SqlSharedChannelStore) UpdateUserLastSyncAt(userID string, channelID str
return err
}
updateAt := maxInt64(user.UpdateAt, user.LastPictureUpdate)
updateAt := max(user.UpdateAt, user.LastPictureUpdate)
query := s.getQueryBuilder().
Update("SharedChannelUsers AS scu").

7
server/channels/store/sqlstore/utils.go
View File

@ -192,13 +192,6 @@ func trimInput(input string) string {
return input
}
func maxInt64(a, b int64) int64 {
if a > b {
return a
}
return b
}
// Adds backtiks to the column name for MySQL, this is required if
// the column name is a reserved keyword.
//

7
server/public/pluginapi/cluster/mock_plugin_api_test.go
View File

@ -102,13 +102,6 @@ func (pluginAPI *mockPluginAPI) KVList(page, count int) ([]string, *model.AppErr
return keys[start:end], nil
}
func min(a, b int) int {
if a < b {
return a
}
return b
}
func (pluginAPI *mockPluginAPI) KVSetWithOptions(key string, value []byte, options model.PluginKVSetOptions) (bool, *model.AppError) {
pluginAPI.lock.Lock()
defer pluginAPI.lock.Unlock()