From 1b141678fe8985596b10f4e1523b4789da1ec16f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Wed, 12 Aug 2020 20:05:16 +0200 Subject: [PATCH] Adding initial retry layer version (#14954) * Adding initial retry layer version * Some simplification around the generated code * Generating retry layer again * Improving naming generation in store generated layers * Address PR review comments * Updating store layers * Addressing PR review comments * fixing lint errors * Updating store layers * Adding license header * Applying the retry layer to the reaction_store * Regenerating retry layer --- app/server.go | 3 +- store/layer_generators/main.go | 59 +- store/layer_generators/retry_layer.go.tmpl | 104 + store/opentracinglayer/opentracinglayer.go | 3884 ++++++------- store/retrylayer/retrylayer.go | 6062 ++++++++++++++++++++ store/retrylayer/retrylayer_test.go | 117 + store/sqlstore/channel_store.go | 35 +- store/sqlstore/supplier_reactions.go | 54 +- store/store.go | 32 - store/store_test.go | 56 - store/storetest/reaction_store.go | 3 + store/timerlayer/timerlayer.go | 2920 +++++----- 12 files changed, 9780 insertions(+), 3549 deletions(-) create mode 100644 store/layer_generators/retry_layer.go.tmpl create mode 100644 store/retrylayer/retrylayer.go create mode 100644 store/retrylayer/retrylayer_test.go delete mode 100644 store/store_test.go diff --git a/app/server.go b/app/server.go index 46ccb81853..5838c75bd2 100644 --- a/app/server.go +++ b/app/server.go @@ -46,6 +46,7 @@ import ( "github.com/mattermost/mattermost-server/v5/services/tracing" "github.com/mattermost/mattermost-server/v5/store" "github.com/mattermost/mattermost-server/v5/store/localcachelayer" + "github.com/mattermost/mattermost-server/v5/store/retrylayer" "github.com/mattermost/mattermost-server/v5/store/searchlayer" "github.com/mattermost/mattermost-server/v5/store/sqlstore" "github.com/mattermost/mattermost-server/v5/store/timerlayer" @@ -293,7 +294,7 @@ func NewServer(options ...Option) (*Server, error) { s.sqlStore = sqlstore.NewSqlSupplier(s.Config().SqlSettings, s.Metrics) searchStore := searchlayer.NewSearchLayer( localcachelayer.NewLocalCacheLayer( - s.sqlStore, + retrylayer.New(s.sqlStore), s.Metrics, s.Cluster, s.CacheProvider, diff --git a/store/layer_generators/main.go b/store/layer_generators/main.go index 6875b4fc91..944ace4d58 100644 --- a/store/layer_generators/main.go +++ b/store/layer_generators/main.go @@ -28,6 +28,10 @@ func isError(typeName string) bool { return strings.Contains(typeName, APP_ERROR_TYPE) || strings.Contains(typeName, ERROR_TYPE) } +func isAppError(typeName string) bool { + return strings.Contains(typeName, APP_ERROR_TYPE) +} + func main() { if err := buildTimerLayer(); err != nil { log.Fatal(err) @@ -35,6 +39,22 @@ func main() { if err := buildOpenTracingLayer(); err != nil { log.Fatal(err) } + if err := buildRetryLayer(); err != nil { + log.Fatal(err) + } +} + +func buildRetryLayer() error { + code, err := generateLayer("RetryLayer", "retry_layer.go.tmpl") + if err != nil { + return err + } + formatedCode, err := format.Source(code) + if err != nil { + return err + } + + return ioutil.WriteFile(path.Join("retrylayer/retrylayer.go"), formatedCode, 0644) } func buildTimerLayer() error { @@ -213,19 +233,33 @@ func generateLayer(name, templateFile string) ([]byte, error) { }, "genResultsVars": func(results []string) string { vars := []string{} - for i := range results { - vars = append(vars, fmt.Sprintf("resultVar%d", i)) + for i, typeName := range results { + if isError(typeName) { + vars = append(vars, "err") + } else if i == 0 { + vars = append(vars, "result") + } else { + vars = append(vars, fmt.Sprintf("resultVar%d", i)) + } } return strings.Join(vars, ", ") }, "errorToBoolean": func(results []string) string { - for i, typeName := range results { + for _, typeName := range results { if isError(typeName) { - return fmt.Sprintf("resultVar%d == nil", i) + return fmt.Sprintf("err == nil") } } return "true" }, + "isAppError": func(results []string) bool { + for _, typeName := range results { + if isAppError(typeName) { + return true + } + } + return false + }, "errorPresent": func(results []string) bool { for _, typeName := range results { if isError(typeName) { @@ -235,9 +269,9 @@ func generateLayer(name, templateFile string) ([]byte, error) { return false }, "errorVar": func(results []string) string { - for i, typeName := range results { + for _, typeName := range results { if isError(typeName) { - return fmt.Sprintf("resultVar%d", i) + return "err" } } return "" @@ -262,6 +296,19 @@ func generateLayer(name, templateFile string) ([]byte, error) { } return strings.Join(paramsWithType, ", ") }, + "joinParamsWithTypeOutsideStore": func(params []methodParam) string { + paramsWithType := []string{} + for _, param := range params { + if param.Type == "ChannelSearchOpts" || param.Type == "UserGetByIdsOpts" { + paramsWithType = append(paramsWithType, fmt.Sprintf("%s store.%s", param.Name, param.Type)) + } else if param.Type == "*UserGetByIdsOpts" { + paramsWithType = append(paramsWithType, fmt.Sprintf("%s *store.UserGetByIdsOpts", param.Name)) + } else { + paramsWithType = append(paramsWithType, fmt.Sprintf("%s %s", param.Name, param.Type)) + } + } + return strings.Join(paramsWithType, ", ") + }, } t := template.Must(template.New(templateFile).Funcs(myFuncs).ParseFiles("layer_generators/" + templateFile)) diff --git a/store/layer_generators/retry_layer.go.tmpl b/store/layer_generators/retry_layer.go.tmpl new file mode 100644 index 0000000000..a09c0afabf --- /dev/null +++ b/store/layer_generators/retry_layer.go.tmpl @@ -0,0 +1,104 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +// Code generated by "make store-layers" +// DO NOT EDIT + +package retrylayer + +import ( + "context" + + "github.com/lib/pq" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/pkg/errors" + "github.com/go-sql-driver/mysql" +) + +const mySQLDeadlockCode = uint16(1213) + +type {{.Name}} struct { + store.Store +{{range $index, $element := .SubStores}} {{$index}}Store store.{{$index}}Store +{{end}} +} + +{{range $index, $element := .SubStores}}func (s *{{$.Name}}) {{$index}}() store.{{$index}}Store { + return s.{{$index}}Store +} + +{{end}} + +{{range $index, $element := .SubStores}}type {{$.Name}}{{$index}}Store struct { + store.{{$index}}Store + Root *{{$.Name}} +} + +{{end}} + +func isRepeatableError(err error) bool { + var pqErr *pq.Error + var mysqlErr *mysql.MySQLError + switch { + case errors.As(errors.Cause(err), &pqErr): + if pqErr.Code == "40001" || pqErr.Code == "40P01" { + return true + } + case errors.As(errors.Cause(err), &mysqlErr): + if mysqlErr.Number == mySQLDeadlockCode { + return true + } + } + return false +} + +{{range $substoreName, $substore := .SubStores}} +{{range $index, $element := $substore.Methods}} +func (s *{{$.Name}}{{$substoreName}}Store) {{$index}}({{$element.Params | joinParamsWithTypeOutsideStore}}) {{$element.Results | joinResultsForSignature}} { + {{if $element.Results | len | eq 0}} + s.{{$substoreName}}Store.{{$index}}({{$element.Params | joinParams}}) + {{else}} + {{if $element.Results | errorPresent}} + {{if $element.Results | isAppError}} + return s.{{$substoreName}}Store.{{$index}}({{$element.Params | joinParams}}) + {{else}} + tries := 0 + for { + {{$element.Results | genResultsVars}} := s.{{$substoreName}}Store.{{$index}}({{$element.Params | joinParams}}) + if {{$element.Results | errorVar}} == nil { + return {{$element.Results | genResultsVars}} + } + if !isRepeatableError({{$element.Results | errorVar}}) { + return {{$element.Results | genResultsVars}} + } + tries++ + if tries >= 3 { + {{$element.Results | errorVar}} = errors.Wrap({{$element.Results | errorVar}}, "giving up after 3 consecutive repeatable transaction failures") + return {{$element.Results | genResultsVars}} + } + } + {{end}} + {{else}} + return s.{{$substoreName}}Store.{{$index}}({{$element.Params | joinParams}}) + {{end}} + {{end}} +} +{{end}} +{{end}} + +{{range $index, $element := .Methods}} +func (s *{{$.Name}}) {{$index}}({{$element.Params | joinParamsWithTypeOutsideStore}}) {{$element.Results | joinResultsForSignature}} { + {{if $element.Results | len | eq 0}}s.Store.{{$index}}({{$element.Params | joinParams}}) + {{else}}return s.Store.{{$index}}({{$element.Params | joinParams}}) + {{end}}} +{{end}} + +func New(childStore store.Store) *{{.Name}} { + newStore := {{.Name}}{ + Store: childStore, + } + {{range $substoreName, $substore := .SubStores}} + newStore.{{$substoreName}}Store = &{{$.Name}}{{$substoreName}}Store{{"{"}}{{$substoreName}}Store: childStore.{{$substoreName}}(), Root: &newStore}{{end}} + return &newStore +} diff --git a/store/opentracinglayer/opentracinglayer.go b/store/opentracinglayer/opentracinglayer.go index ec5ccf9c71..a269ef83d6 100644 --- a/store/opentracinglayer/opentracinglayer.go +++ b/store/opentracinglayer/opentracinglayer.go @@ -339,13 +339,13 @@ func (s *OpenTracingLayerAuditStore) Get(user_id string, offset int, limit int) }() defer span.Finish() - resultVar0, resultVar1 := s.AuditStore.Get(user_id, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.AuditStore.Get(user_id, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerAuditStore) PermanentDeleteByUser(userId string) error { @@ -357,13 +357,13 @@ func (s *OpenTracingLayerAuditStore) PermanentDeleteByUser(userId string) error }() defer span.Finish() - resultVar0 := s.AuditStore.PermanentDeleteByUser(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.AuditStore.PermanentDeleteByUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerAuditStore) Save(audit *model.Audit) error { @@ -375,13 +375,13 @@ func (s *OpenTracingLayerAuditStore) Save(audit *model.Audit) error { }() defer span.Finish() - resultVar0 := s.AuditStore.Save(audit) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.AuditStore.Save(audit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerBotStore) Get(userId string, includeDeleted bool) (*model.Bot, error) { @@ -393,13 +393,13 @@ func (s *OpenTracingLayerBotStore) Get(userId string, includeDeleted bool) (*mod }() defer span.Finish() - resultVar0, resultVar1 := s.BotStore.Get(userId, includeDeleted) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.BotStore.Get(userId, includeDeleted) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerBotStore) GetAll(options *model.BotGetOptions) ([]*model.Bot, error) { @@ -411,13 +411,13 @@ func (s *OpenTracingLayerBotStore) GetAll(options *model.BotGetOptions) ([]*mode }() defer span.Finish() - resultVar0, resultVar1 := s.BotStore.GetAll(options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.BotStore.GetAll(options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerBotStore) PermanentDelete(userId string) error { @@ -429,13 +429,13 @@ func (s *OpenTracingLayerBotStore) PermanentDelete(userId string) error { }() defer span.Finish() - resultVar0 := s.BotStore.PermanentDelete(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.BotStore.PermanentDelete(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerBotStore) Save(bot *model.Bot) (*model.Bot, error) { @@ -447,13 +447,13 @@ func (s *OpenTracingLayerBotStore) Save(bot *model.Bot) (*model.Bot, error) { }() defer span.Finish() - resultVar0, resultVar1 := s.BotStore.Save(bot) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.BotStore.Save(bot) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerBotStore) Update(bot *model.Bot) (*model.Bot, error) { @@ -465,13 +465,13 @@ func (s *OpenTracingLayerBotStore) Update(bot *model.Bot) (*model.Bot, error) { }() defer span.Finish() - resultVar0, resultVar1 := s.BotStore.Update(bot) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.BotStore.Update(bot) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) AnalyticsDeletedTypeCount(teamId string, channelType string) (int64, *model.AppError) { @@ -483,13 +483,13 @@ func (s *OpenTracingLayerChannelStore) AnalyticsDeletedTypeCount(teamId string, }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.AnalyticsDeletedTypeCount(teamId, channelType) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.AnalyticsDeletedTypeCount(teamId, channelType) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) AnalyticsTypeCount(teamId string, channelType string) (int64, *model.AppError) { @@ -501,13 +501,13 @@ func (s *OpenTracingLayerChannelStore) AnalyticsTypeCount(teamId string, channel }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.AnalyticsTypeCount(teamId, channelType) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.AnalyticsTypeCount(teamId, channelType) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) AutocompleteInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, *model.AppError) { @@ -519,13 +519,13 @@ func (s *OpenTracingLayerChannelStore) AutocompleteInTeam(teamId string, term st }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.AutocompleteInTeam(teamId, term, includeDeleted) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.AutocompleteInTeam(teamId, term, includeDeleted) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) AutocompleteInTeamForSearch(teamId string, userId string, term string, includeDeleted bool) (*model.ChannelList, *model.AppError) { @@ -537,13 +537,13 @@ func (s *OpenTracingLayerChannelStore) AutocompleteInTeamForSearch(teamId string }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.AutocompleteInTeamForSearch(teamId, userId, term, includeDeleted) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.AutocompleteInTeamForSearch(teamId, userId, term, includeDeleted) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) ClearAllCustomRoleAssignments() *model.AppError { @@ -555,13 +555,13 @@ func (s *OpenTracingLayerChannelStore) ClearAllCustomRoleAssignments() *model.Ap }() defer span.Finish() - resultVar0 := s.ChannelStore.ClearAllCustomRoleAssignments() - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.ClearAllCustomRoleAssignments() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) ClearCaches() { @@ -586,13 +586,13 @@ func (s *OpenTracingLayerChannelStore) ClearSidebarOnTeamLeave(userId string, te }() defer span.Finish() - resultVar0 := s.ChannelStore.ClearSidebarOnTeamLeave(userId, teamId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.ClearSidebarOnTeamLeave(userId, teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) CountPostsAfter(channelId string, timestamp int64, userId string) (int, *model.AppError) { @@ -604,13 +604,13 @@ func (s *OpenTracingLayerChannelStore) CountPostsAfter(channelId string, timesta }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.CountPostsAfter(channelId, timestamp, userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.CountPostsAfter(channelId, timestamp, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) CreateDirectChannel(userId *model.User, otherUserId *model.User) (*model.Channel, error) { @@ -622,13 +622,13 @@ func (s *OpenTracingLayerChannelStore) CreateDirectChannel(userId *model.User, o }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.CreateDirectChannel(userId, otherUserId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.CreateDirectChannel(userId, otherUserId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) CreateInitialSidebarCategories(userId string, teamId string) error { @@ -640,13 +640,13 @@ func (s *OpenTracingLayerChannelStore) CreateInitialSidebarCategories(userId str }() defer span.Finish() - resultVar0 := s.ChannelStore.CreateInitialSidebarCategories(userId, teamId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.CreateInitialSidebarCategories(userId, teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) CreateSidebarCategory(userId string, teamId string, newCategory *model.SidebarCategoryWithChannels) (*model.SidebarCategoryWithChannels, *model.AppError) { @@ -658,13 +658,13 @@ func (s *OpenTracingLayerChannelStore) CreateSidebarCategory(userId string, team }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.CreateSidebarCategory(userId, teamId, newCategory) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.CreateSidebarCategory(userId, teamId, newCategory) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) Delete(channelId string, time int64) error { @@ -676,13 +676,13 @@ func (s *OpenTracingLayerChannelStore) Delete(channelId string, time int64) erro }() defer span.Finish() - resultVar0 := s.ChannelStore.Delete(channelId, time) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.Delete(channelId, time) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) DeleteSidebarCategory(categoryId string) *model.AppError { @@ -694,13 +694,13 @@ func (s *OpenTracingLayerChannelStore) DeleteSidebarCategory(categoryId string) }() defer span.Finish() - resultVar0 := s.ChannelStore.DeleteSidebarCategory(categoryId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.DeleteSidebarCategory(categoryId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) DeleteSidebarChannelsByPreferences(preferences *model.Preferences) error { @@ -712,13 +712,13 @@ func (s *OpenTracingLayerChannelStore) DeleteSidebarChannelsByPreferences(prefer }() defer span.Finish() - resultVar0 := s.ChannelStore.DeleteSidebarChannelsByPreferences(preferences) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.DeleteSidebarChannelsByPreferences(preferences) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) Get(id string, allowFromCache bool) (*model.Channel, error) { @@ -730,13 +730,13 @@ func (s *OpenTracingLayerChannelStore) Get(id string, allowFromCache bool) (*mod }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.Get(id, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.Get(id, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetAll(teamId string) ([]*model.Channel, *model.AppError) { @@ -748,13 +748,13 @@ func (s *OpenTracingLayerChannelStore) GetAll(teamId string) ([]*model.Channel, }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetAll(teamId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetAll(teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetAllChannelMembersForUser(userId string, allowFromCache bool, includeDeleted bool) (map[string]string, *model.AppError) { @@ -766,13 +766,13 @@ func (s *OpenTracingLayerChannelStore) GetAllChannelMembersForUser(userId string }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetAllChannelMembersForUser(userId, allowFromCache, includeDeleted) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetAllChannelMembersForUser(userId, allowFromCache, includeDeleted) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetAllChannelMembersNotifyPropsForChannel(channelId string, allowFromCache bool) (map[string]model.StringMap, *model.AppError) { @@ -784,13 +784,13 @@ func (s *OpenTracingLayerChannelStore) GetAllChannelMembersNotifyPropsForChannel }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetAllChannelMembersNotifyPropsForChannel(channelId, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetAllChannelMembersNotifyPropsForChannel(channelId, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetAllChannels(page int, perPage int, opts store.ChannelSearchOpts) (*model.ChannelListWithTeamData, error) { @@ -802,13 +802,13 @@ func (s *OpenTracingLayerChannelStore) GetAllChannels(page int, perPage int, opt }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetAllChannels(page, perPage, opts) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetAllChannels(page, perPage, opts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetAllChannelsCount(opts store.ChannelSearchOpts) (int64, error) { @@ -820,13 +820,13 @@ func (s *OpenTracingLayerChannelStore) GetAllChannelsCount(opts store.ChannelSea }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetAllChannelsCount(opts) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetAllChannelsCount(opts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetAllChannelsForExportAfter(limit int, afterId string) ([]*model.ChannelForExport, *model.AppError) { @@ -838,13 +838,13 @@ func (s *OpenTracingLayerChannelStore) GetAllChannelsForExportAfter(limit int, a }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetAllChannelsForExportAfter(limit, afterId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetAllChannelsForExportAfter(limit, afterId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetAllDirectChannelsForExportAfter(limit int, afterId string) ([]*model.DirectChannelForExport, *model.AppError) { @@ -856,13 +856,13 @@ func (s *OpenTracingLayerChannelStore) GetAllDirectChannelsForExportAfter(limit }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetAllDirectChannelsForExportAfter(limit, afterId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetAllDirectChannelsForExportAfter(limit, afterId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetByName(team_id string, name string, allowFromCache bool) (*model.Channel, error) { @@ -874,13 +874,13 @@ func (s *OpenTracingLayerChannelStore) GetByName(team_id string, name string, al }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetByName(team_id, name, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetByName(team_id, name, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetByNameIncludeDeleted(team_id string, name string, allowFromCache bool) (*model.Channel, error) { @@ -892,13 +892,13 @@ func (s *OpenTracingLayerChannelStore) GetByNameIncludeDeleted(team_id string, n }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetByNameIncludeDeleted(team_id, name, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetByNameIncludeDeleted(team_id, name, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetByNames(team_id string, names []string, allowFromCache bool) ([]*model.Channel, error) { @@ -910,13 +910,13 @@ func (s *OpenTracingLayerChannelStore) GetByNames(team_id string, names []string }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetByNames(team_id, names, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetByNames(team_id, names, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetChannelCounts(teamId string, userId string) (*model.ChannelCounts, *model.AppError) { @@ -928,13 +928,13 @@ func (s *OpenTracingLayerChannelStore) GetChannelCounts(teamId string, userId st }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetChannelCounts(teamId, userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetChannelCounts(teamId, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetChannelMembersForExport(userId string, teamId string) ([]*model.ChannelMemberForExport, *model.AppError) { @@ -946,13 +946,13 @@ func (s *OpenTracingLayerChannelStore) GetChannelMembersForExport(userId string, }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetChannelMembersForExport(userId, teamId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetChannelMembersForExport(userId, teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetChannelMembersTimezones(channelId string) ([]model.StringMap, *model.AppError) { @@ -964,13 +964,13 @@ func (s *OpenTracingLayerChannelStore) GetChannelMembersTimezones(channelId stri }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetChannelMembersTimezones(channelId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetChannelMembersTimezones(channelId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetChannelUnread(channelId string, userId string) (*model.ChannelUnread, *model.AppError) { @@ -982,13 +982,13 @@ func (s *OpenTracingLayerChannelStore) GetChannelUnread(channelId string, userId }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetChannelUnread(channelId, userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetChannelUnread(channelId, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetChannels(teamId string, userId string, includeDeleted bool, lastDeleteAt int) (*model.ChannelList, error) { @@ -1000,13 +1000,13 @@ func (s *OpenTracingLayerChannelStore) GetChannels(teamId string, userId string, }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetChannels(teamId, userId, includeDeleted, lastDeleteAt) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetChannels(teamId, userId, includeDeleted, lastDeleteAt) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetChannelsBatchForIndexing(startTime int64, endTime int64, limit int) ([]*model.Channel, *model.AppError) { @@ -1018,13 +1018,13 @@ func (s *OpenTracingLayerChannelStore) GetChannelsBatchForIndexing(startTime int }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetChannelsBatchForIndexing(startTime, endTime, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetChannelsBatchForIndexing(startTime, endTime, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetChannelsByIds(channelIds []string, includeDeleted bool) ([]*model.Channel, *model.AppError) { @@ -1036,13 +1036,13 @@ func (s *OpenTracingLayerChannelStore) GetChannelsByIds(channelIds []string, inc }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetChannelsByIds(channelIds, includeDeleted) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetChannelsByIds(channelIds, includeDeleted) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetChannelsByScheme(schemeId string, offset int, limit int) (model.ChannelList, *model.AppError) { @@ -1054,13 +1054,13 @@ func (s *OpenTracingLayerChannelStore) GetChannelsByScheme(schemeId string, offs }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetChannelsByScheme(schemeId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetChannelsByScheme(schemeId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetDeleted(team_id string, offset int, limit int, userId string) (*model.ChannelList, error) { @@ -1072,13 +1072,13 @@ func (s *OpenTracingLayerChannelStore) GetDeleted(team_id string, offset int, li }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetDeleted(team_id, offset, limit, userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetDeleted(team_id, offset, limit, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetDeletedByName(team_id string, name string) (*model.Channel, error) { @@ -1090,13 +1090,13 @@ func (s *OpenTracingLayerChannelStore) GetDeletedByName(team_id string, name str }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetDeletedByName(team_id, name) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetDeletedByName(team_id, name) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetForPost(postId string) (*model.Channel, *model.AppError) { @@ -1108,13 +1108,13 @@ func (s *OpenTracingLayerChannelStore) GetForPost(postId string) (*model.Channel }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetForPost(postId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetForPost(postId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetFromMaster(id string) (*model.Channel, error) { @@ -1126,13 +1126,13 @@ func (s *OpenTracingLayerChannelStore) GetFromMaster(id string) (*model.Channel, }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetFromMaster(id) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetFromMaster(id) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetGuestCount(channelId string, allowFromCache bool) (int64, *model.AppError) { @@ -1144,13 +1144,13 @@ func (s *OpenTracingLayerChannelStore) GetGuestCount(channelId string, allowFrom }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetGuestCount(channelId, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetGuestCount(channelId, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetMember(channelId string, userId string) (*model.ChannelMember, *model.AppError) { @@ -1162,13 +1162,13 @@ func (s *OpenTracingLayerChannelStore) GetMember(channelId string, userId string }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetMember(channelId, userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetMember(channelId, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetMemberCount(channelId string, allowFromCache bool) (int64, *model.AppError) { @@ -1180,13 +1180,13 @@ func (s *OpenTracingLayerChannelStore) GetMemberCount(channelId string, allowFro }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetMemberCount(channelId, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetMemberCount(channelId, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetMemberCountFromCache(channelId string) int64 { @@ -1198,8 +1198,8 @@ func (s *OpenTracingLayerChannelStore) GetMemberCountFromCache(channelId string) }() defer span.Finish() - resultVar0 := s.ChannelStore.GetMemberCountFromCache(channelId) - return resultVar0 + result := s.ChannelStore.GetMemberCountFromCache(channelId) + return result } func (s *OpenTracingLayerChannelStore) GetMemberCountsByGroup(channelID string, includeTimezones bool) ([]*model.ChannelMemberCountByGroup, *model.AppError) { @@ -1211,13 +1211,13 @@ func (s *OpenTracingLayerChannelStore) GetMemberCountsByGroup(channelID string, }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetMemberCountsByGroup(channelID, includeTimezones) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetMemberCountsByGroup(channelID, includeTimezones) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetMemberForPost(postId string, userId string) (*model.ChannelMember, *model.AppError) { @@ -1229,13 +1229,13 @@ func (s *OpenTracingLayerChannelStore) GetMemberForPost(postId string, userId st }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetMemberForPost(postId, userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetMemberForPost(postId, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetMembers(channelId string, offset int, limit int) (*model.ChannelMembers, *model.AppError) { @@ -1247,13 +1247,13 @@ func (s *OpenTracingLayerChannelStore) GetMembers(channelId string, offset int, }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetMembers(channelId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetMembers(channelId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, *model.AppError) { @@ -1265,13 +1265,13 @@ func (s *OpenTracingLayerChannelStore) GetMembersByIds(channelId string, userIds }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetMembersByIds(channelId, userIds) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetMembersByIds(channelId, userIds) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetMembersForUser(teamId string, userId string) (*model.ChannelMembers, *model.AppError) { @@ -1283,13 +1283,13 @@ func (s *OpenTracingLayerChannelStore) GetMembersForUser(teamId string, userId s }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetMembersForUser(teamId, userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetMembersForUser(teamId, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetMembersForUserWithPagination(teamId string, userId string, page int, perPage int) (*model.ChannelMembers, *model.AppError) { @@ -1301,13 +1301,13 @@ func (s *OpenTracingLayerChannelStore) GetMembersForUserWithPagination(teamId st }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetMembersForUserWithPagination(teamId, userId, page, perPage) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetMembersForUserWithPagination(teamId, userId, page, perPage) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetMoreChannels(teamId string, userId string, offset int, limit int) (*model.ChannelList, error) { @@ -1319,13 +1319,13 @@ func (s *OpenTracingLayerChannelStore) GetMoreChannels(teamId string, userId str }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetMoreChannels(teamId, userId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetMoreChannels(teamId, userId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetPinnedPostCount(channelId string, allowFromCache bool) (int64, *model.AppError) { @@ -1337,13 +1337,13 @@ func (s *OpenTracingLayerChannelStore) GetPinnedPostCount(channelId string, allo }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetPinnedPostCount(channelId, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetPinnedPostCount(channelId, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetPinnedPosts(channelId string) (*model.PostList, *model.AppError) { @@ -1355,13 +1355,13 @@ func (s *OpenTracingLayerChannelStore) GetPinnedPosts(channelId string) (*model. }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetPinnedPosts(channelId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetPinnedPosts(channelId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetPrivateChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, *model.AppError) { @@ -1373,13 +1373,13 @@ func (s *OpenTracingLayerChannelStore) GetPrivateChannelsForTeam(teamId string, }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetPrivateChannelsForTeam(teamId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetPrivateChannelsForTeam(teamId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetPublicChannelsByIdsForTeam(teamId string, channelIds []string) (*model.ChannelList, *model.AppError) { @@ -1391,13 +1391,13 @@ func (s *OpenTracingLayerChannelStore) GetPublicChannelsByIdsForTeam(teamId stri }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetPublicChannelsByIdsForTeam(teamId, channelIds) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetPublicChannelsByIdsForTeam(teamId, channelIds) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetPublicChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, *model.AppError) { @@ -1409,13 +1409,13 @@ func (s *OpenTracingLayerChannelStore) GetPublicChannelsForTeam(teamId string, o }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetPublicChannelsForTeam(teamId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetPublicChannelsForTeam(teamId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetSidebarCategories(userId string, teamId string) (*model.OrderedSidebarCategories, *model.AppError) { @@ -1427,13 +1427,13 @@ func (s *OpenTracingLayerChannelStore) GetSidebarCategories(userId string, teamI }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetSidebarCategories(userId, teamId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetSidebarCategories(userId, teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetSidebarCategory(categoryId string) (*model.SidebarCategoryWithChannels, *model.AppError) { @@ -1445,13 +1445,13 @@ func (s *OpenTracingLayerChannelStore) GetSidebarCategory(categoryId string) (*m }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetSidebarCategory(categoryId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetSidebarCategory(categoryId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetSidebarCategoryOrder(userId string, teamId string) ([]string, *model.AppError) { @@ -1463,13 +1463,13 @@ func (s *OpenTracingLayerChannelStore) GetSidebarCategoryOrder(userId string, te }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetSidebarCategoryOrder(userId, teamId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetSidebarCategoryOrder(userId, teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GetTeamChannels(teamId string) (*model.ChannelList, *model.AppError) { @@ -1481,13 +1481,13 @@ func (s *OpenTracingLayerChannelStore) GetTeamChannels(teamId string) (*model.Ch }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GetTeamChannels(teamId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GetTeamChannels(teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) GroupSyncedChannelCount() (int64, *model.AppError) { @@ -1499,13 +1499,13 @@ func (s *OpenTracingLayerChannelStore) GroupSyncedChannelCount() (int64, *model. }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.GroupSyncedChannelCount() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.GroupSyncedChannelCount() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) IncrementMentionCount(channelId string, userId string) *model.AppError { @@ -1517,13 +1517,13 @@ func (s *OpenTracingLayerChannelStore) IncrementMentionCount(channelId string, u }() defer span.Finish() - resultVar0 := s.ChannelStore.IncrementMentionCount(channelId, userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.IncrementMentionCount(channelId, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) InvalidateAllChannelMembersForUser(userId string) { @@ -1626,8 +1626,8 @@ func (s *OpenTracingLayerChannelStore) IsUserInChannelUseCache(userId string, ch }() defer span.Finish() - resultVar0 := s.ChannelStore.IsUserInChannelUseCache(userId, channelId) - return resultVar0 + result := s.ChannelStore.IsUserInChannelUseCache(userId, channelId) + return result } func (s *OpenTracingLayerChannelStore) MigrateChannelMembers(fromChannelId string, fromUserId string) (map[string]string, *model.AppError) { @@ -1639,13 +1639,13 @@ func (s *OpenTracingLayerChannelStore) MigrateChannelMembers(fromChannelId strin }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.MigrateChannelMembers(fromChannelId, fromUserId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.MigrateChannelMembers(fromChannelId, fromUserId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) MigratePublicChannels() error { @@ -1657,13 +1657,13 @@ func (s *OpenTracingLayerChannelStore) MigratePublicChannels() error { }() defer span.Finish() - resultVar0 := s.ChannelStore.MigratePublicChannels() - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.MigratePublicChannels() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) PermanentDelete(channelId string) error { @@ -1675,13 +1675,13 @@ func (s *OpenTracingLayerChannelStore) PermanentDelete(channelId string) error { }() defer span.Finish() - resultVar0 := s.ChannelStore.PermanentDelete(channelId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.PermanentDelete(channelId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) PermanentDeleteByTeam(teamId string) error { @@ -1693,13 +1693,13 @@ func (s *OpenTracingLayerChannelStore) PermanentDeleteByTeam(teamId string) erro }() defer span.Finish() - resultVar0 := s.ChannelStore.PermanentDeleteByTeam(teamId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.PermanentDeleteByTeam(teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) PermanentDeleteMembersByChannel(channelId string) *model.AppError { @@ -1711,13 +1711,13 @@ func (s *OpenTracingLayerChannelStore) PermanentDeleteMembersByChannel(channelId }() defer span.Finish() - resultVar0 := s.ChannelStore.PermanentDeleteMembersByChannel(channelId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.PermanentDeleteMembersByChannel(channelId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) PermanentDeleteMembersByUser(userId string) *model.AppError { @@ -1729,13 +1729,13 @@ func (s *OpenTracingLayerChannelStore) PermanentDeleteMembersByUser(userId strin }() defer span.Finish() - resultVar0 := s.ChannelStore.PermanentDeleteMembersByUser(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.PermanentDeleteMembersByUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) RemoveAllDeactivatedMembers(channelId string) *model.AppError { @@ -1747,13 +1747,13 @@ func (s *OpenTracingLayerChannelStore) RemoveAllDeactivatedMembers(channelId str }() defer span.Finish() - resultVar0 := s.ChannelStore.RemoveAllDeactivatedMembers(channelId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.RemoveAllDeactivatedMembers(channelId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) RemoveMember(channelId string, userId string) *model.AppError { @@ -1765,13 +1765,13 @@ func (s *OpenTracingLayerChannelStore) RemoveMember(channelId string, userId str }() defer span.Finish() - resultVar0 := s.ChannelStore.RemoveMember(channelId, userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.RemoveMember(channelId, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) RemoveMembers(channelId string, userIds []string) *model.AppError { @@ -1783,13 +1783,13 @@ func (s *OpenTracingLayerChannelStore) RemoveMembers(channelId string, userIds [ }() defer span.Finish() - resultVar0 := s.ChannelStore.RemoveMembers(channelId, userIds) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.RemoveMembers(channelId, userIds) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) ResetAllChannelSchemes() *model.AppError { @@ -1801,13 +1801,13 @@ func (s *OpenTracingLayerChannelStore) ResetAllChannelSchemes() *model.AppError }() defer span.Finish() - resultVar0 := s.ChannelStore.ResetAllChannelSchemes() - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.ResetAllChannelSchemes() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) Restore(channelId string, time int64) error { @@ -1819,13 +1819,13 @@ func (s *OpenTracingLayerChannelStore) Restore(channelId string, time int64) err }() defer span.Finish() - resultVar0 := s.ChannelStore.Restore(channelId, time) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.Restore(channelId, time) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) Save(channel *model.Channel, maxChannelsPerTeam int64) (*model.Channel, error) { @@ -1837,13 +1837,13 @@ func (s *OpenTracingLayerChannelStore) Save(channel *model.Channel, maxChannelsP }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.Save(channel, maxChannelsPerTeam) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.Save(channel, maxChannelsPerTeam) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) SaveDirectChannel(channel *model.Channel, member1 *model.ChannelMember, member2 *model.ChannelMember) (*model.Channel, error) { @@ -1855,13 +1855,13 @@ func (s *OpenTracingLayerChannelStore) SaveDirectChannel(channel *model.Channel, }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.SaveDirectChannel(channel, member1, member2) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.SaveDirectChannel(channel, member1, member2) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) SaveMember(member *model.ChannelMember) (*model.ChannelMember, *model.AppError) { @@ -1873,13 +1873,13 @@ func (s *OpenTracingLayerChannelStore) SaveMember(member *model.ChannelMember) ( }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.SaveMember(member) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.SaveMember(member) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) SaveMultipleMembers(members []*model.ChannelMember) ([]*model.ChannelMember, *model.AppError) { @@ -1891,13 +1891,13 @@ func (s *OpenTracingLayerChannelStore) SaveMultipleMembers(members []*model.Chan }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.SaveMultipleMembers(members) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.SaveMultipleMembers(members) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) SearchAllChannels(term string, opts store.ChannelSearchOpts) (*model.ChannelListWithTeamData, int64, *model.AppError) { @@ -1909,13 +1909,13 @@ func (s *OpenTracingLayerChannelStore) SearchAllChannels(term string, opts store }() defer span.Finish() - resultVar0, resultVar1, resultVar2 := s.ChannelStore.SearchAllChannels(term, opts) - if resultVar2 != nil { - span.LogFields(spanlog.Error(resultVar2)) + result, resultVar1, err := s.ChannelStore.SearchAllChannels(term, opts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1, resultVar2 + return result, resultVar1, err } func (s *OpenTracingLayerChannelStore) SearchArchivedInTeam(teamId string, term string, userId string) (*model.ChannelList, *model.AppError) { @@ -1927,13 +1927,13 @@ func (s *OpenTracingLayerChannelStore) SearchArchivedInTeam(teamId string, term }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.SearchArchivedInTeam(teamId, term, userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.SearchArchivedInTeam(teamId, term, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) SearchForUserInTeam(userId string, teamId string, term string, includeDeleted bool) (*model.ChannelList, *model.AppError) { @@ -1945,13 +1945,13 @@ func (s *OpenTracingLayerChannelStore) SearchForUserInTeam(userId string, teamId }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.SearchForUserInTeam(userId, teamId, term, includeDeleted) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.SearchForUserInTeam(userId, teamId, term, includeDeleted) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) SearchGroupChannels(userId string, term string) (*model.ChannelList, *model.AppError) { @@ -1963,13 +1963,13 @@ func (s *OpenTracingLayerChannelStore) SearchGroupChannels(userId string, term s }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.SearchGroupChannels(userId, term) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.SearchGroupChannels(userId, term) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) SearchInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, *model.AppError) { @@ -1981,13 +1981,13 @@ func (s *OpenTracingLayerChannelStore) SearchInTeam(teamId string, term string, }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.SearchInTeam(teamId, term, includeDeleted) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.SearchInTeam(teamId, term, includeDeleted) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) SearchMore(userId string, teamId string, term string) (*model.ChannelList, *model.AppError) { @@ -1999,13 +1999,13 @@ func (s *OpenTracingLayerChannelStore) SearchMore(userId string, teamId string, }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.SearchMore(userId, teamId, term) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.SearchMore(userId, teamId, term) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) SetDeleteAt(channelId string, deleteAt int64, updateAt int64) error { @@ -2017,13 +2017,13 @@ func (s *OpenTracingLayerChannelStore) SetDeleteAt(channelId string, deleteAt in }() defer span.Finish() - resultVar0 := s.ChannelStore.SetDeleteAt(channelId, deleteAt, updateAt) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.SetDeleteAt(channelId, deleteAt, updateAt) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) Update(channel *model.Channel) (*model.Channel, error) { @@ -2035,13 +2035,13 @@ func (s *OpenTracingLayerChannelStore) Update(channel *model.Channel) (*model.Ch }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.Update(channel) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.Update(channel) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) UpdateLastViewedAt(channelIds []string, userId string) (map[string]int64, *model.AppError) { @@ -2053,13 +2053,13 @@ func (s *OpenTracingLayerChannelStore) UpdateLastViewedAt(channelIds []string, u }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.UpdateLastViewedAt(channelIds, userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.UpdateLastViewedAt(channelIds, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) UpdateLastViewedAtPost(unreadPost *model.Post, userID string, mentionCount int) (*model.ChannelUnreadAt, *model.AppError) { @@ -2071,13 +2071,13 @@ func (s *OpenTracingLayerChannelStore) UpdateLastViewedAtPost(unreadPost *model. }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.UpdateLastViewedAtPost(unreadPost, userID, mentionCount) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.UpdateLastViewedAtPost(unreadPost, userID, mentionCount) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) UpdateMember(member *model.ChannelMember) (*model.ChannelMember, *model.AppError) { @@ -2089,13 +2089,13 @@ func (s *OpenTracingLayerChannelStore) UpdateMember(member *model.ChannelMember) }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.UpdateMember(member) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.UpdateMember(member) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) UpdateMembersRole(channelID string, userIDs []string) *model.AppError { @@ -2107,13 +2107,13 @@ func (s *OpenTracingLayerChannelStore) UpdateMembersRole(channelID string, userI }() defer span.Finish() - resultVar0 := s.ChannelStore.UpdateMembersRole(channelID, userIDs) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.UpdateMembersRole(channelID, userIDs) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) UpdateMultipleMembers(members []*model.ChannelMember) ([]*model.ChannelMember, *model.AppError) { @@ -2125,13 +2125,13 @@ func (s *OpenTracingLayerChannelStore) UpdateMultipleMembers(members []*model.Ch }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.UpdateMultipleMembers(members) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.UpdateMultipleMembers(members) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) UpdateSidebarCategories(userId string, teamId string, categories []*model.SidebarCategoryWithChannels) ([]*model.SidebarCategoryWithChannels, *model.AppError) { @@ -2143,13 +2143,13 @@ func (s *OpenTracingLayerChannelStore) UpdateSidebarCategories(userId string, te }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.UpdateSidebarCategories(userId, teamId, categories) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.UpdateSidebarCategories(userId, teamId, categories) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelStore) UpdateSidebarCategoryOrder(userId string, teamId string, categoryOrder []string) *model.AppError { @@ -2161,13 +2161,13 @@ func (s *OpenTracingLayerChannelStore) UpdateSidebarCategoryOrder(userId string, }() defer span.Finish() - resultVar0 := s.ChannelStore.UpdateSidebarCategoryOrder(userId, teamId, categoryOrder) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.UpdateSidebarCategoryOrder(userId, teamId, categoryOrder) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) UpdateSidebarChannelCategoryOnMove(channel *model.Channel, newTeamId string) *model.AppError { @@ -2179,13 +2179,13 @@ func (s *OpenTracingLayerChannelStore) UpdateSidebarChannelCategoryOnMove(channe }() defer span.Finish() - resultVar0 := s.ChannelStore.UpdateSidebarChannelCategoryOnMove(channel, newTeamId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.UpdateSidebarChannelCategoryOnMove(channel, newTeamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) UpdateSidebarChannelsByPreferences(preferences *model.Preferences) error { @@ -2197,13 +2197,13 @@ func (s *OpenTracingLayerChannelStore) UpdateSidebarChannelsByPreferences(prefer }() defer span.Finish() - resultVar0 := s.ChannelStore.UpdateSidebarChannelsByPreferences(preferences) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelStore.UpdateSidebarChannelsByPreferences(preferences) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelStore) UserBelongsToChannels(userId string, channelIds []string) (bool, *model.AppError) { @@ -2215,13 +2215,13 @@ func (s *OpenTracingLayerChannelStore) UserBelongsToChannels(userId string, chan }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelStore.UserBelongsToChannels(userId, channelIds) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelStore.UserBelongsToChannels(userId, channelIds) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistoryResult, error) { @@ -2233,13 +2233,13 @@ func (s *OpenTracingLayerChannelMemberHistoryStore) GetUsersInChannelDuring(star }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelMemberHistoryStore.GetUsersInChannelDuring(startTime, endTime, channelId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelMemberHistoryStore.GetUsersInChannelDuring(startTime, endTime, channelId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerChannelMemberHistoryStore) LogJoinEvent(userId string, channelId string, joinTime int64) error { @@ -2251,13 +2251,13 @@ func (s *OpenTracingLayerChannelMemberHistoryStore) LogJoinEvent(userId string, }() defer span.Finish() - resultVar0 := s.ChannelMemberHistoryStore.LogJoinEvent(userId, channelId, joinTime) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelMemberHistoryStore.LogJoinEvent(userId, channelId, joinTime) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelMemberHistoryStore) LogLeaveEvent(userId string, channelId string, leaveTime int64) error { @@ -2269,13 +2269,13 @@ func (s *OpenTracingLayerChannelMemberHistoryStore) LogLeaveEvent(userId string, }() defer span.Finish() - resultVar0 := s.ChannelMemberHistoryStore.LogLeaveEvent(userId, channelId, leaveTime) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ChannelMemberHistoryStore.LogLeaveEvent(userId, channelId, leaveTime) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerChannelMemberHistoryStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, error) { @@ -2287,13 +2287,13 @@ func (s *OpenTracingLayerChannelMemberHistoryStore) PermanentDeleteBatch(endTime }() defer span.Finish() - resultVar0, resultVar1 := s.ChannelMemberHistoryStore.PermanentDeleteBatch(endTime, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ChannelMemberHistoryStore.PermanentDeleteBatch(endTime, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerClusterDiscoveryStore) Cleanup() error { @@ -2305,13 +2305,13 @@ func (s *OpenTracingLayerClusterDiscoveryStore) Cleanup() error { }() defer span.Finish() - resultVar0 := s.ClusterDiscoveryStore.Cleanup() - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ClusterDiscoveryStore.Cleanup() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerClusterDiscoveryStore) Delete(discovery *model.ClusterDiscovery) (bool, error) { @@ -2323,13 +2323,13 @@ func (s *OpenTracingLayerClusterDiscoveryStore) Delete(discovery *model.ClusterD }() defer span.Finish() - resultVar0, resultVar1 := s.ClusterDiscoveryStore.Delete(discovery) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ClusterDiscoveryStore.Delete(discovery) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerClusterDiscoveryStore) Exists(discovery *model.ClusterDiscovery) (bool, error) { @@ -2341,13 +2341,13 @@ func (s *OpenTracingLayerClusterDiscoveryStore) Exists(discovery *model.ClusterD }() defer span.Finish() - resultVar0, resultVar1 := s.ClusterDiscoveryStore.Exists(discovery) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ClusterDiscoveryStore.Exists(discovery) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerClusterDiscoveryStore) GetAll(discoveryType string, clusterName string) ([]*model.ClusterDiscovery, error) { @@ -2359,13 +2359,13 @@ func (s *OpenTracingLayerClusterDiscoveryStore) GetAll(discoveryType string, clu }() defer span.Finish() - resultVar0, resultVar1 := s.ClusterDiscoveryStore.GetAll(discoveryType, clusterName) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ClusterDiscoveryStore.GetAll(discoveryType, clusterName) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerClusterDiscoveryStore) Save(discovery *model.ClusterDiscovery) error { @@ -2377,13 +2377,13 @@ func (s *OpenTracingLayerClusterDiscoveryStore) Save(discovery *model.ClusterDis }() defer span.Finish() - resultVar0 := s.ClusterDiscoveryStore.Save(discovery) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ClusterDiscoveryStore.Save(discovery) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerClusterDiscoveryStore) SetLastPingAt(discovery *model.ClusterDiscovery) error { @@ -2395,13 +2395,13 @@ func (s *OpenTracingLayerClusterDiscoveryStore) SetLastPingAt(discovery *model.C }() defer span.Finish() - resultVar0 := s.ClusterDiscoveryStore.SetLastPingAt(discovery) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ClusterDiscoveryStore.SetLastPingAt(discovery) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerCommandStore) AnalyticsCommandCount(teamId string) (int64, error) { @@ -2413,13 +2413,13 @@ func (s *OpenTracingLayerCommandStore) AnalyticsCommandCount(teamId string) (int }() defer span.Finish() - resultVar0, resultVar1 := s.CommandStore.AnalyticsCommandCount(teamId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.CommandStore.AnalyticsCommandCount(teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerCommandStore) Delete(commandId string, time int64) error { @@ -2431,13 +2431,13 @@ func (s *OpenTracingLayerCommandStore) Delete(commandId string, time int64) erro }() defer span.Finish() - resultVar0 := s.CommandStore.Delete(commandId, time) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.CommandStore.Delete(commandId, time) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerCommandStore) Get(id string) (*model.Command, error) { @@ -2449,13 +2449,13 @@ func (s *OpenTracingLayerCommandStore) Get(id string) (*model.Command, error) { }() defer span.Finish() - resultVar0, resultVar1 := s.CommandStore.Get(id) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.CommandStore.Get(id) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerCommandStore) GetByTeam(teamId string) ([]*model.Command, error) { @@ -2467,13 +2467,13 @@ func (s *OpenTracingLayerCommandStore) GetByTeam(teamId string) ([]*model.Comman }() defer span.Finish() - resultVar0, resultVar1 := s.CommandStore.GetByTeam(teamId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.CommandStore.GetByTeam(teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerCommandStore) GetByTrigger(teamId string, trigger string) (*model.Command, error) { @@ -2485,13 +2485,13 @@ func (s *OpenTracingLayerCommandStore) GetByTrigger(teamId string, trigger strin }() defer span.Finish() - resultVar0, resultVar1 := s.CommandStore.GetByTrigger(teamId, trigger) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.CommandStore.GetByTrigger(teamId, trigger) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerCommandStore) PermanentDeleteByTeam(teamId string) error { @@ -2503,13 +2503,13 @@ func (s *OpenTracingLayerCommandStore) PermanentDeleteByTeam(teamId string) erro }() defer span.Finish() - resultVar0 := s.CommandStore.PermanentDeleteByTeam(teamId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.CommandStore.PermanentDeleteByTeam(teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerCommandStore) PermanentDeleteByUser(userId string) error { @@ -2521,13 +2521,13 @@ func (s *OpenTracingLayerCommandStore) PermanentDeleteByUser(userId string) erro }() defer span.Finish() - resultVar0 := s.CommandStore.PermanentDeleteByUser(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.CommandStore.PermanentDeleteByUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerCommandStore) Save(webhook *model.Command) (*model.Command, error) { @@ -2539,13 +2539,13 @@ func (s *OpenTracingLayerCommandStore) Save(webhook *model.Command) (*model.Comm }() defer span.Finish() - resultVar0, resultVar1 := s.CommandStore.Save(webhook) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.CommandStore.Save(webhook) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerCommandStore) Update(hook *model.Command) (*model.Command, error) { @@ -2557,13 +2557,13 @@ func (s *OpenTracingLayerCommandStore) Update(hook *model.Command) (*model.Comma }() defer span.Finish() - resultVar0, resultVar1 := s.CommandStore.Update(hook) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.CommandStore.Update(hook) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerCommandWebhookStore) Cleanup() { @@ -2588,13 +2588,13 @@ func (s *OpenTracingLayerCommandWebhookStore) Get(id string) (*model.CommandWebh }() defer span.Finish() - resultVar0, resultVar1 := s.CommandWebhookStore.Get(id) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.CommandWebhookStore.Get(id) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerCommandWebhookStore) Save(webhook *model.CommandWebhook) (*model.CommandWebhook, error) { @@ -2606,13 +2606,13 @@ func (s *OpenTracingLayerCommandWebhookStore) Save(webhook *model.CommandWebhook }() defer span.Finish() - resultVar0, resultVar1 := s.CommandWebhookStore.Save(webhook) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.CommandWebhookStore.Save(webhook) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerCommandWebhookStore) TryUse(id string, limit int) error { @@ -2624,13 +2624,13 @@ func (s *OpenTracingLayerCommandWebhookStore) TryUse(id string, limit int) error }() defer span.Finish() - resultVar0 := s.CommandWebhookStore.TryUse(id, limit) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.CommandWebhookStore.TryUse(id, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerComplianceStore) ComplianceExport(compliance *model.Compliance) ([]*model.CompliancePost, error) { @@ -2642,13 +2642,13 @@ func (s *OpenTracingLayerComplianceStore) ComplianceExport(compliance *model.Com }() defer span.Finish() - resultVar0, resultVar1 := s.ComplianceStore.ComplianceExport(compliance) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ComplianceStore.ComplianceExport(compliance) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerComplianceStore) Get(id string) (*model.Compliance, error) { @@ -2660,13 +2660,13 @@ func (s *OpenTracingLayerComplianceStore) Get(id string) (*model.Compliance, err }() defer span.Finish() - resultVar0, resultVar1 := s.ComplianceStore.Get(id) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ComplianceStore.Get(id) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerComplianceStore) GetAll(offset int, limit int) (model.Compliances, error) { @@ -2678,13 +2678,13 @@ func (s *OpenTracingLayerComplianceStore) GetAll(offset int, limit int) (model.C }() defer span.Finish() - resultVar0, resultVar1 := s.ComplianceStore.GetAll(offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ComplianceStore.GetAll(offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerComplianceStore) MessageExport(after int64, limit int) ([]*model.MessageExport, error) { @@ -2696,13 +2696,13 @@ func (s *OpenTracingLayerComplianceStore) MessageExport(after int64, limit int) }() defer span.Finish() - resultVar0, resultVar1 := s.ComplianceStore.MessageExport(after, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ComplianceStore.MessageExport(after, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerComplianceStore) Save(compliance *model.Compliance) (*model.Compliance, error) { @@ -2714,13 +2714,13 @@ func (s *OpenTracingLayerComplianceStore) Save(compliance *model.Compliance) (*m }() defer span.Finish() - resultVar0, resultVar1 := s.ComplianceStore.Save(compliance) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ComplianceStore.Save(compliance) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerComplianceStore) Update(compliance *model.Compliance) (*model.Compliance, error) { @@ -2732,13 +2732,13 @@ func (s *OpenTracingLayerComplianceStore) Update(compliance *model.Compliance) ( }() defer span.Finish() - resultVar0, resultVar1 := s.ComplianceStore.Update(compliance) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ComplianceStore.Update(compliance) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerEmojiStore) Delete(emoji *model.Emoji, time int64) error { @@ -2750,13 +2750,13 @@ func (s *OpenTracingLayerEmojiStore) Delete(emoji *model.Emoji, time int64) erro }() defer span.Finish() - resultVar0 := s.EmojiStore.Delete(emoji, time) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.EmojiStore.Delete(emoji, time) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerEmojiStore) Get(id string, allowFromCache bool) (*model.Emoji, error) { @@ -2768,13 +2768,13 @@ func (s *OpenTracingLayerEmojiStore) Get(id string, allowFromCache bool) (*model }() defer span.Finish() - resultVar0, resultVar1 := s.EmojiStore.Get(id, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.EmojiStore.Get(id, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerEmojiStore) GetByName(name string, allowFromCache bool) (*model.Emoji, error) { @@ -2786,13 +2786,13 @@ func (s *OpenTracingLayerEmojiStore) GetByName(name string, allowFromCache bool) }() defer span.Finish() - resultVar0, resultVar1 := s.EmojiStore.GetByName(name, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.EmojiStore.GetByName(name, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerEmojiStore) GetList(offset int, limit int, sort string) ([]*model.Emoji, error) { @@ -2804,13 +2804,13 @@ func (s *OpenTracingLayerEmojiStore) GetList(offset int, limit int, sort string) }() defer span.Finish() - resultVar0, resultVar1 := s.EmojiStore.GetList(offset, limit, sort) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.EmojiStore.GetList(offset, limit, sort) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerEmojiStore) GetMultipleByName(names []string) ([]*model.Emoji, error) { @@ -2822,13 +2822,13 @@ func (s *OpenTracingLayerEmojiStore) GetMultipleByName(names []string) ([]*model }() defer span.Finish() - resultVar0, resultVar1 := s.EmojiStore.GetMultipleByName(names) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.EmojiStore.GetMultipleByName(names) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerEmojiStore) Save(emoji *model.Emoji) (*model.Emoji, error) { @@ -2840,13 +2840,13 @@ func (s *OpenTracingLayerEmojiStore) Save(emoji *model.Emoji) (*model.Emoji, err }() defer span.Finish() - resultVar0, resultVar1 := s.EmojiStore.Save(emoji) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.EmojiStore.Save(emoji) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerEmojiStore) Search(name string, prefixOnly bool, limit int) ([]*model.Emoji, error) { @@ -2858,13 +2858,13 @@ func (s *OpenTracingLayerEmojiStore) Search(name string, prefixOnly bool, limit }() defer span.Finish() - resultVar0, resultVar1 := s.EmojiStore.Search(name, prefixOnly, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.EmojiStore.Search(name, prefixOnly, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerFileInfoStore) AttachToPost(fileId string, postId string, creatorId string) *model.AppError { @@ -2876,13 +2876,13 @@ func (s *OpenTracingLayerFileInfoStore) AttachToPost(fileId string, postId strin }() defer span.Finish() - resultVar0 := s.FileInfoStore.AttachToPost(fileId, postId, creatorId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.FileInfoStore.AttachToPost(fileId, postId, creatorId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerFileInfoStore) ClearCaches() { @@ -2907,13 +2907,13 @@ func (s *OpenTracingLayerFileInfoStore) DeleteForPost(postId string) (string, *m }() defer span.Finish() - resultVar0, resultVar1 := s.FileInfoStore.DeleteForPost(postId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.FileInfoStore.DeleteForPost(postId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerFileInfoStore) Get(id string) (*model.FileInfo, *model.AppError) { @@ -2925,13 +2925,13 @@ func (s *OpenTracingLayerFileInfoStore) Get(id string) (*model.FileInfo, *model. }() defer span.Finish() - resultVar0, resultVar1 := s.FileInfoStore.Get(id) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.FileInfoStore.Get(id) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerFileInfoStore) GetByPath(path string) (*model.FileInfo, *model.AppError) { @@ -2943,13 +2943,13 @@ func (s *OpenTracingLayerFileInfoStore) GetByPath(path string) (*model.FileInfo, }() defer span.Finish() - resultVar0, resultVar1 := s.FileInfoStore.GetByPath(path) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.FileInfoStore.GetByPath(path) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerFileInfoStore) GetForPost(postId string, readFromMaster bool, includeDeleted bool, allowFromCache bool) ([]*model.FileInfo, *model.AppError) { @@ -2961,13 +2961,13 @@ func (s *OpenTracingLayerFileInfoStore) GetForPost(postId string, readFromMaster }() defer span.Finish() - resultVar0, resultVar1 := s.FileInfoStore.GetForPost(postId, readFromMaster, includeDeleted, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.FileInfoStore.GetForPost(postId, readFromMaster, includeDeleted, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerFileInfoStore) GetForUser(userId string) ([]*model.FileInfo, *model.AppError) { @@ -2979,13 +2979,13 @@ func (s *OpenTracingLayerFileInfoStore) GetForUser(userId string) ([]*model.File }() defer span.Finish() - resultVar0, resultVar1 := s.FileInfoStore.GetForUser(userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.FileInfoStore.GetForUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerFileInfoStore) GetWithOptions(page int, perPage int, opt *model.GetFileInfosOptions) ([]*model.FileInfo, *model.AppError) { @@ -2997,13 +2997,13 @@ func (s *OpenTracingLayerFileInfoStore) GetWithOptions(page int, perPage int, op }() defer span.Finish() - resultVar0, resultVar1 := s.FileInfoStore.GetWithOptions(page, perPage, opt) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.FileInfoStore.GetWithOptions(page, perPage, opt) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerFileInfoStore) InvalidateFileInfosForPostCache(postId string, deleted bool) { @@ -3028,13 +3028,13 @@ func (s *OpenTracingLayerFileInfoStore) PermanentDelete(fileId string) *model.Ap }() defer span.Finish() - resultVar0 := s.FileInfoStore.PermanentDelete(fileId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.FileInfoStore.PermanentDelete(fileId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerFileInfoStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, *model.AppError) { @@ -3046,13 +3046,13 @@ func (s *OpenTracingLayerFileInfoStore) PermanentDeleteBatch(endTime int64, limi }() defer span.Finish() - resultVar0, resultVar1 := s.FileInfoStore.PermanentDeleteBatch(endTime, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.FileInfoStore.PermanentDeleteBatch(endTime, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerFileInfoStore) PermanentDeleteByUser(userId string) (int64, *model.AppError) { @@ -3064,13 +3064,13 @@ func (s *OpenTracingLayerFileInfoStore) PermanentDeleteByUser(userId string) (in }() defer span.Finish() - resultVar0, resultVar1 := s.FileInfoStore.PermanentDeleteByUser(userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.FileInfoStore.PermanentDeleteByUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerFileInfoStore) Save(info *model.FileInfo) (*model.FileInfo, *model.AppError) { @@ -3082,13 +3082,13 @@ func (s *OpenTracingLayerFileInfoStore) Save(info *model.FileInfo) (*model.FileI }() defer span.Finish() - resultVar0, resultVar1 := s.FileInfoStore.Save(info) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.FileInfoStore.Save(info) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) AdminRoleGroupsForSyncableMember(userID string, syncableID string, syncableType model.GroupSyncableType) ([]string, *model.AppError) { @@ -3100,13 +3100,13 @@ func (s *OpenTracingLayerGroupStore) AdminRoleGroupsForSyncableMember(userID str }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.AdminRoleGroupsForSyncableMember(userID, syncableID, syncableType) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.AdminRoleGroupsForSyncableMember(userID, syncableID, syncableType) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) ChannelMembersMinusGroupMembers(channelID string, groupIDs []string, page int, perPage int) ([]*model.UserWithGroups, *model.AppError) { @@ -3118,13 +3118,13 @@ func (s *OpenTracingLayerGroupStore) ChannelMembersMinusGroupMembers(channelID s }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.ChannelMembersMinusGroupMembers(channelID, groupIDs, page, perPage) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.ChannelMembersMinusGroupMembers(channelID, groupIDs, page, perPage) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) ChannelMembersToAdd(since int64, channelID *string) ([]*model.UserChannelIDPair, *model.AppError) { @@ -3136,13 +3136,13 @@ func (s *OpenTracingLayerGroupStore) ChannelMembersToAdd(since int64, channelID }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.ChannelMembersToAdd(since, channelID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.ChannelMembersToAdd(since, channelID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) ChannelMembersToRemove(channelID *string) ([]*model.ChannelMember, *model.AppError) { @@ -3154,13 +3154,13 @@ func (s *OpenTracingLayerGroupStore) ChannelMembersToRemove(channelID *string) ( }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.ChannelMembersToRemove(channelID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.ChannelMembersToRemove(channelID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) CountChannelMembersMinusGroupMembers(channelID string, groupIDs []string) (int64, *model.AppError) { @@ -3172,13 +3172,13 @@ func (s *OpenTracingLayerGroupStore) CountChannelMembersMinusGroupMembers(channe }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.CountChannelMembersMinusGroupMembers(channelID, groupIDs) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.CountChannelMembersMinusGroupMembers(channelID, groupIDs) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) CountGroupsByChannel(channelId string, opts model.GroupSearchOpts) (int64, *model.AppError) { @@ -3190,13 +3190,13 @@ func (s *OpenTracingLayerGroupStore) CountGroupsByChannel(channelId string, opts }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.CountGroupsByChannel(channelId, opts) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.CountGroupsByChannel(channelId, opts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) CountGroupsByTeam(teamId string, opts model.GroupSearchOpts) (int64, *model.AppError) { @@ -3208,13 +3208,13 @@ func (s *OpenTracingLayerGroupStore) CountGroupsByTeam(teamId string, opts model }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.CountGroupsByTeam(teamId, opts) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.CountGroupsByTeam(teamId, opts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) CountTeamMembersMinusGroupMembers(teamID string, groupIDs []string) (int64, *model.AppError) { @@ -3226,13 +3226,13 @@ func (s *OpenTracingLayerGroupStore) CountTeamMembersMinusGroupMembers(teamID st }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.CountTeamMembersMinusGroupMembers(teamID, groupIDs) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.CountTeamMembersMinusGroupMembers(teamID, groupIDs) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) Create(group *model.Group) (*model.Group, *model.AppError) { @@ -3244,13 +3244,13 @@ func (s *OpenTracingLayerGroupStore) Create(group *model.Group) (*model.Group, * }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.Create(group) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.Create(group) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) CreateGroupSyncable(groupSyncable *model.GroupSyncable) (*model.GroupSyncable, *model.AppError) { @@ -3262,13 +3262,13 @@ func (s *OpenTracingLayerGroupStore) CreateGroupSyncable(groupSyncable *model.Gr }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.CreateGroupSyncable(groupSyncable) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.CreateGroupSyncable(groupSyncable) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) Delete(groupID string) (*model.Group, *model.AppError) { @@ -3280,13 +3280,13 @@ func (s *OpenTracingLayerGroupStore) Delete(groupID string) (*model.Group, *mode }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.Delete(groupID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.Delete(groupID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) DeleteGroupSyncable(groupID string, syncableID string, syncableType model.GroupSyncableType) (*model.GroupSyncable, *model.AppError) { @@ -3298,13 +3298,13 @@ func (s *OpenTracingLayerGroupStore) DeleteGroupSyncable(groupID string, syncabl }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.DeleteGroupSyncable(groupID, syncableID, syncableType) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.DeleteGroupSyncable(groupID, syncableID, syncableType) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) DeleteMember(groupID string, userID string) (*model.GroupMember, *model.AppError) { @@ -3316,13 +3316,13 @@ func (s *OpenTracingLayerGroupStore) DeleteMember(groupID string, userID string) }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.DeleteMember(groupID, userID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.DeleteMember(groupID, userID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) DistinctGroupMemberCount() (int64, *model.AppError) { @@ -3334,13 +3334,13 @@ func (s *OpenTracingLayerGroupStore) DistinctGroupMemberCount() (int64, *model.A }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.DistinctGroupMemberCount() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.DistinctGroupMemberCount() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) Get(groupID string) (*model.Group, *model.AppError) { @@ -3352,13 +3352,13 @@ func (s *OpenTracingLayerGroupStore) Get(groupID string) (*model.Group, *model.A }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.Get(groupID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.Get(groupID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetAllBySource(groupSource model.GroupSource) ([]*model.Group, *model.AppError) { @@ -3370,13 +3370,13 @@ func (s *OpenTracingLayerGroupStore) GetAllBySource(groupSource model.GroupSourc }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetAllBySource(groupSource) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetAllBySource(groupSource) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetAllGroupSyncablesByGroupId(groupID string, syncableType model.GroupSyncableType) ([]*model.GroupSyncable, *model.AppError) { @@ -3388,13 +3388,13 @@ func (s *OpenTracingLayerGroupStore) GetAllGroupSyncablesByGroupId(groupID strin }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetAllGroupSyncablesByGroupId(groupID, syncableType) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetAllGroupSyncablesByGroupId(groupID, syncableType) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetByIDs(groupIDs []string) ([]*model.Group, *model.AppError) { @@ -3406,13 +3406,13 @@ func (s *OpenTracingLayerGroupStore) GetByIDs(groupIDs []string) ([]*model.Group }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetByIDs(groupIDs) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetByIDs(groupIDs) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetByName(name string, opts model.GroupSearchOpts) (*model.Group, *model.AppError) { @@ -3424,13 +3424,13 @@ func (s *OpenTracingLayerGroupStore) GetByName(name string, opts model.GroupSear }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetByName(name, opts) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetByName(name, opts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetByRemoteID(remoteID string, groupSource model.GroupSource) (*model.Group, *model.AppError) { @@ -3442,13 +3442,13 @@ func (s *OpenTracingLayerGroupStore) GetByRemoteID(remoteID string, groupSource }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetByRemoteID(remoteID, groupSource) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetByRemoteID(remoteID, groupSource) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetByUser(userId string) ([]*model.Group, *model.AppError) { @@ -3460,13 +3460,13 @@ func (s *OpenTracingLayerGroupStore) GetByUser(userId string) ([]*model.Group, * }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetByUser(userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetByUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetGroupSyncable(groupID string, syncableID string, syncableType model.GroupSyncableType) (*model.GroupSyncable, *model.AppError) { @@ -3478,13 +3478,13 @@ func (s *OpenTracingLayerGroupStore) GetGroupSyncable(groupID string, syncableID }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetGroupSyncable(groupID, syncableID, syncableType) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetGroupSyncable(groupID, syncableID, syncableType) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetGroups(page int, perPage int, opts model.GroupSearchOpts) ([]*model.Group, *model.AppError) { @@ -3496,13 +3496,13 @@ func (s *OpenTracingLayerGroupStore) GetGroups(page int, perPage int, opts model }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetGroups(page, perPage, opts) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetGroups(page, perPage, opts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetGroupsAssociatedToChannelsByTeam(teamId string, opts model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, *model.AppError) { @@ -3514,13 +3514,13 @@ func (s *OpenTracingLayerGroupStore) GetGroupsAssociatedToChannelsByTeam(teamId }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetGroupsAssociatedToChannelsByTeam(teamId, opts) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetGroupsAssociatedToChannelsByTeam(teamId, opts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetGroupsByChannel(channelId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, *model.AppError) { @@ -3532,13 +3532,13 @@ func (s *OpenTracingLayerGroupStore) GetGroupsByChannel(channelId string, opts m }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetGroupsByChannel(channelId, opts) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetGroupsByChannel(channelId, opts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetGroupsByTeam(teamId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, *model.AppError) { @@ -3550,13 +3550,13 @@ func (s *OpenTracingLayerGroupStore) GetGroupsByTeam(teamId string, opts model.G }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetGroupsByTeam(teamId, opts) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetGroupsByTeam(teamId, opts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetMemberCount(groupID string) (int64, *model.AppError) { @@ -3568,13 +3568,13 @@ func (s *OpenTracingLayerGroupStore) GetMemberCount(groupID string) (int64, *mod }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetMemberCount(groupID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetMemberCount(groupID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetMemberUsers(groupID string) ([]*model.User, *model.AppError) { @@ -3586,13 +3586,13 @@ func (s *OpenTracingLayerGroupStore) GetMemberUsers(groupID string) ([]*model.Us }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetMemberUsers(groupID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetMemberUsers(groupID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetMemberUsersInTeam(groupID string, teamID string) ([]*model.User, *model.AppError) { @@ -3604,13 +3604,13 @@ func (s *OpenTracingLayerGroupStore) GetMemberUsersInTeam(groupID string, teamID }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetMemberUsersInTeam(groupID, teamID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetMemberUsersInTeam(groupID, teamID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetMemberUsersNotInChannel(groupID string, channelID string) ([]*model.User, *model.AppError) { @@ -3622,13 +3622,13 @@ func (s *OpenTracingLayerGroupStore) GetMemberUsersNotInChannel(groupID string, }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetMemberUsersNotInChannel(groupID, channelID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetMemberUsersNotInChannel(groupID, channelID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GetMemberUsersPage(groupID string, page int, perPage int) ([]*model.User, *model.AppError) { @@ -3640,13 +3640,13 @@ func (s *OpenTracingLayerGroupStore) GetMemberUsersPage(groupID string, page int }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GetMemberUsersPage(groupID, page, perPage) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GetMemberUsersPage(groupID, page, perPage) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GroupChannelCount() (int64, *model.AppError) { @@ -3658,13 +3658,13 @@ func (s *OpenTracingLayerGroupStore) GroupChannelCount() (int64, *model.AppError }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GroupChannelCount() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GroupChannelCount() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GroupCount() (int64, *model.AppError) { @@ -3676,13 +3676,13 @@ func (s *OpenTracingLayerGroupStore) GroupCount() (int64, *model.AppError) { }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GroupCount() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GroupCount() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GroupCountWithAllowReference() (int64, *model.AppError) { @@ -3694,13 +3694,13 @@ func (s *OpenTracingLayerGroupStore) GroupCountWithAllowReference() (int64, *mod }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GroupCountWithAllowReference() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GroupCountWithAllowReference() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GroupMemberCount() (int64, *model.AppError) { @@ -3712,13 +3712,13 @@ func (s *OpenTracingLayerGroupStore) GroupMemberCount() (int64, *model.AppError) }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GroupMemberCount() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GroupMemberCount() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) GroupTeamCount() (int64, *model.AppError) { @@ -3730,13 +3730,13 @@ func (s *OpenTracingLayerGroupStore) GroupTeamCount() (int64, *model.AppError) { }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.GroupTeamCount() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.GroupTeamCount() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) PermanentDeleteMembersByUser(userId string) *model.AppError { @@ -3748,13 +3748,13 @@ func (s *OpenTracingLayerGroupStore) PermanentDeleteMembersByUser(userId string) }() defer span.Finish() - resultVar0 := s.GroupStore.PermanentDeleteMembersByUser(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.GroupStore.PermanentDeleteMembersByUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerGroupStore) PermittedSyncableAdmins(syncableID string, syncableType model.GroupSyncableType) ([]string, *model.AppError) { @@ -3766,13 +3766,13 @@ func (s *OpenTracingLayerGroupStore) PermittedSyncableAdmins(syncableID string, }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.PermittedSyncableAdmins(syncableID, syncableType) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.PermittedSyncableAdmins(syncableID, syncableType) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) TeamMembersMinusGroupMembers(teamID string, groupIDs []string, page int, perPage int) ([]*model.UserWithGroups, *model.AppError) { @@ -3784,13 +3784,13 @@ func (s *OpenTracingLayerGroupStore) TeamMembersMinusGroupMembers(teamID string, }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.TeamMembersMinusGroupMembers(teamID, groupIDs, page, perPage) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.TeamMembersMinusGroupMembers(teamID, groupIDs, page, perPage) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) TeamMembersToAdd(since int64, teamID *string) ([]*model.UserTeamIDPair, *model.AppError) { @@ -3802,13 +3802,13 @@ func (s *OpenTracingLayerGroupStore) TeamMembersToAdd(since int64, teamID *strin }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.TeamMembersToAdd(since, teamID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.TeamMembersToAdd(since, teamID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) TeamMembersToRemove(teamID *string) ([]*model.TeamMember, *model.AppError) { @@ -3820,13 +3820,13 @@ func (s *OpenTracingLayerGroupStore) TeamMembersToRemove(teamID *string) ([]*mod }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.TeamMembersToRemove(teamID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.TeamMembersToRemove(teamID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) Update(group *model.Group) (*model.Group, *model.AppError) { @@ -3838,13 +3838,13 @@ func (s *OpenTracingLayerGroupStore) Update(group *model.Group) (*model.Group, * }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.Update(group) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.Update(group) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) UpdateGroupSyncable(groupSyncable *model.GroupSyncable) (*model.GroupSyncable, *model.AppError) { @@ -3856,13 +3856,13 @@ func (s *OpenTracingLayerGroupStore) UpdateGroupSyncable(groupSyncable *model.Gr }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.UpdateGroupSyncable(groupSyncable) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.UpdateGroupSyncable(groupSyncable) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerGroupStore) UpsertMember(groupID string, userID string) (*model.GroupMember, *model.AppError) { @@ -3874,13 +3874,13 @@ func (s *OpenTracingLayerGroupStore) UpsertMember(groupID string, userID string) }() defer span.Finish() - resultVar0, resultVar1 := s.GroupStore.UpsertMember(groupID, userID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.GroupStore.UpsertMember(groupID, userID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerJobStore) Delete(id string) (string, *model.AppError) { @@ -3892,13 +3892,13 @@ func (s *OpenTracingLayerJobStore) Delete(id string) (string, *model.AppError) { }() defer span.Finish() - resultVar0, resultVar1 := s.JobStore.Delete(id) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.JobStore.Delete(id) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerJobStore) Get(id string) (*model.Job, *model.AppError) { @@ -3910,13 +3910,13 @@ func (s *OpenTracingLayerJobStore) Get(id string) (*model.Job, *model.AppError) }() defer span.Finish() - resultVar0, resultVar1 := s.JobStore.Get(id) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.JobStore.Get(id) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerJobStore) GetAllByStatus(status string) ([]*model.Job, *model.AppError) { @@ -3928,13 +3928,13 @@ func (s *OpenTracingLayerJobStore) GetAllByStatus(status string) ([]*model.Job, }() defer span.Finish() - resultVar0, resultVar1 := s.JobStore.GetAllByStatus(status) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.JobStore.GetAllByStatus(status) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerJobStore) GetAllByType(jobType string) ([]*model.Job, *model.AppError) { @@ -3946,13 +3946,13 @@ func (s *OpenTracingLayerJobStore) GetAllByType(jobType string) ([]*model.Job, * }() defer span.Finish() - resultVar0, resultVar1 := s.JobStore.GetAllByType(jobType) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.JobStore.GetAllByType(jobType) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerJobStore) GetAllByTypePage(jobType string, offset int, limit int) ([]*model.Job, *model.AppError) { @@ -3964,13 +3964,13 @@ func (s *OpenTracingLayerJobStore) GetAllByTypePage(jobType string, offset int, }() defer span.Finish() - resultVar0, resultVar1 := s.JobStore.GetAllByTypePage(jobType, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.JobStore.GetAllByTypePage(jobType, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerJobStore) GetAllPage(offset int, limit int) ([]*model.Job, *model.AppError) { @@ -3982,13 +3982,13 @@ func (s *OpenTracingLayerJobStore) GetAllPage(offset int, limit int) ([]*model.J }() defer span.Finish() - resultVar0, resultVar1 := s.JobStore.GetAllPage(offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.JobStore.GetAllPage(offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerJobStore) GetCountByStatusAndType(status string, jobType string) (int64, *model.AppError) { @@ -4000,13 +4000,13 @@ func (s *OpenTracingLayerJobStore) GetCountByStatusAndType(status string, jobTyp }() defer span.Finish() - resultVar0, resultVar1 := s.JobStore.GetCountByStatusAndType(status, jobType) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.JobStore.GetCountByStatusAndType(status, jobType) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerJobStore) GetNewestJobByStatusAndType(status string, jobType string) (*model.Job, *model.AppError) { @@ -4018,13 +4018,13 @@ func (s *OpenTracingLayerJobStore) GetNewestJobByStatusAndType(status string, jo }() defer span.Finish() - resultVar0, resultVar1 := s.JobStore.GetNewestJobByStatusAndType(status, jobType) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.JobStore.GetNewestJobByStatusAndType(status, jobType) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerJobStore) Save(job *model.Job) (*model.Job, *model.AppError) { @@ -4036,13 +4036,13 @@ func (s *OpenTracingLayerJobStore) Save(job *model.Job) (*model.Job, *model.AppE }() defer span.Finish() - resultVar0, resultVar1 := s.JobStore.Save(job) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.JobStore.Save(job) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerJobStore) UpdateOptimistically(job *model.Job, currentStatus string) (bool, *model.AppError) { @@ -4054,13 +4054,13 @@ func (s *OpenTracingLayerJobStore) UpdateOptimistically(job *model.Job, currentS }() defer span.Finish() - resultVar0, resultVar1 := s.JobStore.UpdateOptimistically(job, currentStatus) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.JobStore.UpdateOptimistically(job, currentStatus) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerJobStore) UpdateStatus(id string, status string) (*model.Job, *model.AppError) { @@ -4072,13 +4072,13 @@ func (s *OpenTracingLayerJobStore) UpdateStatus(id string, status string) (*mode }() defer span.Finish() - resultVar0, resultVar1 := s.JobStore.UpdateStatus(id, status) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.JobStore.UpdateStatus(id, status) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerJobStore) UpdateStatusOptimistically(id string, currentStatus string, newStatus string) (bool, *model.AppError) { @@ -4090,13 +4090,13 @@ func (s *OpenTracingLayerJobStore) UpdateStatusOptimistically(id string, current }() defer span.Finish() - resultVar0, resultVar1 := s.JobStore.UpdateStatusOptimistically(id, currentStatus, newStatus) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.JobStore.UpdateStatusOptimistically(id, currentStatus, newStatus) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerLicenseStore) Get(id string) (*model.LicenseRecord, error) { @@ -4108,13 +4108,13 @@ func (s *OpenTracingLayerLicenseStore) Get(id string) (*model.LicenseRecord, err }() defer span.Finish() - resultVar0, resultVar1 := s.LicenseStore.Get(id) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.LicenseStore.Get(id) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerLicenseStore) Save(license *model.LicenseRecord) (*model.LicenseRecord, error) { @@ -4126,13 +4126,13 @@ func (s *OpenTracingLayerLicenseStore) Save(license *model.LicenseRecord) (*mode }() defer span.Finish() - resultVar0, resultVar1 := s.LicenseStore.Save(license) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.LicenseStore.Save(license) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerLinkMetadataStore) Get(url string, timestamp int64) (*model.LinkMetadata, error) { @@ -4144,13 +4144,13 @@ func (s *OpenTracingLayerLinkMetadataStore) Get(url string, timestamp int64) (*m }() defer span.Finish() - resultVar0, resultVar1 := s.LinkMetadataStore.Get(url, timestamp) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.LinkMetadataStore.Get(url, timestamp) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerLinkMetadataStore) Save(linkMetadata *model.LinkMetadata) (*model.LinkMetadata, error) { @@ -4162,13 +4162,13 @@ func (s *OpenTracingLayerLinkMetadataStore) Save(linkMetadata *model.LinkMetadat }() defer span.Finish() - resultVar0, resultVar1 := s.LinkMetadataStore.Save(linkMetadata) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.LinkMetadataStore.Save(linkMetadata) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerOAuthStore) DeleteApp(id string) error { @@ -4180,13 +4180,13 @@ func (s *OpenTracingLayerOAuthStore) DeleteApp(id string) error { }() defer span.Finish() - resultVar0 := s.OAuthStore.DeleteApp(id) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.OAuthStore.DeleteApp(id) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerOAuthStore) GetAccessData(token string) (*model.AccessData, error) { @@ -4198,13 +4198,13 @@ func (s *OpenTracingLayerOAuthStore) GetAccessData(token string) (*model.AccessD }() defer span.Finish() - resultVar0, resultVar1 := s.OAuthStore.GetAccessData(token) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.OAuthStore.GetAccessData(token) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerOAuthStore) GetAccessDataByRefreshToken(token string) (*model.AccessData, error) { @@ -4216,13 +4216,13 @@ func (s *OpenTracingLayerOAuthStore) GetAccessDataByRefreshToken(token string) ( }() defer span.Finish() - resultVar0, resultVar1 := s.OAuthStore.GetAccessDataByRefreshToken(token) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.OAuthStore.GetAccessDataByRefreshToken(token) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerOAuthStore) GetAccessDataByUserForApp(userId string, clientId string) ([]*model.AccessData, error) { @@ -4234,13 +4234,13 @@ func (s *OpenTracingLayerOAuthStore) GetAccessDataByUserForApp(userId string, cl }() defer span.Finish() - resultVar0, resultVar1 := s.OAuthStore.GetAccessDataByUserForApp(userId, clientId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.OAuthStore.GetAccessDataByUserForApp(userId, clientId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerOAuthStore) GetApp(id string) (*model.OAuthApp, error) { @@ -4252,13 +4252,13 @@ func (s *OpenTracingLayerOAuthStore) GetApp(id string) (*model.OAuthApp, error) }() defer span.Finish() - resultVar0, resultVar1 := s.OAuthStore.GetApp(id) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.OAuthStore.GetApp(id) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerOAuthStore) GetAppByUser(userId string, offset int, limit int) ([]*model.OAuthApp, error) { @@ -4270,13 +4270,13 @@ func (s *OpenTracingLayerOAuthStore) GetAppByUser(userId string, offset int, lim }() defer span.Finish() - resultVar0, resultVar1 := s.OAuthStore.GetAppByUser(userId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.OAuthStore.GetAppByUser(userId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerOAuthStore) GetApps(offset int, limit int) ([]*model.OAuthApp, error) { @@ -4288,13 +4288,13 @@ func (s *OpenTracingLayerOAuthStore) GetApps(offset int, limit int) ([]*model.OA }() defer span.Finish() - resultVar0, resultVar1 := s.OAuthStore.GetApps(offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.OAuthStore.GetApps(offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerOAuthStore) GetAuthData(code string) (*model.AuthData, error) { @@ -4306,13 +4306,13 @@ func (s *OpenTracingLayerOAuthStore) GetAuthData(code string) (*model.AuthData, }() defer span.Finish() - resultVar0, resultVar1 := s.OAuthStore.GetAuthData(code) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.OAuthStore.GetAuthData(code) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerOAuthStore) GetAuthorizedApps(userId string, offset int, limit int) ([]*model.OAuthApp, error) { @@ -4324,13 +4324,13 @@ func (s *OpenTracingLayerOAuthStore) GetAuthorizedApps(userId string, offset int }() defer span.Finish() - resultVar0, resultVar1 := s.OAuthStore.GetAuthorizedApps(userId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.OAuthStore.GetAuthorizedApps(userId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerOAuthStore) GetPreviousAccessData(userId string, clientId string) (*model.AccessData, error) { @@ -4342,13 +4342,13 @@ func (s *OpenTracingLayerOAuthStore) GetPreviousAccessData(userId string, client }() defer span.Finish() - resultVar0, resultVar1 := s.OAuthStore.GetPreviousAccessData(userId, clientId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.OAuthStore.GetPreviousAccessData(userId, clientId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerOAuthStore) PermanentDeleteAuthDataByUser(userId string) error { @@ -4360,13 +4360,13 @@ func (s *OpenTracingLayerOAuthStore) PermanentDeleteAuthDataByUser(userId string }() defer span.Finish() - resultVar0 := s.OAuthStore.PermanentDeleteAuthDataByUser(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.OAuthStore.PermanentDeleteAuthDataByUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerOAuthStore) RemoveAccessData(token string) error { @@ -4378,13 +4378,13 @@ func (s *OpenTracingLayerOAuthStore) RemoveAccessData(token string) error { }() defer span.Finish() - resultVar0 := s.OAuthStore.RemoveAccessData(token) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.OAuthStore.RemoveAccessData(token) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerOAuthStore) RemoveAllAccessData() error { @@ -4396,13 +4396,13 @@ func (s *OpenTracingLayerOAuthStore) RemoveAllAccessData() error { }() defer span.Finish() - resultVar0 := s.OAuthStore.RemoveAllAccessData() - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.OAuthStore.RemoveAllAccessData() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerOAuthStore) RemoveAuthData(code string) error { @@ -4414,13 +4414,13 @@ func (s *OpenTracingLayerOAuthStore) RemoveAuthData(code string) error { }() defer span.Finish() - resultVar0 := s.OAuthStore.RemoveAuthData(code) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.OAuthStore.RemoveAuthData(code) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerOAuthStore) SaveAccessData(accessData *model.AccessData) (*model.AccessData, error) { @@ -4432,13 +4432,13 @@ func (s *OpenTracingLayerOAuthStore) SaveAccessData(accessData *model.AccessData }() defer span.Finish() - resultVar0, resultVar1 := s.OAuthStore.SaveAccessData(accessData) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.OAuthStore.SaveAccessData(accessData) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerOAuthStore) SaveApp(app *model.OAuthApp) (*model.OAuthApp, error) { @@ -4450,13 +4450,13 @@ func (s *OpenTracingLayerOAuthStore) SaveApp(app *model.OAuthApp) (*model.OAuthA }() defer span.Finish() - resultVar0, resultVar1 := s.OAuthStore.SaveApp(app) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.OAuthStore.SaveApp(app) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerOAuthStore) SaveAuthData(authData *model.AuthData) (*model.AuthData, error) { @@ -4468,13 +4468,13 @@ func (s *OpenTracingLayerOAuthStore) SaveAuthData(authData *model.AuthData) (*mo }() defer span.Finish() - resultVar0, resultVar1 := s.OAuthStore.SaveAuthData(authData) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.OAuthStore.SaveAuthData(authData) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerOAuthStore) UpdateAccessData(accessData *model.AccessData) (*model.AccessData, error) { @@ -4486,13 +4486,13 @@ func (s *OpenTracingLayerOAuthStore) UpdateAccessData(accessData *model.AccessDa }() defer span.Finish() - resultVar0, resultVar1 := s.OAuthStore.UpdateAccessData(accessData) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.OAuthStore.UpdateAccessData(accessData) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerOAuthStore) UpdateApp(app *model.OAuthApp) (*model.OAuthApp, error) { @@ -4504,13 +4504,13 @@ func (s *OpenTracingLayerOAuthStore) UpdateApp(app *model.OAuthApp) (*model.OAut }() defer span.Finish() - resultVar0, resultVar1 := s.OAuthStore.UpdateApp(app) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.OAuthStore.UpdateApp(app) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPluginStore) CompareAndDelete(keyVal *model.PluginKeyValue, oldValue []byte) (bool, *model.AppError) { @@ -4522,13 +4522,13 @@ func (s *OpenTracingLayerPluginStore) CompareAndDelete(keyVal *model.PluginKeyVa }() defer span.Finish() - resultVar0, resultVar1 := s.PluginStore.CompareAndDelete(keyVal, oldValue) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PluginStore.CompareAndDelete(keyVal, oldValue) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPluginStore) CompareAndSet(keyVal *model.PluginKeyValue, oldValue []byte) (bool, *model.AppError) { @@ -4540,13 +4540,13 @@ func (s *OpenTracingLayerPluginStore) CompareAndSet(keyVal *model.PluginKeyValue }() defer span.Finish() - resultVar0, resultVar1 := s.PluginStore.CompareAndSet(keyVal, oldValue) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PluginStore.CompareAndSet(keyVal, oldValue) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPluginStore) Delete(pluginId string, key string) *model.AppError { @@ -4558,13 +4558,13 @@ func (s *OpenTracingLayerPluginStore) Delete(pluginId string, key string) *model }() defer span.Finish() - resultVar0 := s.PluginStore.Delete(pluginId, key) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.PluginStore.Delete(pluginId, key) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerPluginStore) DeleteAllExpired() *model.AppError { @@ -4576,13 +4576,13 @@ func (s *OpenTracingLayerPluginStore) DeleteAllExpired() *model.AppError { }() defer span.Finish() - resultVar0 := s.PluginStore.DeleteAllExpired() - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.PluginStore.DeleteAllExpired() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerPluginStore) DeleteAllForPlugin(PluginId string) *model.AppError { @@ -4594,13 +4594,13 @@ func (s *OpenTracingLayerPluginStore) DeleteAllForPlugin(PluginId string) *model }() defer span.Finish() - resultVar0 := s.PluginStore.DeleteAllForPlugin(PluginId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.PluginStore.DeleteAllForPlugin(PluginId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerPluginStore) Get(pluginId string, key string) (*model.PluginKeyValue, *model.AppError) { @@ -4612,13 +4612,13 @@ func (s *OpenTracingLayerPluginStore) Get(pluginId string, key string) (*model.P }() defer span.Finish() - resultVar0, resultVar1 := s.PluginStore.Get(pluginId, key) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PluginStore.Get(pluginId, key) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPluginStore) List(pluginId string, page int, perPage int) ([]string, *model.AppError) { @@ -4630,13 +4630,13 @@ func (s *OpenTracingLayerPluginStore) List(pluginId string, page int, perPage in }() defer span.Finish() - resultVar0, resultVar1 := s.PluginStore.List(pluginId, page, perPage) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PluginStore.List(pluginId, page, perPage) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPluginStore) SaveOrUpdate(keyVal *model.PluginKeyValue) (*model.PluginKeyValue, *model.AppError) { @@ -4648,13 +4648,13 @@ func (s *OpenTracingLayerPluginStore) SaveOrUpdate(keyVal *model.PluginKeyValue) }() defer span.Finish() - resultVar0, resultVar1 := s.PluginStore.SaveOrUpdate(keyVal) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PluginStore.SaveOrUpdate(keyVal) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPluginStore) SetWithOptions(pluginId string, key string, value []byte, options model.PluginKVSetOptions) (bool, *model.AppError) { @@ -4666,13 +4666,13 @@ func (s *OpenTracingLayerPluginStore) SetWithOptions(pluginId string, key string }() defer span.Finish() - resultVar0, resultVar1 := s.PluginStore.SetWithOptions(pluginId, key, value, options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PluginStore.SetWithOptions(pluginId, key, value, options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) AnalyticsPostCount(teamId string, mustHaveFile bool, mustHaveHashtag bool) (int64, *model.AppError) { @@ -4684,13 +4684,13 @@ func (s *OpenTracingLayerPostStore) AnalyticsPostCount(teamId string, mustHaveFi }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.AnalyticsPostCount(teamId, mustHaveFile, mustHaveHashtag) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.AnalyticsPostCount(teamId, mustHaveFile, mustHaveHashtag) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) AnalyticsPostCountsByDay(options *model.AnalyticsPostCountsOptions) (model.AnalyticsRows, *model.AppError) { @@ -4702,13 +4702,13 @@ func (s *OpenTracingLayerPostStore) AnalyticsPostCountsByDay(options *model.Anal }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.AnalyticsPostCountsByDay(options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.AnalyticsPostCountsByDay(options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) AnalyticsUserCountsWithPostsByDay(teamId string) (model.AnalyticsRows, *model.AppError) { @@ -4720,13 +4720,13 @@ func (s *OpenTracingLayerPostStore) AnalyticsUserCountsWithPostsByDay(teamId str }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.AnalyticsUserCountsWithPostsByDay(teamId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.AnalyticsUserCountsWithPostsByDay(teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) ClearCaches() { @@ -4751,13 +4751,13 @@ func (s *OpenTracingLayerPostStore) Delete(postId string, time int64, deleteByID }() defer span.Finish() - resultVar0 := s.PostStore.Delete(postId, time, deleteByID) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.PostStore.Delete(postId, time, deleteByID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerPostStore) Get(id string, skipFetchThreads bool) (*model.PostList, error) { @@ -4769,13 +4769,13 @@ func (s *OpenTracingLayerPostStore) Get(id string, skipFetchThreads bool) (*mode }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.Get(id, skipFetchThreads) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.Get(id, skipFetchThreads) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetDirectPostParentsForExportAfter(limit int, afterId string) ([]*model.DirectPostForExport, *model.AppError) { @@ -4787,13 +4787,13 @@ func (s *OpenTracingLayerPostStore) GetDirectPostParentsForExportAfter(limit int }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetDirectPostParentsForExportAfter(limit, afterId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetDirectPostParentsForExportAfter(limit, afterId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetEtag(channelId string, allowFromCache bool) string { @@ -4805,8 +4805,8 @@ func (s *OpenTracingLayerPostStore) GetEtag(channelId string, allowFromCache boo }() defer span.Finish() - resultVar0 := s.PostStore.GetEtag(channelId, allowFromCache) - return resultVar0 + result := s.PostStore.GetEtag(channelId, allowFromCache) + return result } func (s *OpenTracingLayerPostStore) GetFlaggedPosts(userId string, offset int, limit int) (*model.PostList, *model.AppError) { @@ -4818,13 +4818,13 @@ func (s *OpenTracingLayerPostStore) GetFlaggedPosts(userId string, offset int, l }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetFlaggedPosts(userId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetFlaggedPosts(userId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetFlaggedPostsForChannel(userId string, channelId string, offset int, limit int) (*model.PostList, *model.AppError) { @@ -4836,13 +4836,13 @@ func (s *OpenTracingLayerPostStore) GetFlaggedPostsForChannel(userId string, cha }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetFlaggedPostsForChannel(userId, channelId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetFlaggedPostsForChannel(userId, channelId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetFlaggedPostsForTeam(userId string, teamId string, offset int, limit int) (*model.PostList, *model.AppError) { @@ -4862,13 +4862,13 @@ func (s *OpenTracingLayerPostStore) GetFlaggedPostsForTeam(userId string, teamId span.SetTag("limit", limit) defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetFlaggedPostsForTeam(userId, teamId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetFlaggedPostsForTeam(userId, teamId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetMaxPostSize() int { @@ -4880,8 +4880,8 @@ func (s *OpenTracingLayerPostStore) GetMaxPostSize() int { }() defer span.Finish() - resultVar0 := s.PostStore.GetMaxPostSize() - return resultVar0 + result := s.PostStore.GetMaxPostSize() + return result } func (s *OpenTracingLayerPostStore) GetOldest() (*model.Post, *model.AppError) { @@ -4893,13 +4893,13 @@ func (s *OpenTracingLayerPostStore) GetOldest() (*model.Post, *model.AppError) { }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetOldest() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetOldest() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetOldestEntityCreationTime() (int64, *model.AppError) { @@ -4911,13 +4911,13 @@ func (s *OpenTracingLayerPostStore) GetOldestEntityCreationTime() (int64, *model }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetOldestEntityCreationTime() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetOldestEntityCreationTime() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetParentsForExportAfter(limit int, afterId string) ([]*model.PostForExport, *model.AppError) { @@ -4929,13 +4929,13 @@ func (s *OpenTracingLayerPostStore) GetParentsForExportAfter(limit int, afterId }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetParentsForExportAfter(limit, afterId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetParentsForExportAfter(limit, afterId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetPostAfterTime(channelId string, time int64) (*model.Post, *model.AppError) { @@ -4947,13 +4947,13 @@ func (s *OpenTracingLayerPostStore) GetPostAfterTime(channelId string, time int6 }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetPostAfterTime(channelId, time) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetPostAfterTime(channelId, time) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetPostIdAfterTime(channelId string, time int64) (string, *model.AppError) { @@ -4965,13 +4965,13 @@ func (s *OpenTracingLayerPostStore) GetPostIdAfterTime(channelId string, time in }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetPostIdAfterTime(channelId, time) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetPostIdAfterTime(channelId, time) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetPostIdBeforeTime(channelId string, time int64) (string, *model.AppError) { @@ -4983,13 +4983,13 @@ func (s *OpenTracingLayerPostStore) GetPostIdBeforeTime(channelId string, time i }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetPostIdBeforeTime(channelId, time) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetPostIdBeforeTime(channelId, time) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetPosts(options model.GetPostsOptions, allowFromCache bool) (*model.PostList, *model.AppError) { @@ -5001,13 +5001,13 @@ func (s *OpenTracingLayerPostStore) GetPosts(options model.GetPostsOptions, allo }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetPosts(options, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetPosts(options, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetPostsAfter(options model.GetPostsOptions) (*model.PostList, *model.AppError) { @@ -5019,13 +5019,13 @@ func (s *OpenTracingLayerPostStore) GetPostsAfter(options model.GetPostsOptions) }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetPostsAfter(options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetPostsAfter(options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetPostsBatchForIndexing(startTime int64, endTime int64, limit int) ([]*model.PostForIndexing, *model.AppError) { @@ -5037,13 +5037,13 @@ func (s *OpenTracingLayerPostStore) GetPostsBatchForIndexing(startTime int64, en }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetPostsBatchForIndexing(startTime, endTime, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetPostsBatchForIndexing(startTime, endTime, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetPostsBefore(options model.GetPostsOptions) (*model.PostList, *model.AppError) { @@ -5055,13 +5055,13 @@ func (s *OpenTracingLayerPostStore) GetPostsBefore(options model.GetPostsOptions }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetPostsBefore(options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetPostsBefore(options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetPostsByIds(postIds []string) ([]*model.Post, *model.AppError) { @@ -5073,13 +5073,13 @@ func (s *OpenTracingLayerPostStore) GetPostsByIds(postIds []string) ([]*model.Po }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetPostsByIds(postIds) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetPostsByIds(postIds) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetPostsCreatedAt(channelId string, time int64) ([]*model.Post, *model.AppError) { @@ -5091,13 +5091,13 @@ func (s *OpenTracingLayerPostStore) GetPostsCreatedAt(channelId string, time int }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetPostsCreatedAt(channelId, time) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetPostsCreatedAt(channelId, time) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetPostsSince(options model.GetPostsSinceOptions, allowFromCache bool) (*model.PostList, *model.AppError) { @@ -5109,13 +5109,13 @@ func (s *OpenTracingLayerPostStore) GetPostsSince(options model.GetPostsSinceOpt }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetPostsSince(options, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetPostsSince(options, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetRepliesForExport(parentId string) ([]*model.ReplyForExport, *model.AppError) { @@ -5127,13 +5127,13 @@ func (s *OpenTracingLayerPostStore) GetRepliesForExport(parentId string) ([]*mod }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetRepliesForExport(parentId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetRepliesForExport(parentId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) GetSingle(id string) (*model.Post, error) { @@ -5145,13 +5145,13 @@ func (s *OpenTracingLayerPostStore) GetSingle(id string) (*model.Post, error) { }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.GetSingle(id) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.GetSingle(id) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) InvalidateLastPostTimeCache(channelId string) { @@ -5176,13 +5176,13 @@ func (s *OpenTracingLayerPostStore) Overwrite(post *model.Post) (*model.Post, *m }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.Overwrite(post) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.Overwrite(post) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) OverwriteMultiple(posts []*model.Post) ([]*model.Post, int, *model.AppError) { @@ -5194,13 +5194,13 @@ func (s *OpenTracingLayerPostStore) OverwriteMultiple(posts []*model.Post) ([]*m }() defer span.Finish() - resultVar0, resultVar1, resultVar2 := s.PostStore.OverwriteMultiple(posts) - if resultVar2 != nil { - span.LogFields(spanlog.Error(resultVar2)) + result, resultVar1, err := s.PostStore.OverwriteMultiple(posts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1, resultVar2 + return result, resultVar1, err } func (s *OpenTracingLayerPostStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, *model.AppError) { @@ -5212,13 +5212,13 @@ func (s *OpenTracingLayerPostStore) PermanentDeleteBatch(endTime int64, limit in }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.PermanentDeleteBatch(endTime, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.PermanentDeleteBatch(endTime, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) PermanentDeleteByChannel(channelId string) error { @@ -5230,13 +5230,13 @@ func (s *OpenTracingLayerPostStore) PermanentDeleteByChannel(channelId string) e }() defer span.Finish() - resultVar0 := s.PostStore.PermanentDeleteByChannel(channelId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.PostStore.PermanentDeleteByChannel(channelId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerPostStore) PermanentDeleteByUser(userId string) error { @@ -5248,13 +5248,13 @@ func (s *OpenTracingLayerPostStore) PermanentDeleteByUser(userId string) error { }() defer span.Finish() - resultVar0 := s.PostStore.PermanentDeleteByUser(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.PostStore.PermanentDeleteByUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerPostStore) Save(post *model.Post) (*model.Post, error) { @@ -5266,13 +5266,13 @@ func (s *OpenTracingLayerPostStore) Save(post *model.Post) (*model.Post, error) }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.Save(post) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.Save(post) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, error) { @@ -5284,13 +5284,13 @@ func (s *OpenTracingLayerPostStore) SaveMultiple(posts []*model.Post) ([]*model. }() defer span.Finish() - resultVar0, resultVar1, resultVar2 := s.PostStore.SaveMultiple(posts) - if resultVar2 != nil { - span.LogFields(spanlog.Error(resultVar2)) + result, resultVar1, err := s.PostStore.SaveMultiple(posts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1, resultVar2 + return result, resultVar1, err } func (s *OpenTracingLayerPostStore) Search(teamId string, userId string, params *model.SearchParams) (*model.PostList, *model.AppError) { @@ -5302,13 +5302,13 @@ func (s *OpenTracingLayerPostStore) Search(teamId string, userId string, params }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.Search(teamId, userId, params) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.Search(teamId, userId, params) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) SearchPostsInTeamForUser(paramsList []*model.SearchParams, userId string, teamId string, isOrSearch bool, includeDeletedChannels bool, page int, perPage int) (*model.PostSearchResults, *model.AppError) { @@ -5320,13 +5320,13 @@ func (s *OpenTracingLayerPostStore) SearchPostsInTeamForUser(paramsList []*model }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.SearchPostsInTeamForUser(paramsList, userId, teamId, isOrSearch, includeDeletedChannels, page, perPage) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.SearchPostsInTeamForUser(paramsList, userId, teamId, isOrSearch, includeDeletedChannels, page, perPage) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPostStore) Update(newPost *model.Post, oldPost *model.Post) (*model.Post, error) { @@ -5338,13 +5338,13 @@ func (s *OpenTracingLayerPostStore) Update(newPost *model.Post, oldPost *model.P }() defer span.Finish() - resultVar0, resultVar1 := s.PostStore.Update(newPost, oldPost) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PostStore.Update(newPost, oldPost) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPreferenceStore) CleanupFlagsBatch(limit int64) (int64, error) { @@ -5356,13 +5356,13 @@ func (s *OpenTracingLayerPreferenceStore) CleanupFlagsBatch(limit int64) (int64, }() defer span.Finish() - resultVar0, resultVar1 := s.PreferenceStore.CleanupFlagsBatch(limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PreferenceStore.CleanupFlagsBatch(limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPreferenceStore) Delete(userId string, category string, name string) error { @@ -5374,13 +5374,13 @@ func (s *OpenTracingLayerPreferenceStore) Delete(userId string, category string, }() defer span.Finish() - resultVar0 := s.PreferenceStore.Delete(userId, category, name) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.PreferenceStore.Delete(userId, category, name) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerPreferenceStore) DeleteCategory(userId string, category string) error { @@ -5392,13 +5392,13 @@ func (s *OpenTracingLayerPreferenceStore) DeleteCategory(userId string, category }() defer span.Finish() - resultVar0 := s.PreferenceStore.DeleteCategory(userId, category) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.PreferenceStore.DeleteCategory(userId, category) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerPreferenceStore) DeleteCategoryAndName(category string, name string) error { @@ -5410,13 +5410,13 @@ func (s *OpenTracingLayerPreferenceStore) DeleteCategoryAndName(category string, }() defer span.Finish() - resultVar0 := s.PreferenceStore.DeleteCategoryAndName(category, name) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.PreferenceStore.DeleteCategoryAndName(category, name) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerPreferenceStore) Get(userId string, category string, name string) (*model.Preference, error) { @@ -5428,13 +5428,13 @@ func (s *OpenTracingLayerPreferenceStore) Get(userId string, category string, na }() defer span.Finish() - resultVar0, resultVar1 := s.PreferenceStore.Get(userId, category, name) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PreferenceStore.Get(userId, category, name) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPreferenceStore) GetAll(userId string) (model.Preferences, error) { @@ -5446,13 +5446,13 @@ func (s *OpenTracingLayerPreferenceStore) GetAll(userId string) (model.Preferenc }() defer span.Finish() - resultVar0, resultVar1 := s.PreferenceStore.GetAll(userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PreferenceStore.GetAll(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPreferenceStore) GetCategory(userId string, category string) (model.Preferences, error) { @@ -5464,13 +5464,13 @@ func (s *OpenTracingLayerPreferenceStore) GetCategory(userId string, category st }() defer span.Finish() - resultVar0, resultVar1 := s.PreferenceStore.GetCategory(userId, category) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.PreferenceStore.GetCategory(userId, category) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerPreferenceStore) PermanentDeleteByUser(userId string) error { @@ -5482,13 +5482,13 @@ func (s *OpenTracingLayerPreferenceStore) PermanentDeleteByUser(userId string) e }() defer span.Finish() - resultVar0 := s.PreferenceStore.PermanentDeleteByUser(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.PreferenceStore.PermanentDeleteByUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerPreferenceStore) Save(preferences *model.Preferences) error { @@ -5500,13 +5500,13 @@ func (s *OpenTracingLayerPreferenceStore) Save(preferences *model.Preferences) e }() defer span.Finish() - resultVar0 := s.PreferenceStore.Save(preferences) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.PreferenceStore.Save(preferences) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerReactionStore) BulkGetForPosts(postIds []string) ([]*model.Reaction, error) { @@ -5518,13 +5518,13 @@ func (s *OpenTracingLayerReactionStore) BulkGetForPosts(postIds []string) ([]*mo }() defer span.Finish() - resultVar0, resultVar1 := s.ReactionStore.BulkGetForPosts(postIds) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ReactionStore.BulkGetForPosts(postIds) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerReactionStore) Delete(reaction *model.Reaction) (*model.Reaction, error) { @@ -5536,13 +5536,13 @@ func (s *OpenTracingLayerReactionStore) Delete(reaction *model.Reaction) (*model }() defer span.Finish() - resultVar0, resultVar1 := s.ReactionStore.Delete(reaction) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ReactionStore.Delete(reaction) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerReactionStore) DeleteAllWithEmojiName(emojiName string) error { @@ -5554,13 +5554,13 @@ func (s *OpenTracingLayerReactionStore) DeleteAllWithEmojiName(emojiName string) }() defer span.Finish() - resultVar0 := s.ReactionStore.DeleteAllWithEmojiName(emojiName) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.ReactionStore.DeleteAllWithEmojiName(emojiName) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerReactionStore) GetForPost(postId string, allowFromCache bool) ([]*model.Reaction, error) { @@ -5572,13 +5572,13 @@ func (s *OpenTracingLayerReactionStore) GetForPost(postId string, allowFromCache }() defer span.Finish() - resultVar0, resultVar1 := s.ReactionStore.GetForPost(postId, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ReactionStore.GetForPost(postId, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerReactionStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, error) { @@ -5590,13 +5590,13 @@ func (s *OpenTracingLayerReactionStore) PermanentDeleteBatch(endTime int64, limi }() defer span.Finish() - resultVar0, resultVar1 := s.ReactionStore.PermanentDeleteBatch(endTime, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ReactionStore.PermanentDeleteBatch(endTime, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerReactionStore) Save(reaction *model.Reaction) (*model.Reaction, error) { @@ -5608,13 +5608,13 @@ func (s *OpenTracingLayerReactionStore) Save(reaction *model.Reaction) (*model.R }() defer span.Finish() - resultVar0, resultVar1 := s.ReactionStore.Save(reaction) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.ReactionStore.Save(reaction) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerRoleStore) AllChannelSchemeRoles() ([]*model.Role, error) { @@ -5626,13 +5626,13 @@ func (s *OpenTracingLayerRoleStore) AllChannelSchemeRoles() ([]*model.Role, erro }() defer span.Finish() - resultVar0, resultVar1 := s.RoleStore.AllChannelSchemeRoles() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.RoleStore.AllChannelSchemeRoles() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerRoleStore) ChannelHigherScopedPermissions(roleNames []string) (map[string]*model.RolePermissions, error) { @@ -5644,13 +5644,13 @@ func (s *OpenTracingLayerRoleStore) ChannelHigherScopedPermissions(roleNames []s }() defer span.Finish() - resultVar0, resultVar1 := s.RoleStore.ChannelHigherScopedPermissions(roleNames) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.RoleStore.ChannelHigherScopedPermissions(roleNames) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerRoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*model.Role, error) { @@ -5662,13 +5662,13 @@ func (s *OpenTracingLayerRoleStore) ChannelRolesUnderTeamRole(roleName string) ( }() defer span.Finish() - resultVar0, resultVar1 := s.RoleStore.ChannelRolesUnderTeamRole(roleName) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.RoleStore.ChannelRolesUnderTeamRole(roleName) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerRoleStore) Delete(roleId string) (*model.Role, error) { @@ -5680,13 +5680,13 @@ func (s *OpenTracingLayerRoleStore) Delete(roleId string) (*model.Role, error) { }() defer span.Finish() - resultVar0, resultVar1 := s.RoleStore.Delete(roleId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.RoleStore.Delete(roleId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerRoleStore) Get(roleId string) (*model.Role, error) { @@ -5698,13 +5698,13 @@ func (s *OpenTracingLayerRoleStore) Get(roleId string) (*model.Role, error) { }() defer span.Finish() - resultVar0, resultVar1 := s.RoleStore.Get(roleId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.RoleStore.Get(roleId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerRoleStore) GetAll() ([]*model.Role, error) { @@ -5716,13 +5716,13 @@ func (s *OpenTracingLayerRoleStore) GetAll() ([]*model.Role, error) { }() defer span.Finish() - resultVar0, resultVar1 := s.RoleStore.GetAll() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.RoleStore.GetAll() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerRoleStore) GetByName(name string) (*model.Role, error) { @@ -5734,13 +5734,13 @@ func (s *OpenTracingLayerRoleStore) GetByName(name string) (*model.Role, error) }() defer span.Finish() - resultVar0, resultVar1 := s.RoleStore.GetByName(name) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.RoleStore.GetByName(name) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerRoleStore) GetByNames(names []string) ([]*model.Role, error) { @@ -5752,13 +5752,13 @@ func (s *OpenTracingLayerRoleStore) GetByNames(names []string) ([]*model.Role, e }() defer span.Finish() - resultVar0, resultVar1 := s.RoleStore.GetByNames(names) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.RoleStore.GetByNames(names) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerRoleStore) PermanentDeleteAll() error { @@ -5770,13 +5770,13 @@ func (s *OpenTracingLayerRoleStore) PermanentDeleteAll() error { }() defer span.Finish() - resultVar0 := s.RoleStore.PermanentDeleteAll() - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.RoleStore.PermanentDeleteAll() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerRoleStore) Save(role *model.Role) (*model.Role, error) { @@ -5788,13 +5788,13 @@ func (s *OpenTracingLayerRoleStore) Save(role *model.Role) (*model.Role, error) }() defer span.Finish() - resultVar0, resultVar1 := s.RoleStore.Save(role) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.RoleStore.Save(role) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSchemeStore) CountByScope(scope string) (int64, error) { @@ -5806,13 +5806,13 @@ func (s *OpenTracingLayerSchemeStore) CountByScope(scope string) (int64, error) }() defer span.Finish() - resultVar0, resultVar1 := s.SchemeStore.CountByScope(scope) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SchemeStore.CountByScope(scope) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSchemeStore) CountWithoutPermission(scope string, permissionID string, roleScope model.RoleScope, roleType model.RoleType) (int64, error) { @@ -5824,13 +5824,13 @@ func (s *OpenTracingLayerSchemeStore) CountWithoutPermission(scope string, permi }() defer span.Finish() - resultVar0, resultVar1 := s.SchemeStore.CountWithoutPermission(scope, permissionID, roleScope, roleType) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SchemeStore.CountWithoutPermission(scope, permissionID, roleScope, roleType) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSchemeStore) Delete(schemeId string) (*model.Scheme, error) { @@ -5842,13 +5842,13 @@ func (s *OpenTracingLayerSchemeStore) Delete(schemeId string) (*model.Scheme, er }() defer span.Finish() - resultVar0, resultVar1 := s.SchemeStore.Delete(schemeId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SchemeStore.Delete(schemeId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSchemeStore) Get(schemeId string) (*model.Scheme, error) { @@ -5860,13 +5860,13 @@ func (s *OpenTracingLayerSchemeStore) Get(schemeId string) (*model.Scheme, error }() defer span.Finish() - resultVar0, resultVar1 := s.SchemeStore.Get(schemeId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SchemeStore.Get(schemeId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSchemeStore) GetAllPage(scope string, offset int, limit int) ([]*model.Scheme, error) { @@ -5878,13 +5878,13 @@ func (s *OpenTracingLayerSchemeStore) GetAllPage(scope string, offset int, limit }() defer span.Finish() - resultVar0, resultVar1 := s.SchemeStore.GetAllPage(scope, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SchemeStore.GetAllPage(scope, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSchemeStore) GetByName(schemeName string) (*model.Scheme, error) { @@ -5896,13 +5896,13 @@ func (s *OpenTracingLayerSchemeStore) GetByName(schemeName string) (*model.Schem }() defer span.Finish() - resultVar0, resultVar1 := s.SchemeStore.GetByName(schemeName) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SchemeStore.GetByName(schemeName) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSchemeStore) PermanentDeleteAll() error { @@ -5914,13 +5914,13 @@ func (s *OpenTracingLayerSchemeStore) PermanentDeleteAll() error { }() defer span.Finish() - resultVar0 := s.SchemeStore.PermanentDeleteAll() - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.SchemeStore.PermanentDeleteAll() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerSchemeStore) Save(scheme *model.Scheme) (*model.Scheme, error) { @@ -5932,13 +5932,13 @@ func (s *OpenTracingLayerSchemeStore) Save(scheme *model.Scheme) (*model.Scheme, }() defer span.Finish() - resultVar0, resultVar1 := s.SchemeStore.Save(scheme) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SchemeStore.Save(scheme) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSessionStore) AnalyticsSessionCount() (int64, error) { @@ -5950,13 +5950,13 @@ func (s *OpenTracingLayerSessionStore) AnalyticsSessionCount() (int64, error) { }() defer span.Finish() - resultVar0, resultVar1 := s.SessionStore.AnalyticsSessionCount() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SessionStore.AnalyticsSessionCount() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSessionStore) Cleanup(expiryTime int64, batchSize int64) { @@ -5981,13 +5981,13 @@ func (s *OpenTracingLayerSessionStore) Get(sessionIdOrToken string) (*model.Sess }() defer span.Finish() - resultVar0, resultVar1 := s.SessionStore.Get(sessionIdOrToken) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SessionStore.Get(sessionIdOrToken) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSessionStore) GetSessions(userId string) ([]*model.Session, error) { @@ -5999,13 +5999,13 @@ func (s *OpenTracingLayerSessionStore) GetSessions(userId string) ([]*model.Sess }() defer span.Finish() - resultVar0, resultVar1 := s.SessionStore.GetSessions(userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SessionStore.GetSessions(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSessionStore) GetSessionsExpired(thresholdMillis int64, mobileOnly bool, unnotifiedOnly bool) ([]*model.Session, error) { @@ -6017,13 +6017,13 @@ func (s *OpenTracingLayerSessionStore) GetSessionsExpired(thresholdMillis int64, }() defer span.Finish() - resultVar0, resultVar1 := s.SessionStore.GetSessionsExpired(thresholdMillis, mobileOnly, unnotifiedOnly) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SessionStore.GetSessionsExpired(thresholdMillis, mobileOnly, unnotifiedOnly) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSessionStore) GetSessionsWithActiveDeviceIds(userId string) ([]*model.Session, error) { @@ -6035,13 +6035,13 @@ func (s *OpenTracingLayerSessionStore) GetSessionsWithActiveDeviceIds(userId str }() defer span.Finish() - resultVar0, resultVar1 := s.SessionStore.GetSessionsWithActiveDeviceIds(userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SessionStore.GetSessionsWithActiveDeviceIds(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSessionStore) PermanentDeleteSessionsByUser(teamId string) error { @@ -6053,13 +6053,13 @@ func (s *OpenTracingLayerSessionStore) PermanentDeleteSessionsByUser(teamId stri }() defer span.Finish() - resultVar0 := s.SessionStore.PermanentDeleteSessionsByUser(teamId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.SessionStore.PermanentDeleteSessionsByUser(teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerSessionStore) Remove(sessionIdOrToken string) error { @@ -6071,13 +6071,13 @@ func (s *OpenTracingLayerSessionStore) Remove(sessionIdOrToken string) error { }() defer span.Finish() - resultVar0 := s.SessionStore.Remove(sessionIdOrToken) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.SessionStore.Remove(sessionIdOrToken) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerSessionStore) RemoveAllSessions() error { @@ -6089,13 +6089,13 @@ func (s *OpenTracingLayerSessionStore) RemoveAllSessions() error { }() defer span.Finish() - resultVar0 := s.SessionStore.RemoveAllSessions() - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.SessionStore.RemoveAllSessions() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerSessionStore) Save(session *model.Session) (*model.Session, error) { @@ -6107,13 +6107,13 @@ func (s *OpenTracingLayerSessionStore) Save(session *model.Session) (*model.Sess }() defer span.Finish() - resultVar0, resultVar1 := s.SessionStore.Save(session) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SessionStore.Save(session) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSessionStore) UpdateDeviceId(id string, deviceId string, expiresAt int64) (string, error) { @@ -6125,13 +6125,13 @@ func (s *OpenTracingLayerSessionStore) UpdateDeviceId(id string, deviceId string }() defer span.Finish() - resultVar0, resultVar1 := s.SessionStore.UpdateDeviceId(id, deviceId, expiresAt) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SessionStore.UpdateDeviceId(id, deviceId, expiresAt) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSessionStore) UpdateExpiredNotify(sessionid string, notified bool) error { @@ -6143,13 +6143,13 @@ func (s *OpenTracingLayerSessionStore) UpdateExpiredNotify(sessionid string, not }() defer span.Finish() - resultVar0 := s.SessionStore.UpdateExpiredNotify(sessionid, notified) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.SessionStore.UpdateExpiredNotify(sessionid, notified) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerSessionStore) UpdateExpiresAt(sessionId string, time int64) error { @@ -6161,13 +6161,13 @@ func (s *OpenTracingLayerSessionStore) UpdateExpiresAt(sessionId string, time in }() defer span.Finish() - resultVar0 := s.SessionStore.UpdateExpiresAt(sessionId, time) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.SessionStore.UpdateExpiresAt(sessionId, time) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerSessionStore) UpdateLastActivityAt(sessionId string, time int64) error { @@ -6179,13 +6179,13 @@ func (s *OpenTracingLayerSessionStore) UpdateLastActivityAt(sessionId string, ti }() defer span.Finish() - resultVar0 := s.SessionStore.UpdateLastActivityAt(sessionId, time) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.SessionStore.UpdateLastActivityAt(sessionId, time) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerSessionStore) UpdateProps(session *model.Session) error { @@ -6197,13 +6197,13 @@ func (s *OpenTracingLayerSessionStore) UpdateProps(session *model.Session) error }() defer span.Finish() - resultVar0 := s.SessionStore.UpdateProps(session) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.SessionStore.UpdateProps(session) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerSessionStore) UpdateRoles(userId string, roles string) (string, error) { @@ -6215,13 +6215,13 @@ func (s *OpenTracingLayerSessionStore) UpdateRoles(userId string, roles string) }() defer span.Finish() - resultVar0, resultVar1 := s.SessionStore.UpdateRoles(userId, roles) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SessionStore.UpdateRoles(userId, roles) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerStatusStore) Get(userId string) (*model.Status, *model.AppError) { @@ -6233,13 +6233,13 @@ func (s *OpenTracingLayerStatusStore) Get(userId string) (*model.Status, *model. }() defer span.Finish() - resultVar0, resultVar1 := s.StatusStore.Get(userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.StatusStore.Get(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerStatusStore) GetByIds(userIds []string) ([]*model.Status, *model.AppError) { @@ -6251,13 +6251,13 @@ func (s *OpenTracingLayerStatusStore) GetByIds(userIds []string) ([]*model.Statu }() defer span.Finish() - resultVar0, resultVar1 := s.StatusStore.GetByIds(userIds) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.StatusStore.GetByIds(userIds) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerStatusStore) GetTotalActiveUsersCount() (int64, *model.AppError) { @@ -6269,13 +6269,13 @@ func (s *OpenTracingLayerStatusStore) GetTotalActiveUsersCount() (int64, *model. }() defer span.Finish() - resultVar0, resultVar1 := s.StatusStore.GetTotalActiveUsersCount() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.StatusStore.GetTotalActiveUsersCount() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerStatusStore) ResetAll() *model.AppError { @@ -6287,13 +6287,13 @@ func (s *OpenTracingLayerStatusStore) ResetAll() *model.AppError { }() defer span.Finish() - resultVar0 := s.StatusStore.ResetAll() - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.StatusStore.ResetAll() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerStatusStore) SaveOrUpdate(status *model.Status) *model.AppError { @@ -6305,13 +6305,13 @@ func (s *OpenTracingLayerStatusStore) SaveOrUpdate(status *model.Status) *model. }() defer span.Finish() - resultVar0 := s.StatusStore.SaveOrUpdate(status) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.StatusStore.SaveOrUpdate(status) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerStatusStore) UpdateLastActivityAt(userId string, lastActivityAt int64) *model.AppError { @@ -6323,13 +6323,13 @@ func (s *OpenTracingLayerStatusStore) UpdateLastActivityAt(userId string, lastAc }() defer span.Finish() - resultVar0 := s.StatusStore.UpdateLastActivityAt(userId, lastActivityAt) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.StatusStore.UpdateLastActivityAt(userId, lastActivityAt) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerSystemStore) Get() (model.StringMap, *model.AppError) { @@ -6341,13 +6341,13 @@ func (s *OpenTracingLayerSystemStore) Get() (model.StringMap, *model.AppError) { }() defer span.Finish() - resultVar0, resultVar1 := s.SystemStore.Get() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SystemStore.Get() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSystemStore) GetByName(name string) (*model.System, *model.AppError) { @@ -6359,13 +6359,13 @@ func (s *OpenTracingLayerSystemStore) GetByName(name string) (*model.System, *mo }() defer span.Finish() - resultVar0, resultVar1 := s.SystemStore.GetByName(name) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SystemStore.GetByName(name) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSystemStore) InsertIfExists(system *model.System) (*model.System, *model.AppError) { @@ -6377,13 +6377,13 @@ func (s *OpenTracingLayerSystemStore) InsertIfExists(system *model.System) (*mod }() defer span.Finish() - resultVar0, resultVar1 := s.SystemStore.InsertIfExists(system) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SystemStore.InsertIfExists(system) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSystemStore) PermanentDeleteByName(name string) (*model.System, *model.AppError) { @@ -6395,13 +6395,13 @@ func (s *OpenTracingLayerSystemStore) PermanentDeleteByName(name string) (*model }() defer span.Finish() - resultVar0, resultVar1 := s.SystemStore.PermanentDeleteByName(name) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.SystemStore.PermanentDeleteByName(name) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerSystemStore) Save(system *model.System) *model.AppError { @@ -6413,13 +6413,13 @@ func (s *OpenTracingLayerSystemStore) Save(system *model.System) *model.AppError }() defer span.Finish() - resultVar0 := s.SystemStore.Save(system) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.SystemStore.Save(system) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerSystemStore) SaveOrUpdate(system *model.System) *model.AppError { @@ -6431,13 +6431,13 @@ func (s *OpenTracingLayerSystemStore) SaveOrUpdate(system *model.System) *model. }() defer span.Finish() - resultVar0 := s.SystemStore.SaveOrUpdate(system) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.SystemStore.SaveOrUpdate(system) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerSystemStore) Update(system *model.System) *model.AppError { @@ -6449,13 +6449,13 @@ func (s *OpenTracingLayerSystemStore) Update(system *model.System) *model.AppErr }() defer span.Finish() - resultVar0 := s.SystemStore.Update(system) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.SystemStore.Update(system) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerTeamStore) AnalyticsGetTeamCountForScheme(schemeId string) (int64, *model.AppError) { @@ -6467,13 +6467,13 @@ func (s *OpenTracingLayerTeamStore) AnalyticsGetTeamCountForScheme(schemeId stri }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.AnalyticsGetTeamCountForScheme(schemeId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.AnalyticsGetTeamCountForScheme(schemeId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) AnalyticsPrivateTeamCount() (int64, *model.AppError) { @@ -6485,13 +6485,13 @@ func (s *OpenTracingLayerTeamStore) AnalyticsPrivateTeamCount() (int64, *model.A }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.AnalyticsPrivateTeamCount() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.AnalyticsPrivateTeamCount() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) AnalyticsPublicTeamCount() (int64, *model.AppError) { @@ -6503,13 +6503,13 @@ func (s *OpenTracingLayerTeamStore) AnalyticsPublicTeamCount() (int64, *model.Ap }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.AnalyticsPublicTeamCount() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.AnalyticsPublicTeamCount() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) AnalyticsTeamCount(includeDeleted bool) (int64, *model.AppError) { @@ -6521,13 +6521,13 @@ func (s *OpenTracingLayerTeamStore) AnalyticsTeamCount(includeDeleted bool) (int }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.AnalyticsTeamCount(includeDeleted) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.AnalyticsTeamCount(includeDeleted) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) ClearAllCustomRoleAssignments() *model.AppError { @@ -6539,13 +6539,13 @@ func (s *OpenTracingLayerTeamStore) ClearAllCustomRoleAssignments() *model.AppEr }() defer span.Finish() - resultVar0 := s.TeamStore.ClearAllCustomRoleAssignments() - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.TeamStore.ClearAllCustomRoleAssignments() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerTeamStore) ClearCaches() { @@ -6570,13 +6570,13 @@ func (s *OpenTracingLayerTeamStore) Get(id string) (*model.Team, *model.AppError }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.Get(id) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.Get(id) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetActiveMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, *model.AppError) { @@ -6588,13 +6588,13 @@ func (s *OpenTracingLayerTeamStore) GetActiveMemberCount(teamId string, restrict }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetActiveMemberCount(teamId, restrictions) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetActiveMemberCount(teamId, restrictions) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetAll() ([]*model.Team, *model.AppError) { @@ -6606,13 +6606,13 @@ func (s *OpenTracingLayerTeamStore) GetAll() ([]*model.Team, *model.AppError) { }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetAll() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetAll() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetAllForExportAfter(limit int, afterId string) ([]*model.TeamForExport, *model.AppError) { @@ -6624,13 +6624,13 @@ func (s *OpenTracingLayerTeamStore) GetAllForExportAfter(limit int, afterId stri }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetAllForExportAfter(limit, afterId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetAllForExportAfter(limit, afterId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetAllPage(offset int, limit int) ([]*model.Team, *model.AppError) { @@ -6642,13 +6642,13 @@ func (s *OpenTracingLayerTeamStore) GetAllPage(offset int, limit int) ([]*model. }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetAllPage(offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetAllPage(offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetAllPrivateTeamListing() ([]*model.Team, *model.AppError) { @@ -6660,13 +6660,13 @@ func (s *OpenTracingLayerTeamStore) GetAllPrivateTeamListing() ([]*model.Team, * }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetAllPrivateTeamListing() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetAllPrivateTeamListing() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetAllPrivateTeamPageListing(offset int, limit int) ([]*model.Team, *model.AppError) { @@ -6678,13 +6678,13 @@ func (s *OpenTracingLayerTeamStore) GetAllPrivateTeamPageListing(offset int, lim }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetAllPrivateTeamPageListing(offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetAllPrivateTeamPageListing(offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetAllPublicTeamPageListing(offset int, limit int) ([]*model.Team, *model.AppError) { @@ -6696,13 +6696,13 @@ func (s *OpenTracingLayerTeamStore) GetAllPublicTeamPageListing(offset int, limi }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetAllPublicTeamPageListing(offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetAllPublicTeamPageListing(offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetAllTeamListing() ([]*model.Team, *model.AppError) { @@ -6714,13 +6714,13 @@ func (s *OpenTracingLayerTeamStore) GetAllTeamListing() ([]*model.Team, *model.A }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetAllTeamListing() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetAllTeamListing() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetAllTeamPageListing(offset int, limit int) ([]*model.Team, *model.AppError) { @@ -6732,13 +6732,13 @@ func (s *OpenTracingLayerTeamStore) GetAllTeamPageListing(offset int, limit int) }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetAllTeamPageListing(offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetAllTeamPageListing(offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetByInviteId(inviteId string) (*model.Team, *model.AppError) { @@ -6750,13 +6750,13 @@ func (s *OpenTracingLayerTeamStore) GetByInviteId(inviteId string) (*model.Team, }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetByInviteId(inviteId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetByInviteId(inviteId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetByName(name string) (*model.Team, *model.AppError) { @@ -6768,13 +6768,13 @@ func (s *OpenTracingLayerTeamStore) GetByName(name string) (*model.Team, *model. }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetByName(name) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetByName(name) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetByNames(name []string) ([]*model.Team, *model.AppError) { @@ -6786,13 +6786,13 @@ func (s *OpenTracingLayerTeamStore) GetByNames(name []string) ([]*model.Team, *m }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetByNames(name) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetByNames(name) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetChannelUnreadsForAllTeams(excludeTeamId string, userId string) ([]*model.ChannelUnread, *model.AppError) { @@ -6804,13 +6804,13 @@ func (s *OpenTracingLayerTeamStore) GetChannelUnreadsForAllTeams(excludeTeamId s }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetChannelUnreadsForAllTeams(excludeTeamId, userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetChannelUnreadsForAllTeams(excludeTeamId, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetChannelUnreadsForTeam(teamId string, userId string) ([]*model.ChannelUnread, *model.AppError) { @@ -6822,13 +6822,13 @@ func (s *OpenTracingLayerTeamStore) GetChannelUnreadsForTeam(teamId string, user }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetChannelUnreadsForTeam(teamId, userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetChannelUnreadsForTeam(teamId, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetMember(teamId string, userId string) (*model.TeamMember, *model.AppError) { @@ -6840,13 +6840,13 @@ func (s *OpenTracingLayerTeamStore) GetMember(teamId string, userId string) (*mo }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetMember(teamId, userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetMember(teamId, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetMembers(teamId string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, *model.AppError) { @@ -6858,13 +6858,13 @@ func (s *OpenTracingLayerTeamStore) GetMembers(teamId string, offset int, limit }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetMembers(teamId, offset, limit, teamMembersGetOptions) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetMembers(teamId, offset, limit, teamMembersGetOptions) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) { @@ -6876,13 +6876,13 @@ func (s *OpenTracingLayerTeamStore) GetMembersByIds(teamId string, userIds []str }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetMembersByIds(teamId, userIds, restrictions) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetMembersByIds(teamId, userIds, restrictions) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetTeamMembersForExport(userId string) ([]*model.TeamMemberForExport, *model.AppError) { @@ -6894,13 +6894,13 @@ func (s *OpenTracingLayerTeamStore) GetTeamMembersForExport(userId string) ([]*m }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetTeamMembersForExport(userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetTeamMembersForExport(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetTeamsByScheme(schemeId string, offset int, limit int) ([]*model.Team, *model.AppError) { @@ -6912,13 +6912,13 @@ func (s *OpenTracingLayerTeamStore) GetTeamsByScheme(schemeId string, offset int }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetTeamsByScheme(schemeId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetTeamsByScheme(schemeId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetTeamsByUserId(userId string) ([]*model.Team, *model.AppError) { @@ -6930,13 +6930,13 @@ func (s *OpenTracingLayerTeamStore) GetTeamsByUserId(userId string) ([]*model.Te }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetTeamsByUserId(userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetTeamsByUserId(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetTeamsForUser(userId string) ([]*model.TeamMember, *model.AppError) { @@ -6948,13 +6948,13 @@ func (s *OpenTracingLayerTeamStore) GetTeamsForUser(userId string) ([]*model.Tea }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetTeamsForUser(userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetTeamsForUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetTeamsForUserWithPagination(userId string, page int, perPage int) ([]*model.TeamMember, *model.AppError) { @@ -6966,13 +6966,13 @@ func (s *OpenTracingLayerTeamStore) GetTeamsForUserWithPagination(userId string, }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetTeamsForUserWithPagination(userId, page, perPage) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetTeamsForUserWithPagination(userId, page, perPage) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetTotalMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, *model.AppError) { @@ -6984,13 +6984,13 @@ func (s *OpenTracingLayerTeamStore) GetTotalMemberCount(teamId string, restricti }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetTotalMemberCount(teamId, restrictions) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetTotalMemberCount(teamId, restrictions) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GetUserTeamIds(userId string, allowFromCache bool) ([]string, *model.AppError) { @@ -7002,13 +7002,13 @@ func (s *OpenTracingLayerTeamStore) GetUserTeamIds(userId string, allowFromCache }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GetUserTeamIds(userId, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GetUserTeamIds(userId, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) GroupSyncedTeamCount() (int64, *model.AppError) { @@ -7020,13 +7020,13 @@ func (s *OpenTracingLayerTeamStore) GroupSyncedTeamCount() (int64, *model.AppErr }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.GroupSyncedTeamCount() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.GroupSyncedTeamCount() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) InvalidateAllTeamIdsForUser(userId string) { @@ -7051,13 +7051,13 @@ func (s *OpenTracingLayerTeamStore) MigrateTeamMembers(fromTeamId string, fromUs }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.MigrateTeamMembers(fromTeamId, fromUserId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.MigrateTeamMembers(fromTeamId, fromUserId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) PermanentDelete(teamId string) *model.AppError { @@ -7069,13 +7069,13 @@ func (s *OpenTracingLayerTeamStore) PermanentDelete(teamId string) *model.AppErr }() defer span.Finish() - resultVar0 := s.TeamStore.PermanentDelete(teamId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.TeamStore.PermanentDelete(teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerTeamStore) RemoveAllMembersByTeam(teamId string) *model.AppError { @@ -7087,13 +7087,13 @@ func (s *OpenTracingLayerTeamStore) RemoveAllMembersByTeam(teamId string) *model }() defer span.Finish() - resultVar0 := s.TeamStore.RemoveAllMembersByTeam(teamId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.TeamStore.RemoveAllMembersByTeam(teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerTeamStore) RemoveAllMembersByUser(userId string) *model.AppError { @@ -7105,13 +7105,13 @@ func (s *OpenTracingLayerTeamStore) RemoveAllMembersByUser(userId string) *model }() defer span.Finish() - resultVar0 := s.TeamStore.RemoveAllMembersByUser(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.TeamStore.RemoveAllMembersByUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerTeamStore) RemoveMember(teamId string, userId string) *model.AppError { @@ -7123,13 +7123,13 @@ func (s *OpenTracingLayerTeamStore) RemoveMember(teamId string, userId string) * }() defer span.Finish() - resultVar0 := s.TeamStore.RemoveMember(teamId, userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.TeamStore.RemoveMember(teamId, userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerTeamStore) RemoveMembers(teamId string, userIds []string) *model.AppError { @@ -7141,13 +7141,13 @@ func (s *OpenTracingLayerTeamStore) RemoveMembers(teamId string, userIds []strin }() defer span.Finish() - resultVar0 := s.TeamStore.RemoveMembers(teamId, userIds) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.TeamStore.RemoveMembers(teamId, userIds) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerTeamStore) ResetAllTeamSchemes() *model.AppError { @@ -7159,13 +7159,13 @@ func (s *OpenTracingLayerTeamStore) ResetAllTeamSchemes() *model.AppError { }() defer span.Finish() - resultVar0 := s.TeamStore.ResetAllTeamSchemes() - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.TeamStore.ResetAllTeamSchemes() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerTeamStore) Save(team *model.Team) (*model.Team, *model.AppError) { @@ -7177,13 +7177,13 @@ func (s *OpenTracingLayerTeamStore) Save(team *model.Team) (*model.Team, *model. }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.Save(team) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.Save(team) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, *model.AppError) { @@ -7195,13 +7195,13 @@ func (s *OpenTracingLayerTeamStore) SaveMember(member *model.TeamMember, maxUser }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.SaveMember(member, maxUsersPerTeam) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.SaveMember(member, maxUsersPerTeam) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, *model.AppError) { @@ -7213,13 +7213,13 @@ func (s *OpenTracingLayerTeamStore) SaveMultipleMembers(members []*model.TeamMem }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.SaveMultipleMembers(members, maxUsersPerTeam) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.SaveMultipleMembers(members, maxUsersPerTeam) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) SearchAll(term string, opts *model.TeamSearch) ([]*model.Team, *model.AppError) { @@ -7231,13 +7231,13 @@ func (s *OpenTracingLayerTeamStore) SearchAll(term string, opts *model.TeamSearc }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.SearchAll(term, opts) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.SearchAll(term, opts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) SearchAllPaged(term string, opts *model.TeamSearch) ([]*model.Team, int64, *model.AppError) { @@ -7249,13 +7249,13 @@ func (s *OpenTracingLayerTeamStore) SearchAllPaged(term string, opts *model.Team }() defer span.Finish() - resultVar0, resultVar1, resultVar2 := s.TeamStore.SearchAllPaged(term, opts) - if resultVar2 != nil { - span.LogFields(spanlog.Error(resultVar2)) + result, resultVar1, err := s.TeamStore.SearchAllPaged(term, opts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1, resultVar2 + return result, resultVar1, err } func (s *OpenTracingLayerTeamStore) SearchOpen(term string) ([]*model.Team, *model.AppError) { @@ -7267,13 +7267,13 @@ func (s *OpenTracingLayerTeamStore) SearchOpen(term string) ([]*model.Team, *mod }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.SearchOpen(term) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.SearchOpen(term) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) SearchPrivate(term string) ([]*model.Team, *model.AppError) { @@ -7285,13 +7285,13 @@ func (s *OpenTracingLayerTeamStore) SearchPrivate(term string) ([]*model.Team, * }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.SearchPrivate(term) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.SearchPrivate(term) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) Update(team *model.Team) (*model.Team, *model.AppError) { @@ -7303,13 +7303,13 @@ func (s *OpenTracingLayerTeamStore) Update(team *model.Team) (*model.Team, *mode }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.Update(team) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.Update(team) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) UpdateLastTeamIconUpdate(teamId string, curTime int64) *model.AppError { @@ -7321,13 +7321,13 @@ func (s *OpenTracingLayerTeamStore) UpdateLastTeamIconUpdate(teamId string, curT }() defer span.Finish() - resultVar0 := s.TeamStore.UpdateLastTeamIconUpdate(teamId, curTime) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.TeamStore.UpdateLastTeamIconUpdate(teamId, curTime) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerTeamStore) UpdateMember(member *model.TeamMember) (*model.TeamMember, *model.AppError) { @@ -7339,13 +7339,13 @@ func (s *OpenTracingLayerTeamStore) UpdateMember(member *model.TeamMember) (*mod }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.UpdateMember(member) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.UpdateMember(member) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) UpdateMembersRole(teamID string, userIDs []string) *model.AppError { @@ -7357,13 +7357,13 @@ func (s *OpenTracingLayerTeamStore) UpdateMembersRole(teamID string, userIDs []s }() defer span.Finish() - resultVar0 := s.TeamStore.UpdateMembersRole(teamID, userIDs) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.TeamStore.UpdateMembersRole(teamID, userIDs) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerTeamStore) UpdateMultipleMembers(members []*model.TeamMember) ([]*model.TeamMember, *model.AppError) { @@ -7375,13 +7375,13 @@ func (s *OpenTracingLayerTeamStore) UpdateMultipleMembers(members []*model.TeamM }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.UpdateMultipleMembers(members) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.UpdateMultipleMembers(members) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTeamStore) UserBelongsToTeams(userId string, teamIds []string) (bool, *model.AppError) { @@ -7393,13 +7393,13 @@ func (s *OpenTracingLayerTeamStore) UserBelongsToTeams(userId string, teamIds [] }() defer span.Finish() - resultVar0, resultVar1 := s.TeamStore.UserBelongsToTeams(userId, teamIds) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TeamStore.UserBelongsToTeams(userId, teamIds) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTermsOfServiceStore) Get(id string, allowFromCache bool) (*model.TermsOfService, error) { @@ -7411,13 +7411,13 @@ func (s *OpenTracingLayerTermsOfServiceStore) Get(id string, allowFromCache bool }() defer span.Finish() - resultVar0, resultVar1 := s.TermsOfServiceStore.Get(id, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TermsOfServiceStore.Get(id, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTermsOfServiceStore) GetLatest(allowFromCache bool) (*model.TermsOfService, error) { @@ -7429,13 +7429,13 @@ func (s *OpenTracingLayerTermsOfServiceStore) GetLatest(allowFromCache bool) (*m }() defer span.Finish() - resultVar0, resultVar1 := s.TermsOfServiceStore.GetLatest(allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TermsOfServiceStore.GetLatest(allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTermsOfServiceStore) Save(termsOfService *model.TermsOfService) (*model.TermsOfService, error) { @@ -7447,13 +7447,13 @@ func (s *OpenTracingLayerTermsOfServiceStore) Save(termsOfService *model.TermsOf }() defer span.Finish() - resultVar0, resultVar1 := s.TermsOfServiceStore.Save(termsOfService) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TermsOfServiceStore.Save(termsOfService) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTokenStore) Cleanup() { @@ -7478,13 +7478,13 @@ func (s *OpenTracingLayerTokenStore) Delete(token string) error { }() defer span.Finish() - resultVar0 := s.TokenStore.Delete(token) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.TokenStore.Delete(token) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerTokenStore) GetByToken(token string) (*model.Token, error) { @@ -7496,13 +7496,13 @@ func (s *OpenTracingLayerTokenStore) GetByToken(token string) (*model.Token, err }() defer span.Finish() - resultVar0, resultVar1 := s.TokenStore.GetByToken(token) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.TokenStore.GetByToken(token) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerTokenStore) RemoveAllTokensByType(tokenType string) error { @@ -7514,13 +7514,13 @@ func (s *OpenTracingLayerTokenStore) RemoveAllTokensByType(tokenType string) err }() defer span.Finish() - resultVar0 := s.TokenStore.RemoveAllTokensByType(tokenType) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.TokenStore.RemoveAllTokensByType(tokenType) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerTokenStore) Save(recovery *model.Token) error { @@ -7532,13 +7532,13 @@ func (s *OpenTracingLayerTokenStore) Save(recovery *model.Token) error { }() defer span.Finish() - resultVar0 := s.TokenStore.Save(recovery) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.TokenStore.Save(recovery) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserStore) AnalyticsActiveCount(time int64, options model.UserCountOptions) (int64, *model.AppError) { @@ -7550,13 +7550,13 @@ func (s *OpenTracingLayerUserStore) AnalyticsActiveCount(time int64, options mod }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.AnalyticsActiveCount(time, options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.AnalyticsActiveCount(time, options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) AnalyticsGetGuestCount() (int64, *model.AppError) { @@ -7568,13 +7568,13 @@ func (s *OpenTracingLayerUserStore) AnalyticsGetGuestCount() (int64, *model.AppE }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.AnalyticsGetGuestCount() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.AnalyticsGetGuestCount() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) AnalyticsGetInactiveUsersCount() (int64, *model.AppError) { @@ -7586,13 +7586,13 @@ func (s *OpenTracingLayerUserStore) AnalyticsGetInactiveUsersCount() (int64, *mo }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.AnalyticsGetInactiveUsersCount() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.AnalyticsGetInactiveUsersCount() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) AnalyticsGetSystemAdminCount() (int64, *model.AppError) { @@ -7604,13 +7604,13 @@ func (s *OpenTracingLayerUserStore) AnalyticsGetSystemAdminCount() (int64, *mode }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.AnalyticsGetSystemAdminCount() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.AnalyticsGetSystemAdminCount() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) AutocompleteUsersInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, *model.AppError) { @@ -7622,13 +7622,13 @@ func (s *OpenTracingLayerUserStore) AutocompleteUsersInChannel(teamId string, ch }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.AutocompleteUsersInChannel(teamId, channelId, term, options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.AutocompleteUsersInChannel(teamId, channelId, term, options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) ClearAllCustomRoleAssignments() *model.AppError { @@ -7640,13 +7640,13 @@ func (s *OpenTracingLayerUserStore) ClearAllCustomRoleAssignments() *model.AppEr }() defer span.Finish() - resultVar0 := s.UserStore.ClearAllCustomRoleAssignments() - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserStore.ClearAllCustomRoleAssignments() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserStore) ClearCaches() { @@ -7671,13 +7671,13 @@ func (s *OpenTracingLayerUserStore) Count(options model.UserCountOptions) (int64 }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.Count(options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.Count(options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) DeactivateGuests() ([]string, *model.AppError) { @@ -7689,13 +7689,13 @@ func (s *OpenTracingLayerUserStore) DeactivateGuests() ([]string, *model.AppErro }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.DeactivateGuests() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.DeactivateGuests() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) DemoteUserToGuest(userID string) *model.AppError { @@ -7707,13 +7707,13 @@ func (s *OpenTracingLayerUserStore) DemoteUserToGuest(userID string) *model.AppE }() defer span.Finish() - resultVar0 := s.UserStore.DemoteUserToGuest(userID) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserStore.DemoteUserToGuest(userID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserStore) Get(id string) (*model.User, *model.AppError) { @@ -7725,13 +7725,13 @@ func (s *OpenTracingLayerUserStore) Get(id string) (*model.User, *model.AppError }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.Get(id) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.Get(id) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetAll() ([]*model.User, *model.AppError) { @@ -7743,13 +7743,13 @@ func (s *OpenTracingLayerUserStore) GetAll() ([]*model.User, *model.AppError) { }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetAll() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetAll() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetAllAfter(limit int, afterId string) ([]*model.User, *model.AppError) { @@ -7761,13 +7761,13 @@ func (s *OpenTracingLayerUserStore) GetAllAfter(limit int, afterId string) ([]*m }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetAllAfter(limit, afterId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetAllAfter(limit, afterId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetAllNotInAuthService(authServices []string) ([]*model.User, *model.AppError) { @@ -7779,13 +7779,13 @@ func (s *OpenTracingLayerUserStore) GetAllNotInAuthService(authServices []string }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetAllNotInAuthService(authServices) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetAllNotInAuthService(authServices) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetAllProfiles(options *model.UserGetOptions) ([]*model.User, *model.AppError) { @@ -7797,13 +7797,13 @@ func (s *OpenTracingLayerUserStore) GetAllProfiles(options *model.UserGetOptions }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetAllProfiles(options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetAllProfiles(options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetAllProfilesInChannel(channelId string, allowFromCache bool) (map[string]*model.User, *model.AppError) { @@ -7815,13 +7815,13 @@ func (s *OpenTracingLayerUserStore) GetAllProfilesInChannel(channelId string, al }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetAllProfilesInChannel(channelId, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetAllProfilesInChannel(channelId, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetAllUsingAuthService(authService string) ([]*model.User, *model.AppError) { @@ -7833,13 +7833,13 @@ func (s *OpenTracingLayerUserStore) GetAllUsingAuthService(authService string) ( }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetAllUsingAuthService(authService) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetAllUsingAuthService(authService) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetAnyUnreadPostCountForChannel(userId string, channelId string) (int64, *model.AppError) { @@ -7851,13 +7851,13 @@ func (s *OpenTracingLayerUserStore) GetAnyUnreadPostCountForChannel(userId strin }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetAnyUnreadPostCountForChannel(userId, channelId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetAnyUnreadPostCountForChannel(userId, channelId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetByAuth(authData *string, authService string) (*model.User, *model.AppError) { @@ -7869,13 +7869,13 @@ func (s *OpenTracingLayerUserStore) GetByAuth(authData *string, authService stri }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetByAuth(authData, authService) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetByAuth(authData, authService) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetByEmail(email string) (*model.User, *model.AppError) { @@ -7887,13 +7887,13 @@ func (s *OpenTracingLayerUserStore) GetByEmail(email string) (*model.User, *mode }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetByEmail(email) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetByEmail(email) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetByUsername(username string) (*model.User, *model.AppError) { @@ -7905,13 +7905,13 @@ func (s *OpenTracingLayerUserStore) GetByUsername(username string) (*model.User, }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetByUsername(username) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetByUsername(username) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetChannelGroupUsers(channelID string) ([]*model.User, *model.AppError) { @@ -7923,13 +7923,13 @@ func (s *OpenTracingLayerUserStore) GetChannelGroupUsers(channelID string) ([]*m }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetChannelGroupUsers(channelID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetChannelGroupUsers(channelID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetEtagForAllProfiles() string { @@ -7941,8 +7941,8 @@ func (s *OpenTracingLayerUserStore) GetEtagForAllProfiles() string { }() defer span.Finish() - resultVar0 := s.UserStore.GetEtagForAllProfiles() - return resultVar0 + result := s.UserStore.GetEtagForAllProfiles() + return result } func (s *OpenTracingLayerUserStore) GetEtagForProfiles(teamId string) string { @@ -7954,8 +7954,8 @@ func (s *OpenTracingLayerUserStore) GetEtagForProfiles(teamId string) string { }() defer span.Finish() - resultVar0 := s.UserStore.GetEtagForProfiles(teamId) - return resultVar0 + result := s.UserStore.GetEtagForProfiles(teamId) + return result } func (s *OpenTracingLayerUserStore) GetEtagForProfilesNotInTeam(teamId string) string { @@ -7967,8 +7967,8 @@ func (s *OpenTracingLayerUserStore) GetEtagForProfilesNotInTeam(teamId string) s }() defer span.Finish() - resultVar0 := s.UserStore.GetEtagForProfilesNotInTeam(teamId) - return resultVar0 + result := s.UserStore.GetEtagForProfilesNotInTeam(teamId) + return result } func (s *OpenTracingLayerUserStore) GetForLogin(loginId string, allowSignInWithUsername bool, allowSignInWithEmail bool) (*model.User, *model.AppError) { @@ -7980,13 +7980,13 @@ func (s *OpenTracingLayerUserStore) GetForLogin(loginId string, allowSignInWithU }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetForLogin(loginId, allowSignInWithUsername, allowSignInWithEmail) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetForLogin(loginId, allowSignInWithUsername, allowSignInWithEmail) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetKnownUsers(userID string) ([]string, *model.AppError) { @@ -7998,13 +7998,13 @@ func (s *OpenTracingLayerUserStore) GetKnownUsers(userID string) ([]string, *mod }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetKnownUsers(userID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetKnownUsers(userID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetNewUsersForTeam(teamId string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { @@ -8016,13 +8016,13 @@ func (s *OpenTracingLayerUserStore) GetNewUsersForTeam(teamId string, offset int }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetNewUsersForTeam(teamId, offset, limit, viewRestrictions) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetNewUsersForTeam(teamId, offset, limit, viewRestrictions) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetProfileByGroupChannelIdsForUser(userId string, channelIds []string) (map[string][]*model.User, *model.AppError) { @@ -8034,13 +8034,13 @@ func (s *OpenTracingLayerUserStore) GetProfileByGroupChannelIdsForUser(userId st }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetProfileByGroupChannelIdsForUser(userId, channelIds) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetProfileByGroupChannelIdsForUser(userId, channelIds) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetProfileByIds(userIds []string, options *store.UserGetByIdsOpts, allowFromCache bool) ([]*model.User, *model.AppError) { @@ -8052,13 +8052,13 @@ func (s *OpenTracingLayerUserStore) GetProfileByIds(userIds []string, options *s }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetProfileByIds(userIds, options, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetProfileByIds(userIds, options, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetProfiles(options *model.UserGetOptions) ([]*model.User, *model.AppError) { @@ -8070,13 +8070,13 @@ func (s *OpenTracingLayerUserStore) GetProfiles(options *model.UserGetOptions) ( }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetProfiles(options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetProfiles(options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetProfilesByUsernames(usernames []string, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { @@ -8088,13 +8088,13 @@ func (s *OpenTracingLayerUserStore) GetProfilesByUsernames(usernames []string, v }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetProfilesByUsernames(usernames, viewRestrictions) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetProfilesByUsernames(usernames, viewRestrictions) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetProfilesInChannel(channelId string, offset int, limit int) ([]*model.User, *model.AppError) { @@ -8106,13 +8106,13 @@ func (s *OpenTracingLayerUserStore) GetProfilesInChannel(channelId string, offse }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetProfilesInChannel(channelId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetProfilesInChannel(channelId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetProfilesInChannelByStatus(channelId string, offset int, limit int) ([]*model.User, *model.AppError) { @@ -8124,13 +8124,13 @@ func (s *OpenTracingLayerUserStore) GetProfilesInChannelByStatus(channelId strin }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetProfilesInChannelByStatus(channelId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetProfilesInChannelByStatus(channelId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetProfilesNotInChannel(teamId string, channelId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { @@ -8142,13 +8142,13 @@ func (s *OpenTracingLayerUserStore) GetProfilesNotInChannel(teamId string, chann }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetProfilesNotInChannel(teamId, channelId, groupConstrained, offset, limit, viewRestrictions) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetProfilesNotInChannel(teamId, channelId, groupConstrained, offset, limit, viewRestrictions) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetProfilesNotInTeam(teamId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { @@ -8160,13 +8160,13 @@ func (s *OpenTracingLayerUserStore) GetProfilesNotInTeam(teamId string, groupCon }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetProfilesNotInTeam(teamId, groupConstrained, offset, limit, viewRestrictions) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetProfilesNotInTeam(teamId, groupConstrained, offset, limit, viewRestrictions) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetProfilesWithoutTeam(options *model.UserGetOptions) ([]*model.User, *model.AppError) { @@ -8178,13 +8178,13 @@ func (s *OpenTracingLayerUserStore) GetProfilesWithoutTeam(options *model.UserGe }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetProfilesWithoutTeam(options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetProfilesWithoutTeam(options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetRecentlyActiveUsersForTeam(teamId string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { @@ -8196,13 +8196,13 @@ func (s *OpenTracingLayerUserStore) GetRecentlyActiveUsersForTeam(teamId string, }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetRecentlyActiveUsersForTeam(teamId, offset, limit, viewRestrictions) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetRecentlyActiveUsersForTeam(teamId, offset, limit, viewRestrictions) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetSystemAdminProfiles() (map[string]*model.User, *model.AppError) { @@ -8214,13 +8214,13 @@ func (s *OpenTracingLayerUserStore) GetSystemAdminProfiles() (map[string]*model. }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetSystemAdminProfiles() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetSystemAdminProfiles() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetTeamGroupUsers(teamID string) ([]*model.User, *model.AppError) { @@ -8232,13 +8232,13 @@ func (s *OpenTracingLayerUserStore) GetTeamGroupUsers(teamID string) ([]*model.U }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetTeamGroupUsers(teamID) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetTeamGroupUsers(teamID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetUnreadCount(userId string) (int64, *model.AppError) { @@ -8250,13 +8250,13 @@ func (s *OpenTracingLayerUserStore) GetUnreadCount(userId string) (int64, *model }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetUnreadCount(userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetUnreadCount(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetUnreadCountForChannel(userId string, channelId string) (int64, *model.AppError) { @@ -8268,13 +8268,13 @@ func (s *OpenTracingLayerUserStore) GetUnreadCountForChannel(userId string, chan }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetUnreadCountForChannel(userId, channelId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetUnreadCountForChannel(userId, channelId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) GetUsersBatchForIndexing(startTime int64, endTime int64, limit int) ([]*model.UserForIndexing, *model.AppError) { @@ -8286,13 +8286,13 @@ func (s *OpenTracingLayerUserStore) GetUsersBatchForIndexing(startTime int64, en }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.GetUsersBatchForIndexing(startTime, endTime, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.GetUsersBatchForIndexing(startTime, endTime, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) InferSystemInstallDate() (int64, *model.AppError) { @@ -8304,13 +8304,13 @@ func (s *OpenTracingLayerUserStore) InferSystemInstallDate() (int64, *model.AppE }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.InferSystemInstallDate() - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.InferSystemInstallDate() + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) InvalidateProfileCacheForUser(userId string) { @@ -8361,13 +8361,13 @@ func (s *OpenTracingLayerUserStore) PermanentDelete(userId string) *model.AppErr }() defer span.Finish() - resultVar0 := s.UserStore.PermanentDelete(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserStore.PermanentDelete(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserStore) PromoteGuestToUser(userID string) *model.AppError { @@ -8379,13 +8379,13 @@ func (s *OpenTracingLayerUserStore) PromoteGuestToUser(userID string) *model.App }() defer span.Finish() - resultVar0 := s.UserStore.PromoteGuestToUser(userID) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserStore.PromoteGuestToUser(userID) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserStore) ResetLastPictureUpdate(userId string) *model.AppError { @@ -8397,13 +8397,13 @@ func (s *OpenTracingLayerUserStore) ResetLastPictureUpdate(userId string) *model }() defer span.Finish() - resultVar0 := s.UserStore.ResetLastPictureUpdate(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserStore.ResetLastPictureUpdate(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserStore) Save(user *model.User) (*model.User, *model.AppError) { @@ -8415,13 +8415,13 @@ func (s *OpenTracingLayerUserStore) Save(user *model.User) (*model.User, *model. }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.Save(user) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.Save(user) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) Search(teamId string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { @@ -8433,13 +8433,13 @@ func (s *OpenTracingLayerUserStore) Search(teamId string, term string, options * }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.Search(teamId, term, options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.Search(teamId, term, options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) SearchInChannel(channelId string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { @@ -8451,13 +8451,13 @@ func (s *OpenTracingLayerUserStore) SearchInChannel(channelId string, term strin }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.SearchInChannel(channelId, term, options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.SearchInChannel(channelId, term, options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) SearchInGroup(groupID string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { @@ -8469,13 +8469,13 @@ func (s *OpenTracingLayerUserStore) SearchInGroup(groupID string, term string, o }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.SearchInGroup(groupID, term, options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.SearchInGroup(groupID, term, options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) SearchNotInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { @@ -8487,13 +8487,13 @@ func (s *OpenTracingLayerUserStore) SearchNotInChannel(teamId string, channelId }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.SearchNotInChannel(teamId, channelId, term, options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.SearchNotInChannel(teamId, channelId, term, options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) SearchNotInTeam(notInTeamId string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { @@ -8505,13 +8505,13 @@ func (s *OpenTracingLayerUserStore) SearchNotInTeam(notInTeamId string, term str }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.SearchNotInTeam(notInTeamId, term, options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.SearchNotInTeam(notInTeamId, term, options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) SearchWithoutTeam(term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { @@ -8523,13 +8523,13 @@ func (s *OpenTracingLayerUserStore) SearchWithoutTeam(term string, options *mode }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.SearchWithoutTeam(term, options) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.SearchWithoutTeam(term, options) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) Update(user *model.User, allowRoleUpdate bool) (*model.UserUpdate, *model.AppError) { @@ -8541,13 +8541,13 @@ func (s *OpenTracingLayerUserStore) Update(user *model.User, allowRoleUpdate boo }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.Update(user, allowRoleUpdate) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.Update(user, allowRoleUpdate) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) UpdateAuthData(userId string, service string, authData *string, email string, resetMfa bool) (string, *model.AppError) { @@ -8559,13 +8559,13 @@ func (s *OpenTracingLayerUserStore) UpdateAuthData(userId string, service string }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.UpdateAuthData(userId, service, authData, email, resetMfa) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.UpdateAuthData(userId, service, authData, email, resetMfa) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) UpdateFailedPasswordAttempts(userId string, attempts int) *model.AppError { @@ -8577,13 +8577,13 @@ func (s *OpenTracingLayerUserStore) UpdateFailedPasswordAttempts(userId string, }() defer span.Finish() - resultVar0 := s.UserStore.UpdateFailedPasswordAttempts(userId, attempts) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserStore.UpdateFailedPasswordAttempts(userId, attempts) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserStore) UpdateLastPictureUpdate(userId string) *model.AppError { @@ -8595,13 +8595,13 @@ func (s *OpenTracingLayerUserStore) UpdateLastPictureUpdate(userId string) *mode }() defer span.Finish() - resultVar0 := s.UserStore.UpdateLastPictureUpdate(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserStore.UpdateLastPictureUpdate(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserStore) UpdateMfaActive(userId string, active bool) *model.AppError { @@ -8613,13 +8613,13 @@ func (s *OpenTracingLayerUserStore) UpdateMfaActive(userId string, active bool) }() defer span.Finish() - resultVar0 := s.UserStore.UpdateMfaActive(userId, active) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserStore.UpdateMfaActive(userId, active) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserStore) UpdateMfaSecret(userId string, secret string) *model.AppError { @@ -8631,13 +8631,13 @@ func (s *OpenTracingLayerUserStore) UpdateMfaSecret(userId string, secret string }() defer span.Finish() - resultVar0 := s.UserStore.UpdateMfaSecret(userId, secret) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserStore.UpdateMfaSecret(userId, secret) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserStore) UpdatePassword(userId string, newPassword string) *model.AppError { @@ -8649,13 +8649,13 @@ func (s *OpenTracingLayerUserStore) UpdatePassword(userId string, newPassword st }() defer span.Finish() - resultVar0 := s.UserStore.UpdatePassword(userId, newPassword) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserStore.UpdatePassword(userId, newPassword) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserStore) UpdateUpdateAt(userId string) (int64, *model.AppError) { @@ -8667,13 +8667,13 @@ func (s *OpenTracingLayerUserStore) UpdateUpdateAt(userId string) (int64, *model }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.UpdateUpdateAt(userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.UpdateUpdateAt(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserStore) VerifyEmail(userId string, email string) (string, *model.AppError) { @@ -8685,13 +8685,13 @@ func (s *OpenTracingLayerUserStore) VerifyEmail(userId string, email string) (st }() defer span.Finish() - resultVar0, resultVar1 := s.UserStore.VerifyEmail(userId, email) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserStore.VerifyEmail(userId, email) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserAccessTokenStore) Delete(tokenId string) error { @@ -8703,13 +8703,13 @@ func (s *OpenTracingLayerUserAccessTokenStore) Delete(tokenId string) error { }() defer span.Finish() - resultVar0 := s.UserAccessTokenStore.Delete(tokenId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserAccessTokenStore.Delete(tokenId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserAccessTokenStore) DeleteAllForUser(userId string) error { @@ -8721,13 +8721,13 @@ func (s *OpenTracingLayerUserAccessTokenStore) DeleteAllForUser(userId string) e }() defer span.Finish() - resultVar0 := s.UserAccessTokenStore.DeleteAllForUser(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserAccessTokenStore.DeleteAllForUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, error) { @@ -8739,13 +8739,13 @@ func (s *OpenTracingLayerUserAccessTokenStore) Get(tokenId string) (*model.UserA }() defer span.Finish() - resultVar0, resultVar1 := s.UserAccessTokenStore.Get(tokenId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserAccessTokenStore.Get(tokenId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserAccessTokenStore) GetAll(offset int, limit int) ([]*model.UserAccessToken, error) { @@ -8757,13 +8757,13 @@ func (s *OpenTracingLayerUserAccessTokenStore) GetAll(offset int, limit int) ([] }() defer span.Finish() - resultVar0, resultVar1 := s.UserAccessTokenStore.GetAll(offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserAccessTokenStore.GetAll(offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserAccessTokenStore) GetByToken(tokenString string) (*model.UserAccessToken, error) { @@ -8775,13 +8775,13 @@ func (s *OpenTracingLayerUserAccessTokenStore) GetByToken(tokenString string) (* }() defer span.Finish() - resultVar0, resultVar1 := s.UserAccessTokenStore.GetByToken(tokenString) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserAccessTokenStore.GetByToken(tokenString) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserAccessTokenStore) GetByUser(userId string, page int, perPage int) ([]*model.UserAccessToken, error) { @@ -8793,13 +8793,13 @@ func (s *OpenTracingLayerUserAccessTokenStore) GetByUser(userId string, page int }() defer span.Finish() - resultVar0, resultVar1 := s.UserAccessTokenStore.GetByUser(userId, page, perPage) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserAccessTokenStore.GetByUser(userId, page, perPage) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserAccessTokenStore) Save(token *model.UserAccessToken) (*model.UserAccessToken, error) { @@ -8811,13 +8811,13 @@ func (s *OpenTracingLayerUserAccessTokenStore) Save(token *model.UserAccessToken }() defer span.Finish() - resultVar0, resultVar1 := s.UserAccessTokenStore.Save(token) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserAccessTokenStore.Save(token) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserAccessTokenStore) Search(term string) ([]*model.UserAccessToken, error) { @@ -8829,13 +8829,13 @@ func (s *OpenTracingLayerUserAccessTokenStore) Search(term string) ([]*model.Use }() defer span.Finish() - resultVar0, resultVar1 := s.UserAccessTokenStore.Search(term) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserAccessTokenStore.Search(term) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserAccessTokenStore) UpdateTokenDisable(tokenId string) error { @@ -8847,13 +8847,13 @@ func (s *OpenTracingLayerUserAccessTokenStore) UpdateTokenDisable(tokenId string }() defer span.Finish() - resultVar0 := s.UserAccessTokenStore.UpdateTokenDisable(tokenId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserAccessTokenStore.UpdateTokenDisable(tokenId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserAccessTokenStore) UpdateTokenEnable(tokenId string) error { @@ -8865,13 +8865,13 @@ func (s *OpenTracingLayerUserAccessTokenStore) UpdateTokenEnable(tokenId string) }() defer span.Finish() - resultVar0 := s.UserAccessTokenStore.UpdateTokenEnable(tokenId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserAccessTokenStore.UpdateTokenEnable(tokenId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserTermsOfServiceStore) Delete(userId string, termsOfServiceId string) error { @@ -8883,13 +8883,13 @@ func (s *OpenTracingLayerUserTermsOfServiceStore) Delete(userId string, termsOfS }() defer span.Finish() - resultVar0 := s.UserTermsOfServiceStore.Delete(userId, termsOfServiceId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.UserTermsOfServiceStore.Delete(userId, termsOfServiceId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerUserTermsOfServiceStore) GetByUser(userId string) (*model.UserTermsOfService, error) { @@ -8901,13 +8901,13 @@ func (s *OpenTracingLayerUserTermsOfServiceStore) GetByUser(userId string) (*mod }() defer span.Finish() - resultVar0, resultVar1 := s.UserTermsOfServiceStore.GetByUser(userId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserTermsOfServiceStore.GetByUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerUserTermsOfServiceStore) Save(userTermsOfService *model.UserTermsOfService) (*model.UserTermsOfService, error) { @@ -8919,13 +8919,13 @@ func (s *OpenTracingLayerUserTermsOfServiceStore) Save(userTermsOfService *model }() defer span.Finish() - resultVar0, resultVar1 := s.UserTermsOfServiceStore.Save(userTermsOfService) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.UserTermsOfServiceStore.Save(userTermsOfService) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) AnalyticsIncomingCount(teamId string) (int64, error) { @@ -8937,13 +8937,13 @@ func (s *OpenTracingLayerWebhookStore) AnalyticsIncomingCount(teamId string) (in }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.AnalyticsIncomingCount(teamId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.AnalyticsIncomingCount(teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) AnalyticsOutgoingCount(teamId string) (int64, error) { @@ -8955,13 +8955,13 @@ func (s *OpenTracingLayerWebhookStore) AnalyticsOutgoingCount(teamId string) (in }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.AnalyticsOutgoingCount(teamId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.AnalyticsOutgoingCount(teamId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) ClearCaches() { @@ -8986,13 +8986,13 @@ func (s *OpenTracingLayerWebhookStore) DeleteIncoming(webhookId string, time int }() defer span.Finish() - resultVar0 := s.WebhookStore.DeleteIncoming(webhookId, time) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.WebhookStore.DeleteIncoming(webhookId, time) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerWebhookStore) DeleteOutgoing(webhookId string, time int64) error { @@ -9004,13 +9004,13 @@ func (s *OpenTracingLayerWebhookStore) DeleteOutgoing(webhookId string, time int }() defer span.Finish() - resultVar0 := s.WebhookStore.DeleteOutgoing(webhookId, time) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.WebhookStore.DeleteOutgoing(webhookId, time) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerWebhookStore) GetIncoming(id string, allowFromCache bool) (*model.IncomingWebhook, error) { @@ -9022,13 +9022,13 @@ func (s *OpenTracingLayerWebhookStore) GetIncoming(id string, allowFromCache boo }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.GetIncoming(id, allowFromCache) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.GetIncoming(id, allowFromCache) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) GetIncomingByChannel(channelId string) ([]*model.IncomingWebhook, error) { @@ -9040,13 +9040,13 @@ func (s *OpenTracingLayerWebhookStore) GetIncomingByChannel(channelId string) ([ }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.GetIncomingByChannel(channelId) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.GetIncomingByChannel(channelId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) GetIncomingByTeam(teamId string, offset int, limit int) ([]*model.IncomingWebhook, error) { @@ -9058,13 +9058,13 @@ func (s *OpenTracingLayerWebhookStore) GetIncomingByTeam(teamId string, offset i }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.GetIncomingByTeam(teamId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.GetIncomingByTeam(teamId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) GetIncomingByTeamByUser(teamId string, userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { @@ -9076,13 +9076,13 @@ func (s *OpenTracingLayerWebhookStore) GetIncomingByTeamByUser(teamId string, us }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.GetIncomingByTeamByUser(teamId, userId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.GetIncomingByTeamByUser(teamId, userId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) GetIncomingList(offset int, limit int) ([]*model.IncomingWebhook, error) { @@ -9094,13 +9094,13 @@ func (s *OpenTracingLayerWebhookStore) GetIncomingList(offset int, limit int) ([ }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.GetIncomingList(offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.GetIncomingList(offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) GetIncomingListByUser(userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { @@ -9112,13 +9112,13 @@ func (s *OpenTracingLayerWebhookStore) GetIncomingListByUser(userId string, offs }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.GetIncomingListByUser(userId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.GetIncomingListByUser(userId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) GetOutgoing(id string) (*model.OutgoingWebhook, error) { @@ -9130,13 +9130,13 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoing(id string) (*model.OutgoingWe }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.GetOutgoing(id) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.GetOutgoing(id) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) GetOutgoingByChannel(channelId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { @@ -9148,13 +9148,13 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingByChannel(channelId string, of }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.GetOutgoingByChannel(channelId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.GetOutgoingByChannel(channelId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) GetOutgoingByChannelByUser(channelId string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { @@ -9166,13 +9166,13 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingByChannelByUser(channelId stri }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.GetOutgoingByChannelByUser(channelId, userId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.GetOutgoingByChannelByUser(channelId, userId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) GetOutgoingByTeam(teamId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { @@ -9184,13 +9184,13 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingByTeam(teamId string, offset i }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.GetOutgoingByTeam(teamId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.GetOutgoingByTeam(teamId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) GetOutgoingByTeamByUser(teamId string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { @@ -9202,13 +9202,13 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingByTeamByUser(teamId string, us }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.GetOutgoingByTeamByUser(teamId, userId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.GetOutgoingByTeamByUser(teamId, userId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) GetOutgoingList(offset int, limit int) ([]*model.OutgoingWebhook, error) { @@ -9220,13 +9220,13 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingList(offset int, limit int) ([ }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.GetOutgoingList(offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.GetOutgoingList(offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) GetOutgoingListByUser(userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { @@ -9238,13 +9238,13 @@ func (s *OpenTracingLayerWebhookStore) GetOutgoingListByUser(userId string, offs }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.GetOutgoingListByUser(userId, offset, limit) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.GetOutgoingListByUser(userId, offset, limit) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) InvalidateWebhookCache(webhook string) { @@ -9269,13 +9269,13 @@ func (s *OpenTracingLayerWebhookStore) PermanentDeleteIncomingByChannel(channelI }() defer span.Finish() - resultVar0 := s.WebhookStore.PermanentDeleteIncomingByChannel(channelId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.WebhookStore.PermanentDeleteIncomingByChannel(channelId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerWebhookStore) PermanentDeleteIncomingByUser(userId string) error { @@ -9287,13 +9287,13 @@ func (s *OpenTracingLayerWebhookStore) PermanentDeleteIncomingByUser(userId stri }() defer span.Finish() - resultVar0 := s.WebhookStore.PermanentDeleteIncomingByUser(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.WebhookStore.PermanentDeleteIncomingByUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerWebhookStore) PermanentDeleteOutgoingByChannel(channelId string) error { @@ -9305,13 +9305,13 @@ func (s *OpenTracingLayerWebhookStore) PermanentDeleteOutgoingByChannel(channelI }() defer span.Finish() - resultVar0 := s.WebhookStore.PermanentDeleteOutgoingByChannel(channelId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.WebhookStore.PermanentDeleteOutgoingByChannel(channelId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerWebhookStore) PermanentDeleteOutgoingByUser(userId string) error { @@ -9323,13 +9323,13 @@ func (s *OpenTracingLayerWebhookStore) PermanentDeleteOutgoingByUser(userId stri }() defer span.Finish() - resultVar0 := s.WebhookStore.PermanentDeleteOutgoingByUser(userId) - if resultVar0 != nil { - span.LogFields(spanlog.Error(resultVar0)) + err := s.WebhookStore.PermanentDeleteOutgoingByUser(userId) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0 + return err } func (s *OpenTracingLayerWebhookStore) SaveIncoming(webhook *model.IncomingWebhook) (*model.IncomingWebhook, error) { @@ -9341,13 +9341,13 @@ func (s *OpenTracingLayerWebhookStore) SaveIncoming(webhook *model.IncomingWebho }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.SaveIncoming(webhook) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.SaveIncoming(webhook) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) SaveOutgoing(webhook *model.OutgoingWebhook) (*model.OutgoingWebhook, error) { @@ -9359,13 +9359,13 @@ func (s *OpenTracingLayerWebhookStore) SaveOutgoing(webhook *model.OutgoingWebho }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.SaveOutgoing(webhook) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.SaveOutgoing(webhook) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) UpdateIncoming(webhook *model.IncomingWebhook) (*model.IncomingWebhook, error) { @@ -9377,13 +9377,13 @@ func (s *OpenTracingLayerWebhookStore) UpdateIncoming(webhook *model.IncomingWeb }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.UpdateIncoming(webhook) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.UpdateIncoming(webhook) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayerWebhookStore) UpdateOutgoing(hook *model.OutgoingWebhook) (*model.OutgoingWebhook, error) { @@ -9395,13 +9395,13 @@ func (s *OpenTracingLayerWebhookStore) UpdateOutgoing(hook *model.OutgoingWebhoo }() defer span.Finish() - resultVar0, resultVar1 := s.WebhookStore.UpdateOutgoing(hook) - if resultVar1 != nil { - span.LogFields(spanlog.Error(resultVar1)) + result, err := s.WebhookStore.UpdateOutgoing(hook) + if err != nil { + span.LogFields(spanlog.Error(err)) ext.Error.Set(span, true) } - return resultVar0, resultVar1 + return result, err } func (s *OpenTracingLayer) Close() { diff --git a/store/retrylayer/retrylayer.go b/store/retrylayer/retrylayer.go new file mode 100644 index 0000000000..2ac8f67b77 --- /dev/null +++ b/store/retrylayer/retrylayer.go @@ -0,0 +1,6062 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +// Code generated by "make store-layers" +// DO NOT EDIT + +package retrylayer + +import ( + "context" + + "github.com/go-sql-driver/mysql" + "github.com/lib/pq" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store" + "github.com/pkg/errors" +) + +const mySQLDeadlockCode = uint16(1213) + +type RetryLayer struct { + store.Store + AuditStore store.AuditStore + BotStore store.BotStore + ChannelStore store.ChannelStore + ChannelMemberHistoryStore store.ChannelMemberHistoryStore + ClusterDiscoveryStore store.ClusterDiscoveryStore + CommandStore store.CommandStore + CommandWebhookStore store.CommandWebhookStore + ComplianceStore store.ComplianceStore + EmojiStore store.EmojiStore + FileInfoStore store.FileInfoStore + GroupStore store.GroupStore + JobStore store.JobStore + LicenseStore store.LicenseStore + LinkMetadataStore store.LinkMetadataStore + OAuthStore store.OAuthStore + PluginStore store.PluginStore + PostStore store.PostStore + PreferenceStore store.PreferenceStore + ReactionStore store.ReactionStore + RoleStore store.RoleStore + SchemeStore store.SchemeStore + SessionStore store.SessionStore + StatusStore store.StatusStore + SystemStore store.SystemStore + TeamStore store.TeamStore + TermsOfServiceStore store.TermsOfServiceStore + TokenStore store.TokenStore + UserStore store.UserStore + UserAccessTokenStore store.UserAccessTokenStore + UserTermsOfServiceStore store.UserTermsOfServiceStore + WebhookStore store.WebhookStore +} + +func (s *RetryLayer) Audit() store.AuditStore { + return s.AuditStore +} + +func (s *RetryLayer) Bot() store.BotStore { + return s.BotStore +} + +func (s *RetryLayer) Channel() store.ChannelStore { + return s.ChannelStore +} + +func (s *RetryLayer) ChannelMemberHistory() store.ChannelMemberHistoryStore { + return s.ChannelMemberHistoryStore +} + +func (s *RetryLayer) ClusterDiscovery() store.ClusterDiscoveryStore { + return s.ClusterDiscoveryStore +} + +func (s *RetryLayer) Command() store.CommandStore { + return s.CommandStore +} + +func (s *RetryLayer) CommandWebhook() store.CommandWebhookStore { + return s.CommandWebhookStore +} + +func (s *RetryLayer) Compliance() store.ComplianceStore { + return s.ComplianceStore +} + +func (s *RetryLayer) Emoji() store.EmojiStore { + return s.EmojiStore +} + +func (s *RetryLayer) FileInfo() store.FileInfoStore { + return s.FileInfoStore +} + +func (s *RetryLayer) Group() store.GroupStore { + return s.GroupStore +} + +func (s *RetryLayer) Job() store.JobStore { + return s.JobStore +} + +func (s *RetryLayer) License() store.LicenseStore { + return s.LicenseStore +} + +func (s *RetryLayer) LinkMetadata() store.LinkMetadataStore { + return s.LinkMetadataStore +} + +func (s *RetryLayer) OAuth() store.OAuthStore { + return s.OAuthStore +} + +func (s *RetryLayer) Plugin() store.PluginStore { + return s.PluginStore +} + +func (s *RetryLayer) Post() store.PostStore { + return s.PostStore +} + +func (s *RetryLayer) Preference() store.PreferenceStore { + return s.PreferenceStore +} + +func (s *RetryLayer) Reaction() store.ReactionStore { + return s.ReactionStore +} + +func (s *RetryLayer) Role() store.RoleStore { + return s.RoleStore +} + +func (s *RetryLayer) Scheme() store.SchemeStore { + return s.SchemeStore +} + +func (s *RetryLayer) Session() store.SessionStore { + return s.SessionStore +} + +func (s *RetryLayer) Status() store.StatusStore { + return s.StatusStore +} + +func (s *RetryLayer) System() store.SystemStore { + return s.SystemStore +} + +func (s *RetryLayer) Team() store.TeamStore { + return s.TeamStore +} + +func (s *RetryLayer) TermsOfService() store.TermsOfServiceStore { + return s.TermsOfServiceStore +} + +func (s *RetryLayer) Token() store.TokenStore { + return s.TokenStore +} + +func (s *RetryLayer) User() store.UserStore { + return s.UserStore +} + +func (s *RetryLayer) UserAccessToken() store.UserAccessTokenStore { + return s.UserAccessTokenStore +} + +func (s *RetryLayer) UserTermsOfService() store.UserTermsOfServiceStore { + return s.UserTermsOfServiceStore +} + +func (s *RetryLayer) Webhook() store.WebhookStore { + return s.WebhookStore +} + +type RetryLayerAuditStore struct { + store.AuditStore + Root *RetryLayer +} + +type RetryLayerBotStore struct { + store.BotStore + Root *RetryLayer +} + +type RetryLayerChannelStore struct { + store.ChannelStore + Root *RetryLayer +} + +type RetryLayerChannelMemberHistoryStore struct { + store.ChannelMemberHistoryStore + Root *RetryLayer +} + +type RetryLayerClusterDiscoveryStore struct { + store.ClusterDiscoveryStore + Root *RetryLayer +} + +type RetryLayerCommandStore struct { + store.CommandStore + Root *RetryLayer +} + +type RetryLayerCommandWebhookStore struct { + store.CommandWebhookStore + Root *RetryLayer +} + +type RetryLayerComplianceStore struct { + store.ComplianceStore + Root *RetryLayer +} + +type RetryLayerEmojiStore struct { + store.EmojiStore + Root *RetryLayer +} + +type RetryLayerFileInfoStore struct { + store.FileInfoStore + Root *RetryLayer +} + +type RetryLayerGroupStore struct { + store.GroupStore + Root *RetryLayer +} + +type RetryLayerJobStore struct { + store.JobStore + Root *RetryLayer +} + +type RetryLayerLicenseStore struct { + store.LicenseStore + Root *RetryLayer +} + +type RetryLayerLinkMetadataStore struct { + store.LinkMetadataStore + Root *RetryLayer +} + +type RetryLayerOAuthStore struct { + store.OAuthStore + Root *RetryLayer +} + +type RetryLayerPluginStore struct { + store.PluginStore + Root *RetryLayer +} + +type RetryLayerPostStore struct { + store.PostStore + Root *RetryLayer +} + +type RetryLayerPreferenceStore struct { + store.PreferenceStore + Root *RetryLayer +} + +type RetryLayerReactionStore struct { + store.ReactionStore + Root *RetryLayer +} + +type RetryLayerRoleStore struct { + store.RoleStore + Root *RetryLayer +} + +type RetryLayerSchemeStore struct { + store.SchemeStore + Root *RetryLayer +} + +type RetryLayerSessionStore struct { + store.SessionStore + Root *RetryLayer +} + +type RetryLayerStatusStore struct { + store.StatusStore + Root *RetryLayer +} + +type RetryLayerSystemStore struct { + store.SystemStore + Root *RetryLayer +} + +type RetryLayerTeamStore struct { + store.TeamStore + Root *RetryLayer +} + +type RetryLayerTermsOfServiceStore struct { + store.TermsOfServiceStore + Root *RetryLayer +} + +type RetryLayerTokenStore struct { + store.TokenStore + Root *RetryLayer +} + +type RetryLayerUserStore struct { + store.UserStore + Root *RetryLayer +} + +type RetryLayerUserAccessTokenStore struct { + store.UserAccessTokenStore + Root *RetryLayer +} + +type RetryLayerUserTermsOfServiceStore struct { + store.UserTermsOfServiceStore + Root *RetryLayer +} + +type RetryLayerWebhookStore struct { + store.WebhookStore + Root *RetryLayer +} + +func isRepeatableError(err error) bool { + var pqErr *pq.Error + var mysqlErr *mysql.MySQLError + switch { + case errors.As(errors.Cause(err), &pqErr): + if pqErr.Code == "40001" || pqErr.Code == "40P01" { + return true + } + case errors.As(errors.Cause(err), &mysqlErr): + if mysqlErr.Number == mySQLDeadlockCode { + return true + } + } + return false +} + +func (s *RetryLayerAuditStore) Get(user_id string, offset int, limit int) (model.Audits, error) { + + tries := 0 + for { + result, err := s.AuditStore.Get(user_id, offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerAuditStore) PermanentDeleteByUser(userId string) error { + + tries := 0 + for { + err := s.AuditStore.PermanentDeleteByUser(userId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerAuditStore) Save(audit *model.Audit) error { + + tries := 0 + for { + err := s.AuditStore.Save(audit) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerBotStore) Get(userId string, includeDeleted bool) (*model.Bot, error) { + + tries := 0 + for { + result, err := s.BotStore.Get(userId, includeDeleted) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerBotStore) GetAll(options *model.BotGetOptions) ([]*model.Bot, error) { + + tries := 0 + for { + result, err := s.BotStore.GetAll(options) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerBotStore) PermanentDelete(userId string) error { + + tries := 0 + for { + err := s.BotStore.PermanentDelete(userId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerBotStore) Save(bot *model.Bot) (*model.Bot, error) { + + tries := 0 + for { + result, err := s.BotStore.Save(bot) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerBotStore) Update(bot *model.Bot) (*model.Bot, error) { + + tries := 0 + for { + result, err := s.BotStore.Update(bot) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) AnalyticsDeletedTypeCount(teamId string, channelType string) (int64, *model.AppError) { + + return s.ChannelStore.AnalyticsDeletedTypeCount(teamId, channelType) + +} + +func (s *RetryLayerChannelStore) AnalyticsTypeCount(teamId string, channelType string) (int64, *model.AppError) { + + return s.ChannelStore.AnalyticsTypeCount(teamId, channelType) + +} + +func (s *RetryLayerChannelStore) AutocompleteInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, *model.AppError) { + + return s.ChannelStore.AutocompleteInTeam(teamId, term, includeDeleted) + +} + +func (s *RetryLayerChannelStore) AutocompleteInTeamForSearch(teamId string, userId string, term string, includeDeleted bool) (*model.ChannelList, *model.AppError) { + + return s.ChannelStore.AutocompleteInTeamForSearch(teamId, userId, term, includeDeleted) + +} + +func (s *RetryLayerChannelStore) ClearAllCustomRoleAssignments() *model.AppError { + + return s.ChannelStore.ClearAllCustomRoleAssignments() + +} + +func (s *RetryLayerChannelStore) ClearCaches() { + + s.ChannelStore.ClearCaches() + +} + +func (s *RetryLayerChannelStore) ClearSidebarOnTeamLeave(userId string, teamId string) *model.AppError { + + return s.ChannelStore.ClearSidebarOnTeamLeave(userId, teamId) + +} + +func (s *RetryLayerChannelStore) CountPostsAfter(channelId string, timestamp int64, userId string) (int, *model.AppError) { + + return s.ChannelStore.CountPostsAfter(channelId, timestamp, userId) + +} + +func (s *RetryLayerChannelStore) CreateDirectChannel(userId *model.User, otherUserId *model.User) (*model.Channel, error) { + + tries := 0 + for { + result, err := s.ChannelStore.CreateDirectChannel(userId, otherUserId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) CreateInitialSidebarCategories(userId string, teamId string) error { + + tries := 0 + for { + err := s.ChannelStore.CreateInitialSidebarCategories(userId, teamId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerChannelStore) CreateSidebarCategory(userId string, teamId string, newCategory *model.SidebarCategoryWithChannels) (*model.SidebarCategoryWithChannels, *model.AppError) { + + return s.ChannelStore.CreateSidebarCategory(userId, teamId, newCategory) + +} + +func (s *RetryLayerChannelStore) Delete(channelId string, time int64) error { + + tries := 0 + for { + err := s.ChannelStore.Delete(channelId, time) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerChannelStore) DeleteSidebarCategory(categoryId string) *model.AppError { + + return s.ChannelStore.DeleteSidebarCategory(categoryId) + +} + +func (s *RetryLayerChannelStore) DeleteSidebarChannelsByPreferences(preferences *model.Preferences) error { + + tries := 0 + for { + err := s.ChannelStore.DeleteSidebarChannelsByPreferences(preferences) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerChannelStore) Get(id string, allowFromCache bool) (*model.Channel, error) { + + tries := 0 + for { + result, err := s.ChannelStore.Get(id, allowFromCache) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) GetAll(teamId string) ([]*model.Channel, *model.AppError) { + + return s.ChannelStore.GetAll(teamId) + +} + +func (s *RetryLayerChannelStore) GetAllChannelMembersForUser(userId string, allowFromCache bool, includeDeleted bool) (map[string]string, *model.AppError) { + + return s.ChannelStore.GetAllChannelMembersForUser(userId, allowFromCache, includeDeleted) + +} + +func (s *RetryLayerChannelStore) GetAllChannelMembersNotifyPropsForChannel(channelId string, allowFromCache bool) (map[string]model.StringMap, *model.AppError) { + + return s.ChannelStore.GetAllChannelMembersNotifyPropsForChannel(channelId, allowFromCache) + +} + +func (s *RetryLayerChannelStore) GetAllChannels(page int, perPage int, opts store.ChannelSearchOpts) (*model.ChannelListWithTeamData, error) { + + tries := 0 + for { + result, err := s.ChannelStore.GetAllChannels(page, perPage, opts) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) GetAllChannelsCount(opts store.ChannelSearchOpts) (int64, error) { + + tries := 0 + for { + result, err := s.ChannelStore.GetAllChannelsCount(opts) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) GetAllChannelsForExportAfter(limit int, afterId string) ([]*model.ChannelForExport, *model.AppError) { + + return s.ChannelStore.GetAllChannelsForExportAfter(limit, afterId) + +} + +func (s *RetryLayerChannelStore) GetAllDirectChannelsForExportAfter(limit int, afterId string) ([]*model.DirectChannelForExport, *model.AppError) { + + return s.ChannelStore.GetAllDirectChannelsForExportAfter(limit, afterId) + +} + +func (s *RetryLayerChannelStore) GetByName(team_id string, name string, allowFromCache bool) (*model.Channel, error) { + + tries := 0 + for { + result, err := s.ChannelStore.GetByName(team_id, name, allowFromCache) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) GetByNameIncludeDeleted(team_id string, name string, allowFromCache bool) (*model.Channel, error) { + + tries := 0 + for { + result, err := s.ChannelStore.GetByNameIncludeDeleted(team_id, name, allowFromCache) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) GetByNames(team_id string, names []string, allowFromCache bool) ([]*model.Channel, error) { + + tries := 0 + for { + result, err := s.ChannelStore.GetByNames(team_id, names, allowFromCache) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) GetChannelCounts(teamId string, userId string) (*model.ChannelCounts, *model.AppError) { + + return s.ChannelStore.GetChannelCounts(teamId, userId) + +} + +func (s *RetryLayerChannelStore) GetChannelMembersForExport(userId string, teamId string) ([]*model.ChannelMemberForExport, *model.AppError) { + + return s.ChannelStore.GetChannelMembersForExport(userId, teamId) + +} + +func (s *RetryLayerChannelStore) GetChannelMembersTimezones(channelId string) ([]model.StringMap, *model.AppError) { + + return s.ChannelStore.GetChannelMembersTimezones(channelId) + +} + +func (s *RetryLayerChannelStore) GetChannelUnread(channelId string, userId string) (*model.ChannelUnread, *model.AppError) { + + return s.ChannelStore.GetChannelUnread(channelId, userId) + +} + +func (s *RetryLayerChannelStore) GetChannels(teamId string, userId string, includeDeleted bool, lastDeleteAt int) (*model.ChannelList, error) { + + tries := 0 + for { + result, err := s.ChannelStore.GetChannels(teamId, userId, includeDeleted, lastDeleteAt) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) GetChannelsBatchForIndexing(startTime int64, endTime int64, limit int) ([]*model.Channel, *model.AppError) { + + return s.ChannelStore.GetChannelsBatchForIndexing(startTime, endTime, limit) + +} + +func (s *RetryLayerChannelStore) GetChannelsByIds(channelIds []string, includeDeleted bool) ([]*model.Channel, *model.AppError) { + + return s.ChannelStore.GetChannelsByIds(channelIds, includeDeleted) + +} + +func (s *RetryLayerChannelStore) GetChannelsByScheme(schemeId string, offset int, limit int) (model.ChannelList, *model.AppError) { + + return s.ChannelStore.GetChannelsByScheme(schemeId, offset, limit) + +} + +func (s *RetryLayerChannelStore) GetDeleted(team_id string, offset int, limit int, userId string) (*model.ChannelList, error) { + + tries := 0 + for { + result, err := s.ChannelStore.GetDeleted(team_id, offset, limit, userId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) GetDeletedByName(team_id string, name string) (*model.Channel, error) { + + tries := 0 + for { + result, err := s.ChannelStore.GetDeletedByName(team_id, name) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) GetForPost(postId string) (*model.Channel, *model.AppError) { + + return s.ChannelStore.GetForPost(postId) + +} + +func (s *RetryLayerChannelStore) GetFromMaster(id string) (*model.Channel, error) { + + tries := 0 + for { + result, err := s.ChannelStore.GetFromMaster(id) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) GetGuestCount(channelId string, allowFromCache bool) (int64, *model.AppError) { + + return s.ChannelStore.GetGuestCount(channelId, allowFromCache) + +} + +func (s *RetryLayerChannelStore) GetMember(channelId string, userId string) (*model.ChannelMember, *model.AppError) { + + return s.ChannelStore.GetMember(channelId, userId) + +} + +func (s *RetryLayerChannelStore) GetMemberCount(channelId string, allowFromCache bool) (int64, *model.AppError) { + + return s.ChannelStore.GetMemberCount(channelId, allowFromCache) + +} + +func (s *RetryLayerChannelStore) GetMemberCountFromCache(channelId string) int64 { + + return s.ChannelStore.GetMemberCountFromCache(channelId) + +} + +func (s *RetryLayerChannelStore) GetMemberCountsByGroup(channelID string, includeTimezones bool) ([]*model.ChannelMemberCountByGroup, *model.AppError) { + + return s.ChannelStore.GetMemberCountsByGroup(channelID, includeTimezones) + +} + +func (s *RetryLayerChannelStore) GetMemberForPost(postId string, userId string) (*model.ChannelMember, *model.AppError) { + + return s.ChannelStore.GetMemberForPost(postId, userId) + +} + +func (s *RetryLayerChannelStore) GetMembers(channelId string, offset int, limit int) (*model.ChannelMembers, *model.AppError) { + + return s.ChannelStore.GetMembers(channelId, offset, limit) + +} + +func (s *RetryLayerChannelStore) GetMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, *model.AppError) { + + return s.ChannelStore.GetMembersByIds(channelId, userIds) + +} + +func (s *RetryLayerChannelStore) GetMembersForUser(teamId string, userId string) (*model.ChannelMembers, *model.AppError) { + + return s.ChannelStore.GetMembersForUser(teamId, userId) + +} + +func (s *RetryLayerChannelStore) GetMembersForUserWithPagination(teamId string, userId string, page int, perPage int) (*model.ChannelMembers, *model.AppError) { + + return s.ChannelStore.GetMembersForUserWithPagination(teamId, userId, page, perPage) + +} + +func (s *RetryLayerChannelStore) GetMoreChannels(teamId string, userId string, offset int, limit int) (*model.ChannelList, error) { + + tries := 0 + for { + result, err := s.ChannelStore.GetMoreChannels(teamId, userId, offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) GetPinnedPostCount(channelId string, allowFromCache bool) (int64, *model.AppError) { + + return s.ChannelStore.GetPinnedPostCount(channelId, allowFromCache) + +} + +func (s *RetryLayerChannelStore) GetPinnedPosts(channelId string) (*model.PostList, *model.AppError) { + + return s.ChannelStore.GetPinnedPosts(channelId) + +} + +func (s *RetryLayerChannelStore) GetPrivateChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, *model.AppError) { + + return s.ChannelStore.GetPrivateChannelsForTeam(teamId, offset, limit) + +} + +func (s *RetryLayerChannelStore) GetPublicChannelsByIdsForTeam(teamId string, channelIds []string) (*model.ChannelList, *model.AppError) { + + return s.ChannelStore.GetPublicChannelsByIdsForTeam(teamId, channelIds) + +} + +func (s *RetryLayerChannelStore) GetPublicChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, *model.AppError) { + + return s.ChannelStore.GetPublicChannelsForTeam(teamId, offset, limit) + +} + +func (s *RetryLayerChannelStore) GetSidebarCategories(userId string, teamId string) (*model.OrderedSidebarCategories, *model.AppError) { + + return s.ChannelStore.GetSidebarCategories(userId, teamId) + +} + +func (s *RetryLayerChannelStore) GetSidebarCategory(categoryId string) (*model.SidebarCategoryWithChannels, *model.AppError) { + + return s.ChannelStore.GetSidebarCategory(categoryId) + +} + +func (s *RetryLayerChannelStore) GetSidebarCategoryOrder(userId string, teamId string) ([]string, *model.AppError) { + + return s.ChannelStore.GetSidebarCategoryOrder(userId, teamId) + +} + +func (s *RetryLayerChannelStore) GetTeamChannels(teamId string) (*model.ChannelList, *model.AppError) { + + return s.ChannelStore.GetTeamChannels(teamId) + +} + +func (s *RetryLayerChannelStore) GroupSyncedChannelCount() (int64, *model.AppError) { + + return s.ChannelStore.GroupSyncedChannelCount() + +} + +func (s *RetryLayerChannelStore) IncrementMentionCount(channelId string, userId string) *model.AppError { + + return s.ChannelStore.IncrementMentionCount(channelId, userId) + +} + +func (s *RetryLayerChannelStore) InvalidateAllChannelMembersForUser(userId string) { + + s.ChannelStore.InvalidateAllChannelMembersForUser(userId) + +} + +func (s *RetryLayerChannelStore) InvalidateCacheForChannelMembersNotifyProps(channelId string) { + + s.ChannelStore.InvalidateCacheForChannelMembersNotifyProps(channelId) + +} + +func (s *RetryLayerChannelStore) InvalidateChannel(id string) { + + s.ChannelStore.InvalidateChannel(id) + +} + +func (s *RetryLayerChannelStore) InvalidateChannelByName(teamId string, name string) { + + s.ChannelStore.InvalidateChannelByName(teamId, name) + +} + +func (s *RetryLayerChannelStore) InvalidateGuestCount(channelId string) { + + s.ChannelStore.InvalidateGuestCount(channelId) + +} + +func (s *RetryLayerChannelStore) InvalidateMemberCount(channelId string) { + + s.ChannelStore.InvalidateMemberCount(channelId) + +} + +func (s *RetryLayerChannelStore) InvalidatePinnedPostCount(channelId string) { + + s.ChannelStore.InvalidatePinnedPostCount(channelId) + +} + +func (s *RetryLayerChannelStore) IsUserInChannelUseCache(userId string, channelId string) bool { + + return s.ChannelStore.IsUserInChannelUseCache(userId, channelId) + +} + +func (s *RetryLayerChannelStore) MigrateChannelMembers(fromChannelId string, fromUserId string) (map[string]string, *model.AppError) { + + return s.ChannelStore.MigrateChannelMembers(fromChannelId, fromUserId) + +} + +func (s *RetryLayerChannelStore) MigratePublicChannels() error { + + tries := 0 + for { + err := s.ChannelStore.MigratePublicChannels() + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerChannelStore) PermanentDelete(channelId string) error { + + tries := 0 + for { + err := s.ChannelStore.PermanentDelete(channelId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerChannelStore) PermanentDeleteByTeam(teamId string) error { + + tries := 0 + for { + err := s.ChannelStore.PermanentDeleteByTeam(teamId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerChannelStore) PermanentDeleteMembersByChannel(channelId string) *model.AppError { + + return s.ChannelStore.PermanentDeleteMembersByChannel(channelId) + +} + +func (s *RetryLayerChannelStore) PermanentDeleteMembersByUser(userId string) *model.AppError { + + return s.ChannelStore.PermanentDeleteMembersByUser(userId) + +} + +func (s *RetryLayerChannelStore) RemoveAllDeactivatedMembers(channelId string) *model.AppError { + + return s.ChannelStore.RemoveAllDeactivatedMembers(channelId) + +} + +func (s *RetryLayerChannelStore) RemoveMember(channelId string, userId string) *model.AppError { + + return s.ChannelStore.RemoveMember(channelId, userId) + +} + +func (s *RetryLayerChannelStore) RemoveMembers(channelId string, userIds []string) *model.AppError { + + return s.ChannelStore.RemoveMembers(channelId, userIds) + +} + +func (s *RetryLayerChannelStore) ResetAllChannelSchemes() *model.AppError { + + return s.ChannelStore.ResetAllChannelSchemes() + +} + +func (s *RetryLayerChannelStore) Restore(channelId string, time int64) error { + + tries := 0 + for { + err := s.ChannelStore.Restore(channelId, time) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerChannelStore) Save(channel *model.Channel, maxChannelsPerTeam int64) (*model.Channel, error) { + + tries := 0 + for { + result, err := s.ChannelStore.Save(channel, maxChannelsPerTeam) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) SaveDirectChannel(channel *model.Channel, member1 *model.ChannelMember, member2 *model.ChannelMember) (*model.Channel, error) { + + tries := 0 + for { + result, err := s.ChannelStore.SaveDirectChannel(channel, member1, member2) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) SaveMember(member *model.ChannelMember) (*model.ChannelMember, *model.AppError) { + + return s.ChannelStore.SaveMember(member) + +} + +func (s *RetryLayerChannelStore) SaveMultipleMembers(members []*model.ChannelMember) ([]*model.ChannelMember, *model.AppError) { + + return s.ChannelStore.SaveMultipleMembers(members) + +} + +func (s *RetryLayerChannelStore) SearchAllChannels(term string, opts store.ChannelSearchOpts) (*model.ChannelListWithTeamData, int64, *model.AppError) { + + return s.ChannelStore.SearchAllChannels(term, opts) + +} + +func (s *RetryLayerChannelStore) SearchArchivedInTeam(teamId string, term string, userId string) (*model.ChannelList, *model.AppError) { + + return s.ChannelStore.SearchArchivedInTeam(teamId, term, userId) + +} + +func (s *RetryLayerChannelStore) SearchForUserInTeam(userId string, teamId string, term string, includeDeleted bool) (*model.ChannelList, *model.AppError) { + + return s.ChannelStore.SearchForUserInTeam(userId, teamId, term, includeDeleted) + +} + +func (s *RetryLayerChannelStore) SearchGroupChannels(userId string, term string) (*model.ChannelList, *model.AppError) { + + return s.ChannelStore.SearchGroupChannels(userId, term) + +} + +func (s *RetryLayerChannelStore) SearchInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, *model.AppError) { + + return s.ChannelStore.SearchInTeam(teamId, term, includeDeleted) + +} + +func (s *RetryLayerChannelStore) SearchMore(userId string, teamId string, term string) (*model.ChannelList, *model.AppError) { + + return s.ChannelStore.SearchMore(userId, teamId, term) + +} + +func (s *RetryLayerChannelStore) SetDeleteAt(channelId string, deleteAt int64, updateAt int64) error { + + tries := 0 + for { + err := s.ChannelStore.SetDeleteAt(channelId, deleteAt, updateAt) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerChannelStore) Update(channel *model.Channel) (*model.Channel, error) { + + tries := 0 + for { + result, err := s.ChannelStore.Update(channel) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelStore) UpdateLastViewedAt(channelIds []string, userId string) (map[string]int64, *model.AppError) { + + return s.ChannelStore.UpdateLastViewedAt(channelIds, userId) + +} + +func (s *RetryLayerChannelStore) UpdateLastViewedAtPost(unreadPost *model.Post, userID string, mentionCount int) (*model.ChannelUnreadAt, *model.AppError) { + + return s.ChannelStore.UpdateLastViewedAtPost(unreadPost, userID, mentionCount) + +} + +func (s *RetryLayerChannelStore) UpdateMember(member *model.ChannelMember) (*model.ChannelMember, *model.AppError) { + + return s.ChannelStore.UpdateMember(member) + +} + +func (s *RetryLayerChannelStore) UpdateMembersRole(channelID string, userIDs []string) *model.AppError { + + return s.ChannelStore.UpdateMembersRole(channelID, userIDs) + +} + +func (s *RetryLayerChannelStore) UpdateMultipleMembers(members []*model.ChannelMember) ([]*model.ChannelMember, *model.AppError) { + + return s.ChannelStore.UpdateMultipleMembers(members) + +} + +func (s *RetryLayerChannelStore) UpdateSidebarCategories(userId string, teamId string, categories []*model.SidebarCategoryWithChannels) ([]*model.SidebarCategoryWithChannels, *model.AppError) { + + return s.ChannelStore.UpdateSidebarCategories(userId, teamId, categories) + +} + +func (s *RetryLayerChannelStore) UpdateSidebarCategoryOrder(userId string, teamId string, categoryOrder []string) *model.AppError { + + return s.ChannelStore.UpdateSidebarCategoryOrder(userId, teamId, categoryOrder) + +} + +func (s *RetryLayerChannelStore) UpdateSidebarChannelCategoryOnMove(channel *model.Channel, newTeamId string) *model.AppError { + + return s.ChannelStore.UpdateSidebarChannelCategoryOnMove(channel, newTeamId) + +} + +func (s *RetryLayerChannelStore) UpdateSidebarChannelsByPreferences(preferences *model.Preferences) error { + + tries := 0 + for { + err := s.ChannelStore.UpdateSidebarChannelsByPreferences(preferences) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerChannelStore) UserBelongsToChannels(userId string, channelIds []string) (bool, *model.AppError) { + + return s.ChannelStore.UserBelongsToChannels(userId, channelIds) + +} + +func (s *RetryLayerChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistoryResult, error) { + + tries := 0 + for { + result, err := s.ChannelMemberHistoryStore.GetUsersInChannelDuring(startTime, endTime, channelId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerChannelMemberHistoryStore) LogJoinEvent(userId string, channelId string, joinTime int64) error { + + tries := 0 + for { + err := s.ChannelMemberHistoryStore.LogJoinEvent(userId, channelId, joinTime) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerChannelMemberHistoryStore) LogLeaveEvent(userId string, channelId string, leaveTime int64) error { + + tries := 0 + for { + err := s.ChannelMemberHistoryStore.LogLeaveEvent(userId, channelId, leaveTime) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerChannelMemberHistoryStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, error) { + + tries := 0 + for { + result, err := s.ChannelMemberHistoryStore.PermanentDeleteBatch(endTime, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerClusterDiscoveryStore) Cleanup() error { + + tries := 0 + for { + err := s.ClusterDiscoveryStore.Cleanup() + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerClusterDiscoveryStore) Delete(discovery *model.ClusterDiscovery) (bool, error) { + + tries := 0 + for { + result, err := s.ClusterDiscoveryStore.Delete(discovery) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerClusterDiscoveryStore) Exists(discovery *model.ClusterDiscovery) (bool, error) { + + tries := 0 + for { + result, err := s.ClusterDiscoveryStore.Exists(discovery) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerClusterDiscoveryStore) GetAll(discoveryType string, clusterName string) ([]*model.ClusterDiscovery, error) { + + tries := 0 + for { + result, err := s.ClusterDiscoveryStore.GetAll(discoveryType, clusterName) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerClusterDiscoveryStore) Save(discovery *model.ClusterDiscovery) error { + + tries := 0 + for { + err := s.ClusterDiscoveryStore.Save(discovery) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerClusterDiscoveryStore) SetLastPingAt(discovery *model.ClusterDiscovery) error { + + tries := 0 + for { + err := s.ClusterDiscoveryStore.SetLastPingAt(discovery) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerCommandStore) AnalyticsCommandCount(teamId string) (int64, error) { + + tries := 0 + for { + result, err := s.CommandStore.AnalyticsCommandCount(teamId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerCommandStore) Delete(commandId string, time int64) error { + + tries := 0 + for { + err := s.CommandStore.Delete(commandId, time) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerCommandStore) Get(id string) (*model.Command, error) { + + tries := 0 + for { + result, err := s.CommandStore.Get(id) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerCommandStore) GetByTeam(teamId string) ([]*model.Command, error) { + + tries := 0 + for { + result, err := s.CommandStore.GetByTeam(teamId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerCommandStore) GetByTrigger(teamId string, trigger string) (*model.Command, error) { + + tries := 0 + for { + result, err := s.CommandStore.GetByTrigger(teamId, trigger) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerCommandStore) PermanentDeleteByTeam(teamId string) error { + + tries := 0 + for { + err := s.CommandStore.PermanentDeleteByTeam(teamId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerCommandStore) PermanentDeleteByUser(userId string) error { + + tries := 0 + for { + err := s.CommandStore.PermanentDeleteByUser(userId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerCommandStore) Save(webhook *model.Command) (*model.Command, error) { + + tries := 0 + for { + result, err := s.CommandStore.Save(webhook) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerCommandStore) Update(hook *model.Command) (*model.Command, error) { + + tries := 0 + for { + result, err := s.CommandStore.Update(hook) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerCommandWebhookStore) Cleanup() { + + s.CommandWebhookStore.Cleanup() + +} + +func (s *RetryLayerCommandWebhookStore) Get(id string) (*model.CommandWebhook, error) { + + tries := 0 + for { + result, err := s.CommandWebhookStore.Get(id) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerCommandWebhookStore) Save(webhook *model.CommandWebhook) (*model.CommandWebhook, error) { + + tries := 0 + for { + result, err := s.CommandWebhookStore.Save(webhook) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerCommandWebhookStore) TryUse(id string, limit int) error { + + tries := 0 + for { + err := s.CommandWebhookStore.TryUse(id, limit) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerComplianceStore) ComplianceExport(compliance *model.Compliance) ([]*model.CompliancePost, error) { + + tries := 0 + for { + result, err := s.ComplianceStore.ComplianceExport(compliance) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerComplianceStore) Get(id string) (*model.Compliance, error) { + + tries := 0 + for { + result, err := s.ComplianceStore.Get(id) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerComplianceStore) GetAll(offset int, limit int) (model.Compliances, error) { + + tries := 0 + for { + result, err := s.ComplianceStore.GetAll(offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerComplianceStore) MessageExport(after int64, limit int) ([]*model.MessageExport, error) { + + tries := 0 + for { + result, err := s.ComplianceStore.MessageExport(after, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerComplianceStore) Save(compliance *model.Compliance) (*model.Compliance, error) { + + tries := 0 + for { + result, err := s.ComplianceStore.Save(compliance) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerComplianceStore) Update(compliance *model.Compliance) (*model.Compliance, error) { + + tries := 0 + for { + result, err := s.ComplianceStore.Update(compliance) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerEmojiStore) Delete(emoji *model.Emoji, time int64) error { + + tries := 0 + for { + err := s.EmojiStore.Delete(emoji, time) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerEmojiStore) Get(id string, allowFromCache bool) (*model.Emoji, error) { + + tries := 0 + for { + result, err := s.EmojiStore.Get(id, allowFromCache) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerEmojiStore) GetByName(name string, allowFromCache bool) (*model.Emoji, error) { + + tries := 0 + for { + result, err := s.EmojiStore.GetByName(name, allowFromCache) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerEmojiStore) GetList(offset int, limit int, sort string) ([]*model.Emoji, error) { + + tries := 0 + for { + result, err := s.EmojiStore.GetList(offset, limit, sort) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerEmojiStore) GetMultipleByName(names []string) ([]*model.Emoji, error) { + + tries := 0 + for { + result, err := s.EmojiStore.GetMultipleByName(names) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerEmojiStore) Save(emoji *model.Emoji) (*model.Emoji, error) { + + tries := 0 + for { + result, err := s.EmojiStore.Save(emoji) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerEmojiStore) Search(name string, prefixOnly bool, limit int) ([]*model.Emoji, error) { + + tries := 0 + for { + result, err := s.EmojiStore.Search(name, prefixOnly, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerFileInfoStore) AttachToPost(fileId string, postId string, creatorId string) *model.AppError { + + return s.FileInfoStore.AttachToPost(fileId, postId, creatorId) + +} + +func (s *RetryLayerFileInfoStore) ClearCaches() { + + s.FileInfoStore.ClearCaches() + +} + +func (s *RetryLayerFileInfoStore) DeleteForPost(postId string) (string, *model.AppError) { + + return s.FileInfoStore.DeleteForPost(postId) + +} + +func (s *RetryLayerFileInfoStore) Get(id string) (*model.FileInfo, *model.AppError) { + + return s.FileInfoStore.Get(id) + +} + +func (s *RetryLayerFileInfoStore) GetByPath(path string) (*model.FileInfo, *model.AppError) { + + return s.FileInfoStore.GetByPath(path) + +} + +func (s *RetryLayerFileInfoStore) GetForPost(postId string, readFromMaster bool, includeDeleted bool, allowFromCache bool) ([]*model.FileInfo, *model.AppError) { + + return s.FileInfoStore.GetForPost(postId, readFromMaster, includeDeleted, allowFromCache) + +} + +func (s *RetryLayerFileInfoStore) GetForUser(userId string) ([]*model.FileInfo, *model.AppError) { + + return s.FileInfoStore.GetForUser(userId) + +} + +func (s *RetryLayerFileInfoStore) GetWithOptions(page int, perPage int, opt *model.GetFileInfosOptions) ([]*model.FileInfo, *model.AppError) { + + return s.FileInfoStore.GetWithOptions(page, perPage, opt) + +} + +func (s *RetryLayerFileInfoStore) InvalidateFileInfosForPostCache(postId string, deleted bool) { + + s.FileInfoStore.InvalidateFileInfosForPostCache(postId, deleted) + +} + +func (s *RetryLayerFileInfoStore) PermanentDelete(fileId string) *model.AppError { + + return s.FileInfoStore.PermanentDelete(fileId) + +} + +func (s *RetryLayerFileInfoStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, *model.AppError) { + + return s.FileInfoStore.PermanentDeleteBatch(endTime, limit) + +} + +func (s *RetryLayerFileInfoStore) PermanentDeleteByUser(userId string) (int64, *model.AppError) { + + return s.FileInfoStore.PermanentDeleteByUser(userId) + +} + +func (s *RetryLayerFileInfoStore) Save(info *model.FileInfo) (*model.FileInfo, *model.AppError) { + + return s.FileInfoStore.Save(info) + +} + +func (s *RetryLayerGroupStore) AdminRoleGroupsForSyncableMember(userID string, syncableID string, syncableType model.GroupSyncableType) ([]string, *model.AppError) { + + return s.GroupStore.AdminRoleGroupsForSyncableMember(userID, syncableID, syncableType) + +} + +func (s *RetryLayerGroupStore) ChannelMembersMinusGroupMembers(channelID string, groupIDs []string, page int, perPage int) ([]*model.UserWithGroups, *model.AppError) { + + return s.GroupStore.ChannelMembersMinusGroupMembers(channelID, groupIDs, page, perPage) + +} + +func (s *RetryLayerGroupStore) ChannelMembersToAdd(since int64, channelID *string) ([]*model.UserChannelIDPair, *model.AppError) { + + return s.GroupStore.ChannelMembersToAdd(since, channelID) + +} + +func (s *RetryLayerGroupStore) ChannelMembersToRemove(channelID *string) ([]*model.ChannelMember, *model.AppError) { + + return s.GroupStore.ChannelMembersToRemove(channelID) + +} + +func (s *RetryLayerGroupStore) CountChannelMembersMinusGroupMembers(channelID string, groupIDs []string) (int64, *model.AppError) { + + return s.GroupStore.CountChannelMembersMinusGroupMembers(channelID, groupIDs) + +} + +func (s *RetryLayerGroupStore) CountGroupsByChannel(channelId string, opts model.GroupSearchOpts) (int64, *model.AppError) { + + return s.GroupStore.CountGroupsByChannel(channelId, opts) + +} + +func (s *RetryLayerGroupStore) CountGroupsByTeam(teamId string, opts model.GroupSearchOpts) (int64, *model.AppError) { + + return s.GroupStore.CountGroupsByTeam(teamId, opts) + +} + +func (s *RetryLayerGroupStore) CountTeamMembersMinusGroupMembers(teamID string, groupIDs []string) (int64, *model.AppError) { + + return s.GroupStore.CountTeamMembersMinusGroupMembers(teamID, groupIDs) + +} + +func (s *RetryLayerGroupStore) Create(group *model.Group) (*model.Group, *model.AppError) { + + return s.GroupStore.Create(group) + +} + +func (s *RetryLayerGroupStore) CreateGroupSyncable(groupSyncable *model.GroupSyncable) (*model.GroupSyncable, *model.AppError) { + + return s.GroupStore.CreateGroupSyncable(groupSyncable) + +} + +func (s *RetryLayerGroupStore) Delete(groupID string) (*model.Group, *model.AppError) { + + return s.GroupStore.Delete(groupID) + +} + +func (s *RetryLayerGroupStore) DeleteGroupSyncable(groupID string, syncableID string, syncableType model.GroupSyncableType) (*model.GroupSyncable, *model.AppError) { + + return s.GroupStore.DeleteGroupSyncable(groupID, syncableID, syncableType) + +} + +func (s *RetryLayerGroupStore) DeleteMember(groupID string, userID string) (*model.GroupMember, *model.AppError) { + + return s.GroupStore.DeleteMember(groupID, userID) + +} + +func (s *RetryLayerGroupStore) DistinctGroupMemberCount() (int64, *model.AppError) { + + return s.GroupStore.DistinctGroupMemberCount() + +} + +func (s *RetryLayerGroupStore) Get(groupID string) (*model.Group, *model.AppError) { + + return s.GroupStore.Get(groupID) + +} + +func (s *RetryLayerGroupStore) GetAllBySource(groupSource model.GroupSource) ([]*model.Group, *model.AppError) { + + return s.GroupStore.GetAllBySource(groupSource) + +} + +func (s *RetryLayerGroupStore) GetAllGroupSyncablesByGroupId(groupID string, syncableType model.GroupSyncableType) ([]*model.GroupSyncable, *model.AppError) { + + return s.GroupStore.GetAllGroupSyncablesByGroupId(groupID, syncableType) + +} + +func (s *RetryLayerGroupStore) GetByIDs(groupIDs []string) ([]*model.Group, *model.AppError) { + + return s.GroupStore.GetByIDs(groupIDs) + +} + +func (s *RetryLayerGroupStore) GetByName(name string, opts model.GroupSearchOpts) (*model.Group, *model.AppError) { + + return s.GroupStore.GetByName(name, opts) + +} + +func (s *RetryLayerGroupStore) GetByRemoteID(remoteID string, groupSource model.GroupSource) (*model.Group, *model.AppError) { + + return s.GroupStore.GetByRemoteID(remoteID, groupSource) + +} + +func (s *RetryLayerGroupStore) GetByUser(userId string) ([]*model.Group, *model.AppError) { + + return s.GroupStore.GetByUser(userId) + +} + +func (s *RetryLayerGroupStore) GetGroupSyncable(groupID string, syncableID string, syncableType model.GroupSyncableType) (*model.GroupSyncable, *model.AppError) { + + return s.GroupStore.GetGroupSyncable(groupID, syncableID, syncableType) + +} + +func (s *RetryLayerGroupStore) GetGroups(page int, perPage int, opts model.GroupSearchOpts) ([]*model.Group, *model.AppError) { + + return s.GroupStore.GetGroups(page, perPage, opts) + +} + +func (s *RetryLayerGroupStore) GetGroupsAssociatedToChannelsByTeam(teamId string, opts model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, *model.AppError) { + + return s.GroupStore.GetGroupsAssociatedToChannelsByTeam(teamId, opts) + +} + +func (s *RetryLayerGroupStore) GetGroupsByChannel(channelId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, *model.AppError) { + + return s.GroupStore.GetGroupsByChannel(channelId, opts) + +} + +func (s *RetryLayerGroupStore) GetGroupsByTeam(teamId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, *model.AppError) { + + return s.GroupStore.GetGroupsByTeam(teamId, opts) + +} + +func (s *RetryLayerGroupStore) GetMemberCount(groupID string) (int64, *model.AppError) { + + return s.GroupStore.GetMemberCount(groupID) + +} + +func (s *RetryLayerGroupStore) GetMemberUsers(groupID string) ([]*model.User, *model.AppError) { + + return s.GroupStore.GetMemberUsers(groupID) + +} + +func (s *RetryLayerGroupStore) GetMemberUsersInTeam(groupID string, teamID string) ([]*model.User, *model.AppError) { + + return s.GroupStore.GetMemberUsersInTeam(groupID, teamID) + +} + +func (s *RetryLayerGroupStore) GetMemberUsersNotInChannel(groupID string, channelID string) ([]*model.User, *model.AppError) { + + return s.GroupStore.GetMemberUsersNotInChannel(groupID, channelID) + +} + +func (s *RetryLayerGroupStore) GetMemberUsersPage(groupID string, page int, perPage int) ([]*model.User, *model.AppError) { + + return s.GroupStore.GetMemberUsersPage(groupID, page, perPage) + +} + +func (s *RetryLayerGroupStore) GroupChannelCount() (int64, *model.AppError) { + + return s.GroupStore.GroupChannelCount() + +} + +func (s *RetryLayerGroupStore) GroupCount() (int64, *model.AppError) { + + return s.GroupStore.GroupCount() + +} + +func (s *RetryLayerGroupStore) GroupCountWithAllowReference() (int64, *model.AppError) { + + return s.GroupStore.GroupCountWithAllowReference() + +} + +func (s *RetryLayerGroupStore) GroupMemberCount() (int64, *model.AppError) { + + return s.GroupStore.GroupMemberCount() + +} + +func (s *RetryLayerGroupStore) GroupTeamCount() (int64, *model.AppError) { + + return s.GroupStore.GroupTeamCount() + +} + +func (s *RetryLayerGroupStore) PermanentDeleteMembersByUser(userId string) *model.AppError { + + return s.GroupStore.PermanentDeleteMembersByUser(userId) + +} + +func (s *RetryLayerGroupStore) PermittedSyncableAdmins(syncableID string, syncableType model.GroupSyncableType) ([]string, *model.AppError) { + + return s.GroupStore.PermittedSyncableAdmins(syncableID, syncableType) + +} + +func (s *RetryLayerGroupStore) TeamMembersMinusGroupMembers(teamID string, groupIDs []string, page int, perPage int) ([]*model.UserWithGroups, *model.AppError) { + + return s.GroupStore.TeamMembersMinusGroupMembers(teamID, groupIDs, page, perPage) + +} + +func (s *RetryLayerGroupStore) TeamMembersToAdd(since int64, teamID *string) ([]*model.UserTeamIDPair, *model.AppError) { + + return s.GroupStore.TeamMembersToAdd(since, teamID) + +} + +func (s *RetryLayerGroupStore) TeamMembersToRemove(teamID *string) ([]*model.TeamMember, *model.AppError) { + + return s.GroupStore.TeamMembersToRemove(teamID) + +} + +func (s *RetryLayerGroupStore) Update(group *model.Group) (*model.Group, *model.AppError) { + + return s.GroupStore.Update(group) + +} + +func (s *RetryLayerGroupStore) UpdateGroupSyncable(groupSyncable *model.GroupSyncable) (*model.GroupSyncable, *model.AppError) { + + return s.GroupStore.UpdateGroupSyncable(groupSyncable) + +} + +func (s *RetryLayerGroupStore) UpsertMember(groupID string, userID string) (*model.GroupMember, *model.AppError) { + + return s.GroupStore.UpsertMember(groupID, userID) + +} + +func (s *RetryLayerJobStore) Delete(id string) (string, *model.AppError) { + + return s.JobStore.Delete(id) + +} + +func (s *RetryLayerJobStore) Get(id string) (*model.Job, *model.AppError) { + + return s.JobStore.Get(id) + +} + +func (s *RetryLayerJobStore) GetAllByStatus(status string) ([]*model.Job, *model.AppError) { + + return s.JobStore.GetAllByStatus(status) + +} + +func (s *RetryLayerJobStore) GetAllByType(jobType string) ([]*model.Job, *model.AppError) { + + return s.JobStore.GetAllByType(jobType) + +} + +func (s *RetryLayerJobStore) GetAllByTypePage(jobType string, offset int, limit int) ([]*model.Job, *model.AppError) { + + return s.JobStore.GetAllByTypePage(jobType, offset, limit) + +} + +func (s *RetryLayerJobStore) GetAllPage(offset int, limit int) ([]*model.Job, *model.AppError) { + + return s.JobStore.GetAllPage(offset, limit) + +} + +func (s *RetryLayerJobStore) GetCountByStatusAndType(status string, jobType string) (int64, *model.AppError) { + + return s.JobStore.GetCountByStatusAndType(status, jobType) + +} + +func (s *RetryLayerJobStore) GetNewestJobByStatusAndType(status string, jobType string) (*model.Job, *model.AppError) { + + return s.JobStore.GetNewestJobByStatusAndType(status, jobType) + +} + +func (s *RetryLayerJobStore) Save(job *model.Job) (*model.Job, *model.AppError) { + + return s.JobStore.Save(job) + +} + +func (s *RetryLayerJobStore) UpdateOptimistically(job *model.Job, currentStatus string) (bool, *model.AppError) { + + return s.JobStore.UpdateOptimistically(job, currentStatus) + +} + +func (s *RetryLayerJobStore) UpdateStatus(id string, status string) (*model.Job, *model.AppError) { + + return s.JobStore.UpdateStatus(id, status) + +} + +func (s *RetryLayerJobStore) UpdateStatusOptimistically(id string, currentStatus string, newStatus string) (bool, *model.AppError) { + + return s.JobStore.UpdateStatusOptimistically(id, currentStatus, newStatus) + +} + +func (s *RetryLayerLicenseStore) Get(id string) (*model.LicenseRecord, error) { + + tries := 0 + for { + result, err := s.LicenseStore.Get(id) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerLicenseStore) Save(license *model.LicenseRecord) (*model.LicenseRecord, error) { + + tries := 0 + for { + result, err := s.LicenseStore.Save(license) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerLinkMetadataStore) Get(url string, timestamp int64) (*model.LinkMetadata, error) { + + tries := 0 + for { + result, err := s.LinkMetadataStore.Get(url, timestamp) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerLinkMetadataStore) Save(linkMetadata *model.LinkMetadata) (*model.LinkMetadata, error) { + + tries := 0 + for { + result, err := s.LinkMetadataStore.Save(linkMetadata) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerOAuthStore) DeleteApp(id string) error { + + tries := 0 + for { + err := s.OAuthStore.DeleteApp(id) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerOAuthStore) GetAccessData(token string) (*model.AccessData, error) { + + tries := 0 + for { + result, err := s.OAuthStore.GetAccessData(token) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerOAuthStore) GetAccessDataByRefreshToken(token string) (*model.AccessData, error) { + + tries := 0 + for { + result, err := s.OAuthStore.GetAccessDataByRefreshToken(token) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerOAuthStore) GetAccessDataByUserForApp(userId string, clientId string) ([]*model.AccessData, error) { + + tries := 0 + for { + result, err := s.OAuthStore.GetAccessDataByUserForApp(userId, clientId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerOAuthStore) GetApp(id string) (*model.OAuthApp, error) { + + tries := 0 + for { + result, err := s.OAuthStore.GetApp(id) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerOAuthStore) GetAppByUser(userId string, offset int, limit int) ([]*model.OAuthApp, error) { + + tries := 0 + for { + result, err := s.OAuthStore.GetAppByUser(userId, offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerOAuthStore) GetApps(offset int, limit int) ([]*model.OAuthApp, error) { + + tries := 0 + for { + result, err := s.OAuthStore.GetApps(offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerOAuthStore) GetAuthData(code string) (*model.AuthData, error) { + + tries := 0 + for { + result, err := s.OAuthStore.GetAuthData(code) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerOAuthStore) GetAuthorizedApps(userId string, offset int, limit int) ([]*model.OAuthApp, error) { + + tries := 0 + for { + result, err := s.OAuthStore.GetAuthorizedApps(userId, offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerOAuthStore) GetPreviousAccessData(userId string, clientId string) (*model.AccessData, error) { + + tries := 0 + for { + result, err := s.OAuthStore.GetPreviousAccessData(userId, clientId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerOAuthStore) PermanentDeleteAuthDataByUser(userId string) error { + + tries := 0 + for { + err := s.OAuthStore.PermanentDeleteAuthDataByUser(userId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerOAuthStore) RemoveAccessData(token string) error { + + tries := 0 + for { + err := s.OAuthStore.RemoveAccessData(token) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerOAuthStore) RemoveAllAccessData() error { + + tries := 0 + for { + err := s.OAuthStore.RemoveAllAccessData() + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerOAuthStore) RemoveAuthData(code string) error { + + tries := 0 + for { + err := s.OAuthStore.RemoveAuthData(code) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerOAuthStore) SaveAccessData(accessData *model.AccessData) (*model.AccessData, error) { + + tries := 0 + for { + result, err := s.OAuthStore.SaveAccessData(accessData) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerOAuthStore) SaveApp(app *model.OAuthApp) (*model.OAuthApp, error) { + + tries := 0 + for { + result, err := s.OAuthStore.SaveApp(app) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerOAuthStore) SaveAuthData(authData *model.AuthData) (*model.AuthData, error) { + + tries := 0 + for { + result, err := s.OAuthStore.SaveAuthData(authData) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerOAuthStore) UpdateAccessData(accessData *model.AccessData) (*model.AccessData, error) { + + tries := 0 + for { + result, err := s.OAuthStore.UpdateAccessData(accessData) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerOAuthStore) UpdateApp(app *model.OAuthApp) (*model.OAuthApp, error) { + + tries := 0 + for { + result, err := s.OAuthStore.UpdateApp(app) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerPluginStore) CompareAndDelete(keyVal *model.PluginKeyValue, oldValue []byte) (bool, *model.AppError) { + + return s.PluginStore.CompareAndDelete(keyVal, oldValue) + +} + +func (s *RetryLayerPluginStore) CompareAndSet(keyVal *model.PluginKeyValue, oldValue []byte) (bool, *model.AppError) { + + return s.PluginStore.CompareAndSet(keyVal, oldValue) + +} + +func (s *RetryLayerPluginStore) Delete(pluginId string, key string) *model.AppError { + + return s.PluginStore.Delete(pluginId, key) + +} + +func (s *RetryLayerPluginStore) DeleteAllExpired() *model.AppError { + + return s.PluginStore.DeleteAllExpired() + +} + +func (s *RetryLayerPluginStore) DeleteAllForPlugin(PluginId string) *model.AppError { + + return s.PluginStore.DeleteAllForPlugin(PluginId) + +} + +func (s *RetryLayerPluginStore) Get(pluginId string, key string) (*model.PluginKeyValue, *model.AppError) { + + return s.PluginStore.Get(pluginId, key) + +} + +func (s *RetryLayerPluginStore) List(pluginId string, page int, perPage int) ([]string, *model.AppError) { + + return s.PluginStore.List(pluginId, page, perPage) + +} + +func (s *RetryLayerPluginStore) SaveOrUpdate(keyVal *model.PluginKeyValue) (*model.PluginKeyValue, *model.AppError) { + + return s.PluginStore.SaveOrUpdate(keyVal) + +} + +func (s *RetryLayerPluginStore) SetWithOptions(pluginId string, key string, value []byte, options model.PluginKVSetOptions) (bool, *model.AppError) { + + return s.PluginStore.SetWithOptions(pluginId, key, value, options) + +} + +func (s *RetryLayerPostStore) AnalyticsPostCount(teamId string, mustHaveFile bool, mustHaveHashtag bool) (int64, *model.AppError) { + + return s.PostStore.AnalyticsPostCount(teamId, mustHaveFile, mustHaveHashtag) + +} + +func (s *RetryLayerPostStore) AnalyticsPostCountsByDay(options *model.AnalyticsPostCountsOptions) (model.AnalyticsRows, *model.AppError) { + + return s.PostStore.AnalyticsPostCountsByDay(options) + +} + +func (s *RetryLayerPostStore) AnalyticsUserCountsWithPostsByDay(teamId string) (model.AnalyticsRows, *model.AppError) { + + return s.PostStore.AnalyticsUserCountsWithPostsByDay(teamId) + +} + +func (s *RetryLayerPostStore) ClearCaches() { + + s.PostStore.ClearCaches() + +} + +func (s *RetryLayerPostStore) Delete(postId string, time int64, deleteByID string) *model.AppError { + + return s.PostStore.Delete(postId, time, deleteByID) + +} + +func (s *RetryLayerPostStore) Get(id string, skipFetchThreads bool) (*model.PostList, *model.AppError) { + + return s.PostStore.Get(id, skipFetchThreads) + +} + +func (s *RetryLayerPostStore) GetDirectPostParentsForExportAfter(limit int, afterId string) ([]*model.DirectPostForExport, *model.AppError) { + + return s.PostStore.GetDirectPostParentsForExportAfter(limit, afterId) + +} + +func (s *RetryLayerPostStore) GetEtag(channelId string, allowFromCache bool) string { + + return s.PostStore.GetEtag(channelId, allowFromCache) + +} + +func (s *RetryLayerPostStore) GetFlaggedPosts(userId string, offset int, limit int) (*model.PostList, *model.AppError) { + + return s.PostStore.GetFlaggedPosts(userId, offset, limit) + +} + +func (s *RetryLayerPostStore) GetFlaggedPostsForChannel(userId string, channelId string, offset int, limit int) (*model.PostList, *model.AppError) { + + return s.PostStore.GetFlaggedPostsForChannel(userId, channelId, offset, limit) + +} + +func (s *RetryLayerPostStore) GetFlaggedPostsForTeam(userId string, teamId string, offset int, limit int) (*model.PostList, *model.AppError) { + + return s.PostStore.GetFlaggedPostsForTeam(userId, teamId, offset, limit) + +} + +func (s *RetryLayerPostStore) GetMaxPostSize() int { + + return s.PostStore.GetMaxPostSize() + +} + +func (s *RetryLayerPostStore) GetOldest() (*model.Post, *model.AppError) { + + return s.PostStore.GetOldest() + +} + +func (s *RetryLayerPostStore) GetOldestEntityCreationTime() (int64, *model.AppError) { + + return s.PostStore.GetOldestEntityCreationTime() + +} + +func (s *RetryLayerPostStore) GetParentsForExportAfter(limit int, afterId string) ([]*model.PostForExport, *model.AppError) { + + return s.PostStore.GetParentsForExportAfter(limit, afterId) + +} + +func (s *RetryLayerPostStore) GetPostAfterTime(channelId string, time int64) (*model.Post, *model.AppError) { + + return s.PostStore.GetPostAfterTime(channelId, time) + +} + +func (s *RetryLayerPostStore) GetPostIdAfterTime(channelId string, time int64) (string, *model.AppError) { + + return s.PostStore.GetPostIdAfterTime(channelId, time) + +} + +func (s *RetryLayerPostStore) GetPostIdBeforeTime(channelId string, time int64) (string, *model.AppError) { + + return s.PostStore.GetPostIdBeforeTime(channelId, time) + +} + +func (s *RetryLayerPostStore) GetPosts(options model.GetPostsOptions, allowFromCache bool) (*model.PostList, *model.AppError) { + + return s.PostStore.GetPosts(options, allowFromCache) + +} + +func (s *RetryLayerPostStore) GetPostsAfter(options model.GetPostsOptions) (*model.PostList, *model.AppError) { + + return s.PostStore.GetPostsAfter(options) + +} + +func (s *RetryLayerPostStore) GetPostsBatchForIndexing(startTime int64, endTime int64, limit int) ([]*model.PostForIndexing, *model.AppError) { + + return s.PostStore.GetPostsBatchForIndexing(startTime, endTime, limit) + +} + +func (s *RetryLayerPostStore) GetPostsBefore(options model.GetPostsOptions) (*model.PostList, *model.AppError) { + + return s.PostStore.GetPostsBefore(options) + +} + +func (s *RetryLayerPostStore) GetPostsByIds(postIds []string) ([]*model.Post, *model.AppError) { + + return s.PostStore.GetPostsByIds(postIds) + +} + +func (s *RetryLayerPostStore) GetPostsCreatedAt(channelId string, time int64) ([]*model.Post, *model.AppError) { + + return s.PostStore.GetPostsCreatedAt(channelId, time) + +} + +func (s *RetryLayerPostStore) GetPostsSince(options model.GetPostsSinceOptions, allowFromCache bool) (*model.PostList, *model.AppError) { + + return s.PostStore.GetPostsSince(options, allowFromCache) + +} + +func (s *RetryLayerPostStore) GetRepliesForExport(parentId string) ([]*model.ReplyForExport, *model.AppError) { + + return s.PostStore.GetRepliesForExport(parentId) + +} + +func (s *RetryLayerPostStore) GetSingle(id string) (*model.Post, *model.AppError) { + + return s.PostStore.GetSingle(id) + +} + +func (s *RetryLayerPostStore) InvalidateLastPostTimeCache(channelId string) { + + s.PostStore.InvalidateLastPostTimeCache(channelId) + +} + +func (s *RetryLayerPostStore) Overwrite(post *model.Post) (*model.Post, *model.AppError) { + + return s.PostStore.Overwrite(post) + +} + +func (s *RetryLayerPostStore) OverwriteMultiple(posts []*model.Post) ([]*model.Post, int, *model.AppError) { + + return s.PostStore.OverwriteMultiple(posts) + +} + +func (s *RetryLayerPostStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, *model.AppError) { + + return s.PostStore.PermanentDeleteBatch(endTime, limit) + +} + +func (s *RetryLayerPostStore) PermanentDeleteByChannel(channelId string) *model.AppError { + + return s.PostStore.PermanentDeleteByChannel(channelId) + +} + +func (s *RetryLayerPostStore) PermanentDeleteByUser(userId string) *model.AppError { + + return s.PostStore.PermanentDeleteByUser(userId) + +} + +func (s *RetryLayerPostStore) Save(post *model.Post) (*model.Post, *model.AppError) { + + return s.PostStore.Save(post) + +} + +func (s *RetryLayerPostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, *model.AppError) { + + return s.PostStore.SaveMultiple(posts) + +} + +func (s *RetryLayerPostStore) Search(teamId string, userId string, params *model.SearchParams) (*model.PostList, *model.AppError) { + + return s.PostStore.Search(teamId, userId, params) + +} + +func (s *RetryLayerPostStore) SearchPostsInTeamForUser(paramsList []*model.SearchParams, userId string, teamId string, isOrSearch bool, includeDeletedChannels bool, page int, perPage int) (*model.PostSearchResults, *model.AppError) { + + return s.PostStore.SearchPostsInTeamForUser(paramsList, userId, teamId, isOrSearch, includeDeletedChannels, page, perPage) + +} + +func (s *RetryLayerPostStore) Update(newPost *model.Post, oldPost *model.Post) (*model.Post, *model.AppError) { + + return s.PostStore.Update(newPost, oldPost) + +} + +func (s *RetryLayerPreferenceStore) CleanupFlagsBatch(limit int64) (int64, error) { + + tries := 0 + for { + result, err := s.PreferenceStore.CleanupFlagsBatch(limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerPreferenceStore) Delete(userId string, category string, name string) error { + + tries := 0 + for { + err := s.PreferenceStore.Delete(userId, category, name) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerPreferenceStore) DeleteCategory(userId string, category string) error { + + tries := 0 + for { + err := s.PreferenceStore.DeleteCategory(userId, category) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerPreferenceStore) DeleteCategoryAndName(category string, name string) error { + + tries := 0 + for { + err := s.PreferenceStore.DeleteCategoryAndName(category, name) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerPreferenceStore) Get(userId string, category string, name string) (*model.Preference, error) { + + tries := 0 + for { + result, err := s.PreferenceStore.Get(userId, category, name) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerPreferenceStore) GetAll(userId string) (model.Preferences, error) { + + tries := 0 + for { + result, err := s.PreferenceStore.GetAll(userId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerPreferenceStore) GetCategory(userId string, category string) (model.Preferences, error) { + + tries := 0 + for { + result, err := s.PreferenceStore.GetCategory(userId, category) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerPreferenceStore) PermanentDeleteByUser(userId string) error { + + tries := 0 + for { + err := s.PreferenceStore.PermanentDeleteByUser(userId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerPreferenceStore) Save(preferences *model.Preferences) error { + + tries := 0 + for { + err := s.PreferenceStore.Save(preferences) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerReactionStore) BulkGetForPosts(postIds []string) ([]*model.Reaction, error) { + + tries := 0 + for { + result, err := s.ReactionStore.BulkGetForPosts(postIds) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerReactionStore) Delete(reaction *model.Reaction) (*model.Reaction, error) { + + tries := 0 + for { + result, err := s.ReactionStore.Delete(reaction) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerReactionStore) DeleteAllWithEmojiName(emojiName string) error { + + tries := 0 + for { + err := s.ReactionStore.DeleteAllWithEmojiName(emojiName) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerReactionStore) GetForPost(postId string, allowFromCache bool) ([]*model.Reaction, error) { + + tries := 0 + for { + result, err := s.ReactionStore.GetForPost(postId, allowFromCache) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerReactionStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, error) { + + tries := 0 + for { + result, err := s.ReactionStore.PermanentDeleteBatch(endTime, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerReactionStore) Save(reaction *model.Reaction) (*model.Reaction, error) { + + tries := 0 + for { + result, err := s.ReactionStore.Save(reaction) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerRoleStore) AllChannelSchemeRoles() ([]*model.Role, error) { + + tries := 0 + for { + result, err := s.RoleStore.AllChannelSchemeRoles() + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerRoleStore) ChannelHigherScopedPermissions(roleNames []string) (map[string]*model.RolePermissions, error) { + + tries := 0 + for { + result, err := s.RoleStore.ChannelHigherScopedPermissions(roleNames) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerRoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*model.Role, error) { + + tries := 0 + for { + result, err := s.RoleStore.ChannelRolesUnderTeamRole(roleName) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerRoleStore) Delete(roleId string) (*model.Role, error) { + + tries := 0 + for { + result, err := s.RoleStore.Delete(roleId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerRoleStore) Get(roleId string) (*model.Role, error) { + + tries := 0 + for { + result, err := s.RoleStore.Get(roleId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerRoleStore) GetAll() ([]*model.Role, error) { + + tries := 0 + for { + result, err := s.RoleStore.GetAll() + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerRoleStore) GetByName(name string) (*model.Role, error) { + + tries := 0 + for { + result, err := s.RoleStore.GetByName(name) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerRoleStore) GetByNames(names []string) ([]*model.Role, error) { + + tries := 0 + for { + result, err := s.RoleStore.GetByNames(names) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerRoleStore) PermanentDeleteAll() error { + + tries := 0 + for { + err := s.RoleStore.PermanentDeleteAll() + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerRoleStore) Save(role *model.Role) (*model.Role, error) { + + tries := 0 + for { + result, err := s.RoleStore.Save(role) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSchemeStore) CountByScope(scope string) (int64, error) { + + tries := 0 + for { + result, err := s.SchemeStore.CountByScope(scope) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSchemeStore) CountWithoutPermission(scope string, permissionID string, roleScope model.RoleScope, roleType model.RoleType) (int64, error) { + + tries := 0 + for { + result, err := s.SchemeStore.CountWithoutPermission(scope, permissionID, roleScope, roleType) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSchemeStore) Delete(schemeId string) (*model.Scheme, error) { + + tries := 0 + for { + result, err := s.SchemeStore.Delete(schemeId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSchemeStore) Get(schemeId string) (*model.Scheme, error) { + + tries := 0 + for { + result, err := s.SchemeStore.Get(schemeId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSchemeStore) GetAllPage(scope string, offset int, limit int) ([]*model.Scheme, error) { + + tries := 0 + for { + result, err := s.SchemeStore.GetAllPage(scope, offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSchemeStore) GetByName(schemeName string) (*model.Scheme, error) { + + tries := 0 + for { + result, err := s.SchemeStore.GetByName(schemeName) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSchemeStore) PermanentDeleteAll() error { + + tries := 0 + for { + err := s.SchemeStore.PermanentDeleteAll() + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerSchemeStore) Save(scheme *model.Scheme) (*model.Scheme, error) { + + tries := 0 + for { + result, err := s.SchemeStore.Save(scheme) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSessionStore) AnalyticsSessionCount() (int64, error) { + + tries := 0 + for { + result, err := s.SessionStore.AnalyticsSessionCount() + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSessionStore) Cleanup(expiryTime int64, batchSize int64) { + + s.SessionStore.Cleanup(expiryTime, batchSize) + +} + +func (s *RetryLayerSessionStore) Get(sessionIdOrToken string) (*model.Session, error) { + + tries := 0 + for { + result, err := s.SessionStore.Get(sessionIdOrToken) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSessionStore) GetSessions(userId string) ([]*model.Session, error) { + + tries := 0 + for { + result, err := s.SessionStore.GetSessions(userId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSessionStore) GetSessionsExpired(thresholdMillis int64, mobileOnly bool, unnotifiedOnly bool) ([]*model.Session, error) { + + tries := 0 + for { + result, err := s.SessionStore.GetSessionsExpired(thresholdMillis, mobileOnly, unnotifiedOnly) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSessionStore) GetSessionsWithActiveDeviceIds(userId string) ([]*model.Session, error) { + + tries := 0 + for { + result, err := s.SessionStore.GetSessionsWithActiveDeviceIds(userId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSessionStore) PermanentDeleteSessionsByUser(teamId string) error { + + tries := 0 + for { + err := s.SessionStore.PermanentDeleteSessionsByUser(teamId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerSessionStore) Remove(sessionIdOrToken string) error { + + tries := 0 + for { + err := s.SessionStore.Remove(sessionIdOrToken) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerSessionStore) RemoveAllSessions() error { + + tries := 0 + for { + err := s.SessionStore.RemoveAllSessions() + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerSessionStore) Save(session *model.Session) (*model.Session, error) { + + tries := 0 + for { + result, err := s.SessionStore.Save(session) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSessionStore) UpdateDeviceId(id string, deviceId string, expiresAt int64) (string, error) { + + tries := 0 + for { + result, err := s.SessionStore.UpdateDeviceId(id, deviceId, expiresAt) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerSessionStore) UpdateExpiredNotify(sessionid string, notified bool) error { + + tries := 0 + for { + err := s.SessionStore.UpdateExpiredNotify(sessionid, notified) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerSessionStore) UpdateExpiresAt(sessionId string, time int64) error { + + tries := 0 + for { + err := s.SessionStore.UpdateExpiresAt(sessionId, time) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerSessionStore) UpdateLastActivityAt(sessionId string, time int64) error { + + tries := 0 + for { + err := s.SessionStore.UpdateLastActivityAt(sessionId, time) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerSessionStore) UpdateProps(session *model.Session) error { + + tries := 0 + for { + err := s.SessionStore.UpdateProps(session) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerSessionStore) UpdateRoles(userId string, roles string) (string, error) { + + tries := 0 + for { + result, err := s.SessionStore.UpdateRoles(userId, roles) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerStatusStore) Get(userId string) (*model.Status, *model.AppError) { + + return s.StatusStore.Get(userId) + +} + +func (s *RetryLayerStatusStore) GetByIds(userIds []string) ([]*model.Status, *model.AppError) { + + return s.StatusStore.GetByIds(userIds) + +} + +func (s *RetryLayerStatusStore) GetTotalActiveUsersCount() (int64, *model.AppError) { + + return s.StatusStore.GetTotalActiveUsersCount() + +} + +func (s *RetryLayerStatusStore) ResetAll() *model.AppError { + + return s.StatusStore.ResetAll() + +} + +func (s *RetryLayerStatusStore) SaveOrUpdate(status *model.Status) *model.AppError { + + return s.StatusStore.SaveOrUpdate(status) + +} + +func (s *RetryLayerStatusStore) UpdateLastActivityAt(userId string, lastActivityAt int64) *model.AppError { + + return s.StatusStore.UpdateLastActivityAt(userId, lastActivityAt) + +} + +func (s *RetryLayerSystemStore) Get() (model.StringMap, *model.AppError) { + + return s.SystemStore.Get() + +} + +func (s *RetryLayerSystemStore) GetByName(name string) (*model.System, *model.AppError) { + + return s.SystemStore.GetByName(name) + +} + +func (s *RetryLayerSystemStore) InsertIfExists(system *model.System) (*model.System, *model.AppError) { + + return s.SystemStore.InsertIfExists(system) + +} + +func (s *RetryLayerSystemStore) PermanentDeleteByName(name string) (*model.System, *model.AppError) { + + return s.SystemStore.PermanentDeleteByName(name) + +} + +func (s *RetryLayerSystemStore) Save(system *model.System) *model.AppError { + + return s.SystemStore.Save(system) + +} + +func (s *RetryLayerSystemStore) SaveOrUpdate(system *model.System) *model.AppError { + + return s.SystemStore.SaveOrUpdate(system) + +} + +func (s *RetryLayerSystemStore) Update(system *model.System) *model.AppError { + + return s.SystemStore.Update(system) + +} + +func (s *RetryLayerTeamStore) AnalyticsGetTeamCountForScheme(schemeId string) (int64, *model.AppError) { + + return s.TeamStore.AnalyticsGetTeamCountForScheme(schemeId) + +} + +func (s *RetryLayerTeamStore) AnalyticsPrivateTeamCount() (int64, *model.AppError) { + + return s.TeamStore.AnalyticsPrivateTeamCount() + +} + +func (s *RetryLayerTeamStore) AnalyticsPublicTeamCount() (int64, *model.AppError) { + + return s.TeamStore.AnalyticsPublicTeamCount() + +} + +func (s *RetryLayerTeamStore) AnalyticsTeamCount(includeDeleted bool) (int64, *model.AppError) { + + return s.TeamStore.AnalyticsTeamCount(includeDeleted) + +} + +func (s *RetryLayerTeamStore) ClearAllCustomRoleAssignments() *model.AppError { + + return s.TeamStore.ClearAllCustomRoleAssignments() + +} + +func (s *RetryLayerTeamStore) ClearCaches() { + + s.TeamStore.ClearCaches() + +} + +func (s *RetryLayerTeamStore) Get(id string) (*model.Team, *model.AppError) { + + return s.TeamStore.Get(id) + +} + +func (s *RetryLayerTeamStore) GetActiveMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, *model.AppError) { + + return s.TeamStore.GetActiveMemberCount(teamId, restrictions) + +} + +func (s *RetryLayerTeamStore) GetAll() ([]*model.Team, *model.AppError) { + + return s.TeamStore.GetAll() + +} + +func (s *RetryLayerTeamStore) GetAllForExportAfter(limit int, afterId string) ([]*model.TeamForExport, *model.AppError) { + + return s.TeamStore.GetAllForExportAfter(limit, afterId) + +} + +func (s *RetryLayerTeamStore) GetAllPage(offset int, limit int) ([]*model.Team, *model.AppError) { + + return s.TeamStore.GetAllPage(offset, limit) + +} + +func (s *RetryLayerTeamStore) GetAllPrivateTeamListing() ([]*model.Team, *model.AppError) { + + return s.TeamStore.GetAllPrivateTeamListing() + +} + +func (s *RetryLayerTeamStore) GetAllPrivateTeamPageListing(offset int, limit int) ([]*model.Team, *model.AppError) { + + return s.TeamStore.GetAllPrivateTeamPageListing(offset, limit) + +} + +func (s *RetryLayerTeamStore) GetAllPublicTeamPageListing(offset int, limit int) ([]*model.Team, *model.AppError) { + + return s.TeamStore.GetAllPublicTeamPageListing(offset, limit) + +} + +func (s *RetryLayerTeamStore) GetAllTeamListing() ([]*model.Team, *model.AppError) { + + return s.TeamStore.GetAllTeamListing() + +} + +func (s *RetryLayerTeamStore) GetAllTeamPageListing(offset int, limit int) ([]*model.Team, *model.AppError) { + + return s.TeamStore.GetAllTeamPageListing(offset, limit) + +} + +func (s *RetryLayerTeamStore) GetByInviteId(inviteId string) (*model.Team, *model.AppError) { + + return s.TeamStore.GetByInviteId(inviteId) + +} + +func (s *RetryLayerTeamStore) GetByName(name string) (*model.Team, *model.AppError) { + + return s.TeamStore.GetByName(name) + +} + +func (s *RetryLayerTeamStore) GetByNames(name []string) ([]*model.Team, *model.AppError) { + + return s.TeamStore.GetByNames(name) + +} + +func (s *RetryLayerTeamStore) GetChannelUnreadsForAllTeams(excludeTeamId string, userId string) ([]*model.ChannelUnread, *model.AppError) { + + return s.TeamStore.GetChannelUnreadsForAllTeams(excludeTeamId, userId) + +} + +func (s *RetryLayerTeamStore) GetChannelUnreadsForTeam(teamId string, userId string) ([]*model.ChannelUnread, *model.AppError) { + + return s.TeamStore.GetChannelUnreadsForTeam(teamId, userId) + +} + +func (s *RetryLayerTeamStore) GetMember(teamId string, userId string) (*model.TeamMember, *model.AppError) { + + return s.TeamStore.GetMember(teamId, userId) + +} + +func (s *RetryLayerTeamStore) GetMembers(teamId string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, *model.AppError) { + + return s.TeamStore.GetMembers(teamId, offset, limit, teamMembersGetOptions) + +} + +func (s *RetryLayerTeamStore) GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) { + + return s.TeamStore.GetMembersByIds(teamId, userIds, restrictions) + +} + +func (s *RetryLayerTeamStore) GetTeamMembersForExport(userId string) ([]*model.TeamMemberForExport, *model.AppError) { + + return s.TeamStore.GetTeamMembersForExport(userId) + +} + +func (s *RetryLayerTeamStore) GetTeamsByScheme(schemeId string, offset int, limit int) ([]*model.Team, *model.AppError) { + + return s.TeamStore.GetTeamsByScheme(schemeId, offset, limit) + +} + +func (s *RetryLayerTeamStore) GetTeamsByUserId(userId string) ([]*model.Team, *model.AppError) { + + return s.TeamStore.GetTeamsByUserId(userId) + +} + +func (s *RetryLayerTeamStore) GetTeamsForUser(userId string) ([]*model.TeamMember, *model.AppError) { + + return s.TeamStore.GetTeamsForUser(userId) + +} + +func (s *RetryLayerTeamStore) GetTeamsForUserWithPagination(userId string, page int, perPage int) ([]*model.TeamMember, *model.AppError) { + + return s.TeamStore.GetTeamsForUserWithPagination(userId, page, perPage) + +} + +func (s *RetryLayerTeamStore) GetTotalMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, *model.AppError) { + + return s.TeamStore.GetTotalMemberCount(teamId, restrictions) + +} + +func (s *RetryLayerTeamStore) GetUserTeamIds(userId string, allowFromCache bool) ([]string, *model.AppError) { + + return s.TeamStore.GetUserTeamIds(userId, allowFromCache) + +} + +func (s *RetryLayerTeamStore) GroupSyncedTeamCount() (int64, *model.AppError) { + + return s.TeamStore.GroupSyncedTeamCount() + +} + +func (s *RetryLayerTeamStore) InvalidateAllTeamIdsForUser(userId string) { + + s.TeamStore.InvalidateAllTeamIdsForUser(userId) + +} + +func (s *RetryLayerTeamStore) MigrateTeamMembers(fromTeamId string, fromUserId string) (map[string]string, *model.AppError) { + + return s.TeamStore.MigrateTeamMembers(fromTeamId, fromUserId) + +} + +func (s *RetryLayerTeamStore) PermanentDelete(teamId string) *model.AppError { + + return s.TeamStore.PermanentDelete(teamId) + +} + +func (s *RetryLayerTeamStore) RemoveAllMembersByTeam(teamId string) *model.AppError { + + return s.TeamStore.RemoveAllMembersByTeam(teamId) + +} + +func (s *RetryLayerTeamStore) RemoveAllMembersByUser(userId string) *model.AppError { + + return s.TeamStore.RemoveAllMembersByUser(userId) + +} + +func (s *RetryLayerTeamStore) RemoveMember(teamId string, userId string) *model.AppError { + + return s.TeamStore.RemoveMember(teamId, userId) + +} + +func (s *RetryLayerTeamStore) RemoveMembers(teamId string, userIds []string) *model.AppError { + + return s.TeamStore.RemoveMembers(teamId, userIds) + +} + +func (s *RetryLayerTeamStore) ResetAllTeamSchemes() *model.AppError { + + return s.TeamStore.ResetAllTeamSchemes() + +} + +func (s *RetryLayerTeamStore) Save(team *model.Team) (*model.Team, *model.AppError) { + + return s.TeamStore.Save(team) + +} + +func (s *RetryLayerTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, *model.AppError) { + + return s.TeamStore.SaveMember(member, maxUsersPerTeam) + +} + +func (s *RetryLayerTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, *model.AppError) { + + return s.TeamStore.SaveMultipleMembers(members, maxUsersPerTeam) + +} + +func (s *RetryLayerTeamStore) SearchAll(term string, opts *model.TeamSearch) ([]*model.Team, *model.AppError) { + + return s.TeamStore.SearchAll(term, opts) + +} + +func (s *RetryLayerTeamStore) SearchAllPaged(term string, opts *model.TeamSearch) ([]*model.Team, int64, *model.AppError) { + + return s.TeamStore.SearchAllPaged(term, opts) + +} + +func (s *RetryLayerTeamStore) SearchOpen(term string) ([]*model.Team, *model.AppError) { + + return s.TeamStore.SearchOpen(term) + +} + +func (s *RetryLayerTeamStore) SearchPrivate(term string) ([]*model.Team, *model.AppError) { + + return s.TeamStore.SearchPrivate(term) + +} + +func (s *RetryLayerTeamStore) Update(team *model.Team) (*model.Team, *model.AppError) { + + return s.TeamStore.Update(team) + +} + +func (s *RetryLayerTeamStore) UpdateLastTeamIconUpdate(teamId string, curTime int64) *model.AppError { + + return s.TeamStore.UpdateLastTeamIconUpdate(teamId, curTime) + +} + +func (s *RetryLayerTeamStore) UpdateMember(member *model.TeamMember) (*model.TeamMember, *model.AppError) { + + return s.TeamStore.UpdateMember(member) + +} + +func (s *RetryLayerTeamStore) UpdateMembersRole(teamID string, userIDs []string) *model.AppError { + + return s.TeamStore.UpdateMembersRole(teamID, userIDs) + +} + +func (s *RetryLayerTeamStore) UpdateMultipleMembers(members []*model.TeamMember) ([]*model.TeamMember, *model.AppError) { + + return s.TeamStore.UpdateMultipleMembers(members) + +} + +func (s *RetryLayerTeamStore) UserBelongsToTeams(userId string, teamIds []string) (bool, *model.AppError) { + + return s.TeamStore.UserBelongsToTeams(userId, teamIds) + +} + +func (s *RetryLayerTermsOfServiceStore) Get(id string, allowFromCache bool) (*model.TermsOfService, error) { + + tries := 0 + for { + result, err := s.TermsOfServiceStore.Get(id, allowFromCache) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerTermsOfServiceStore) GetLatest(allowFromCache bool) (*model.TermsOfService, error) { + + tries := 0 + for { + result, err := s.TermsOfServiceStore.GetLatest(allowFromCache) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerTermsOfServiceStore) Save(termsOfService *model.TermsOfService) (*model.TermsOfService, error) { + + tries := 0 + for { + result, err := s.TermsOfServiceStore.Save(termsOfService) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerTokenStore) Cleanup() { + + s.TokenStore.Cleanup() + +} + +func (s *RetryLayerTokenStore) Delete(token string) error { + + tries := 0 + for { + err := s.TokenStore.Delete(token) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerTokenStore) GetByToken(token string) (*model.Token, error) { + + tries := 0 + for { + result, err := s.TokenStore.GetByToken(token) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerTokenStore) RemoveAllTokensByType(tokenType string) error { + + tries := 0 + for { + err := s.TokenStore.RemoveAllTokensByType(tokenType) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerTokenStore) Save(recovery *model.Token) error { + + tries := 0 + for { + err := s.TokenStore.Save(recovery) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerUserStore) AnalyticsActiveCount(time int64, options model.UserCountOptions) (int64, *model.AppError) { + + return s.UserStore.AnalyticsActiveCount(time, options) + +} + +func (s *RetryLayerUserStore) AnalyticsGetGuestCount() (int64, *model.AppError) { + + return s.UserStore.AnalyticsGetGuestCount() + +} + +func (s *RetryLayerUserStore) AnalyticsGetInactiveUsersCount() (int64, *model.AppError) { + + return s.UserStore.AnalyticsGetInactiveUsersCount() + +} + +func (s *RetryLayerUserStore) AnalyticsGetSystemAdminCount() (int64, *model.AppError) { + + return s.UserStore.AnalyticsGetSystemAdminCount() + +} + +func (s *RetryLayerUserStore) AutocompleteUsersInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, *model.AppError) { + + return s.UserStore.AutocompleteUsersInChannel(teamId, channelId, term, options) + +} + +func (s *RetryLayerUserStore) ClearAllCustomRoleAssignments() *model.AppError { + + return s.UserStore.ClearAllCustomRoleAssignments() + +} + +func (s *RetryLayerUserStore) ClearCaches() { + + s.UserStore.ClearCaches() + +} + +func (s *RetryLayerUserStore) Count(options model.UserCountOptions) (int64, *model.AppError) { + + return s.UserStore.Count(options) + +} + +func (s *RetryLayerUserStore) DeactivateGuests() ([]string, *model.AppError) { + + return s.UserStore.DeactivateGuests() + +} + +func (s *RetryLayerUserStore) DemoteUserToGuest(userID string) *model.AppError { + + return s.UserStore.DemoteUserToGuest(userID) + +} + +func (s *RetryLayerUserStore) Get(id string) (*model.User, *model.AppError) { + + return s.UserStore.Get(id) + +} + +func (s *RetryLayerUserStore) GetAll() ([]*model.User, *model.AppError) { + + return s.UserStore.GetAll() + +} + +func (s *RetryLayerUserStore) GetAllAfter(limit int, afterId string) ([]*model.User, *model.AppError) { + + return s.UserStore.GetAllAfter(limit, afterId) + +} + +func (s *RetryLayerUserStore) GetAllNotInAuthService(authServices []string) ([]*model.User, *model.AppError) { + + return s.UserStore.GetAllNotInAuthService(authServices) + +} + +func (s *RetryLayerUserStore) GetAllProfiles(options *model.UserGetOptions) ([]*model.User, *model.AppError) { + + return s.UserStore.GetAllProfiles(options) + +} + +func (s *RetryLayerUserStore) GetAllProfilesInChannel(channelId string, allowFromCache bool) (map[string]*model.User, *model.AppError) { + + return s.UserStore.GetAllProfilesInChannel(channelId, allowFromCache) + +} + +func (s *RetryLayerUserStore) GetAllUsingAuthService(authService string) ([]*model.User, *model.AppError) { + + return s.UserStore.GetAllUsingAuthService(authService) + +} + +func (s *RetryLayerUserStore) GetAnyUnreadPostCountForChannel(userId string, channelId string) (int64, *model.AppError) { + + return s.UserStore.GetAnyUnreadPostCountForChannel(userId, channelId) + +} + +func (s *RetryLayerUserStore) GetByAuth(authData *string, authService string) (*model.User, *model.AppError) { + + return s.UserStore.GetByAuth(authData, authService) + +} + +func (s *RetryLayerUserStore) GetByEmail(email string) (*model.User, *model.AppError) { + + return s.UserStore.GetByEmail(email) + +} + +func (s *RetryLayerUserStore) GetByUsername(username string) (*model.User, *model.AppError) { + + return s.UserStore.GetByUsername(username) + +} + +func (s *RetryLayerUserStore) GetChannelGroupUsers(channelID string) ([]*model.User, *model.AppError) { + + return s.UserStore.GetChannelGroupUsers(channelID) + +} + +func (s *RetryLayerUserStore) GetEtagForAllProfiles() string { + + return s.UserStore.GetEtagForAllProfiles() + +} + +func (s *RetryLayerUserStore) GetEtagForProfiles(teamId string) string { + + return s.UserStore.GetEtagForProfiles(teamId) + +} + +func (s *RetryLayerUserStore) GetEtagForProfilesNotInTeam(teamId string) string { + + return s.UserStore.GetEtagForProfilesNotInTeam(teamId) + +} + +func (s *RetryLayerUserStore) GetForLogin(loginId string, allowSignInWithUsername bool, allowSignInWithEmail bool) (*model.User, *model.AppError) { + + return s.UserStore.GetForLogin(loginId, allowSignInWithUsername, allowSignInWithEmail) + +} + +func (s *RetryLayerUserStore) GetKnownUsers(userID string) ([]string, *model.AppError) { + + return s.UserStore.GetKnownUsers(userID) + +} + +func (s *RetryLayerUserStore) GetNewUsersForTeam(teamId string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { + + return s.UserStore.GetNewUsersForTeam(teamId, offset, limit, viewRestrictions) + +} + +func (s *RetryLayerUserStore) GetProfileByGroupChannelIdsForUser(userId string, channelIds []string) (map[string][]*model.User, *model.AppError) { + + return s.UserStore.GetProfileByGroupChannelIdsForUser(userId, channelIds) + +} + +func (s *RetryLayerUserStore) GetProfileByIds(userIds []string, options *store.UserGetByIdsOpts, allowFromCache bool) ([]*model.User, *model.AppError) { + + return s.UserStore.GetProfileByIds(userIds, options, allowFromCache) + +} + +func (s *RetryLayerUserStore) GetProfiles(options *model.UserGetOptions) ([]*model.User, *model.AppError) { + + return s.UserStore.GetProfiles(options) + +} + +func (s *RetryLayerUserStore) GetProfilesByUsernames(usernames []string, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { + + return s.UserStore.GetProfilesByUsernames(usernames, viewRestrictions) + +} + +func (s *RetryLayerUserStore) GetProfilesInChannel(channelId string, offset int, limit int) ([]*model.User, *model.AppError) { + + return s.UserStore.GetProfilesInChannel(channelId, offset, limit) + +} + +func (s *RetryLayerUserStore) GetProfilesInChannelByStatus(channelId string, offset int, limit int) ([]*model.User, *model.AppError) { + + return s.UserStore.GetProfilesInChannelByStatus(channelId, offset, limit) + +} + +func (s *RetryLayerUserStore) GetProfilesNotInChannel(teamId string, channelId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { + + return s.UserStore.GetProfilesNotInChannel(teamId, channelId, groupConstrained, offset, limit, viewRestrictions) + +} + +func (s *RetryLayerUserStore) GetProfilesNotInTeam(teamId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { + + return s.UserStore.GetProfilesNotInTeam(teamId, groupConstrained, offset, limit, viewRestrictions) + +} + +func (s *RetryLayerUserStore) GetProfilesWithoutTeam(options *model.UserGetOptions) ([]*model.User, *model.AppError) { + + return s.UserStore.GetProfilesWithoutTeam(options) + +} + +func (s *RetryLayerUserStore) GetRecentlyActiveUsersForTeam(teamId string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { + + return s.UserStore.GetRecentlyActiveUsersForTeam(teamId, offset, limit, viewRestrictions) + +} + +func (s *RetryLayerUserStore) GetSystemAdminProfiles() (map[string]*model.User, *model.AppError) { + + return s.UserStore.GetSystemAdminProfiles() + +} + +func (s *RetryLayerUserStore) GetTeamGroupUsers(teamID string) ([]*model.User, *model.AppError) { + + return s.UserStore.GetTeamGroupUsers(teamID) + +} + +func (s *RetryLayerUserStore) GetUnreadCount(userId string) (int64, *model.AppError) { + + return s.UserStore.GetUnreadCount(userId) + +} + +func (s *RetryLayerUserStore) GetUnreadCountForChannel(userId string, channelId string) (int64, *model.AppError) { + + return s.UserStore.GetUnreadCountForChannel(userId, channelId) + +} + +func (s *RetryLayerUserStore) GetUsersBatchForIndexing(startTime int64, endTime int64, limit int) ([]*model.UserForIndexing, *model.AppError) { + + return s.UserStore.GetUsersBatchForIndexing(startTime, endTime, limit) + +} + +func (s *RetryLayerUserStore) InferSystemInstallDate() (int64, *model.AppError) { + + return s.UserStore.InferSystemInstallDate() + +} + +func (s *RetryLayerUserStore) InvalidateProfileCacheForUser(userId string) { + + s.UserStore.InvalidateProfileCacheForUser(userId) + +} + +func (s *RetryLayerUserStore) InvalidateProfilesInChannelCache(channelId string) { + + s.UserStore.InvalidateProfilesInChannelCache(channelId) + +} + +func (s *RetryLayerUserStore) InvalidateProfilesInChannelCacheByUser(userId string) { + + s.UserStore.InvalidateProfilesInChannelCacheByUser(userId) + +} + +func (s *RetryLayerUserStore) PermanentDelete(userId string) *model.AppError { + + return s.UserStore.PermanentDelete(userId) + +} + +func (s *RetryLayerUserStore) PromoteGuestToUser(userID string) *model.AppError { + + return s.UserStore.PromoteGuestToUser(userID) + +} + +func (s *RetryLayerUserStore) ResetLastPictureUpdate(userId string) *model.AppError { + + return s.UserStore.ResetLastPictureUpdate(userId) + +} + +func (s *RetryLayerUserStore) Save(user *model.User) (*model.User, *model.AppError) { + + return s.UserStore.Save(user) + +} + +func (s *RetryLayerUserStore) Search(teamId string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { + + return s.UserStore.Search(teamId, term, options) + +} + +func (s *RetryLayerUserStore) SearchInChannel(channelId string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { + + return s.UserStore.SearchInChannel(channelId, term, options) + +} + +func (s *RetryLayerUserStore) SearchInGroup(groupID string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { + + return s.UserStore.SearchInGroup(groupID, term, options) + +} + +func (s *RetryLayerUserStore) SearchNotInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { + + return s.UserStore.SearchNotInChannel(teamId, channelId, term, options) + +} + +func (s *RetryLayerUserStore) SearchNotInTeam(notInTeamId string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { + + return s.UserStore.SearchNotInTeam(notInTeamId, term, options) + +} + +func (s *RetryLayerUserStore) SearchWithoutTeam(term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { + + return s.UserStore.SearchWithoutTeam(term, options) + +} + +func (s *RetryLayerUserStore) Update(user *model.User, allowRoleUpdate bool) (*model.UserUpdate, *model.AppError) { + + return s.UserStore.Update(user, allowRoleUpdate) + +} + +func (s *RetryLayerUserStore) UpdateAuthData(userId string, service string, authData *string, email string, resetMfa bool) (string, *model.AppError) { + + return s.UserStore.UpdateAuthData(userId, service, authData, email, resetMfa) + +} + +func (s *RetryLayerUserStore) UpdateFailedPasswordAttempts(userId string, attempts int) *model.AppError { + + return s.UserStore.UpdateFailedPasswordAttempts(userId, attempts) + +} + +func (s *RetryLayerUserStore) UpdateLastPictureUpdate(userId string) *model.AppError { + + return s.UserStore.UpdateLastPictureUpdate(userId) + +} + +func (s *RetryLayerUserStore) UpdateMfaActive(userId string, active bool) *model.AppError { + + return s.UserStore.UpdateMfaActive(userId, active) + +} + +func (s *RetryLayerUserStore) UpdateMfaSecret(userId string, secret string) *model.AppError { + + return s.UserStore.UpdateMfaSecret(userId, secret) + +} + +func (s *RetryLayerUserStore) UpdatePassword(userId string, newPassword string) *model.AppError { + + return s.UserStore.UpdatePassword(userId, newPassword) + +} + +func (s *RetryLayerUserStore) UpdateUpdateAt(userId string) (int64, *model.AppError) { + + return s.UserStore.UpdateUpdateAt(userId) + +} + +func (s *RetryLayerUserStore) VerifyEmail(userId string, email string) (string, *model.AppError) { + + return s.UserStore.VerifyEmail(userId, email) + +} + +func (s *RetryLayerUserAccessTokenStore) Delete(tokenId string) error { + + tries := 0 + for { + err := s.UserAccessTokenStore.Delete(tokenId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerUserAccessTokenStore) DeleteAllForUser(userId string) error { + + tries := 0 + for { + err := s.UserAccessTokenStore.DeleteAllForUser(userId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerUserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, error) { + + tries := 0 + for { + result, err := s.UserAccessTokenStore.Get(tokenId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerUserAccessTokenStore) GetAll(offset int, limit int) ([]*model.UserAccessToken, error) { + + tries := 0 + for { + result, err := s.UserAccessTokenStore.GetAll(offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerUserAccessTokenStore) GetByToken(tokenString string) (*model.UserAccessToken, error) { + + tries := 0 + for { + result, err := s.UserAccessTokenStore.GetByToken(tokenString) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerUserAccessTokenStore) GetByUser(userId string, page int, perPage int) ([]*model.UserAccessToken, error) { + + tries := 0 + for { + result, err := s.UserAccessTokenStore.GetByUser(userId, page, perPage) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerUserAccessTokenStore) Save(token *model.UserAccessToken) (*model.UserAccessToken, error) { + + tries := 0 + for { + result, err := s.UserAccessTokenStore.Save(token) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerUserAccessTokenStore) Search(term string) ([]*model.UserAccessToken, error) { + + tries := 0 + for { + result, err := s.UserAccessTokenStore.Search(term) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerUserAccessTokenStore) UpdateTokenDisable(tokenId string) error { + + tries := 0 + for { + err := s.UserAccessTokenStore.UpdateTokenDisable(tokenId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerUserAccessTokenStore) UpdateTokenEnable(tokenId string) error { + + tries := 0 + for { + err := s.UserAccessTokenStore.UpdateTokenEnable(tokenId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerUserTermsOfServiceStore) Delete(userId string, termsOfServiceId string) error { + + tries := 0 + for { + err := s.UserTermsOfServiceStore.Delete(userId, termsOfServiceId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerUserTermsOfServiceStore) GetByUser(userId string) (*model.UserTermsOfService, error) { + + tries := 0 + for { + result, err := s.UserTermsOfServiceStore.GetByUser(userId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerUserTermsOfServiceStore) Save(userTermsOfService *model.UserTermsOfService) (*model.UserTermsOfService, error) { + + tries := 0 + for { + result, err := s.UserTermsOfServiceStore.Save(userTermsOfService) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) AnalyticsIncomingCount(teamId string) (int64, error) { + + tries := 0 + for { + result, err := s.WebhookStore.AnalyticsIncomingCount(teamId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) AnalyticsOutgoingCount(teamId string) (int64, error) { + + tries := 0 + for { + result, err := s.WebhookStore.AnalyticsOutgoingCount(teamId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) ClearCaches() { + + s.WebhookStore.ClearCaches() + +} + +func (s *RetryLayerWebhookStore) DeleteIncoming(webhookId string, time int64) error { + + tries := 0 + for { + err := s.WebhookStore.DeleteIncoming(webhookId, time) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerWebhookStore) DeleteOutgoing(webhookId string, time int64) error { + + tries := 0 + for { + err := s.WebhookStore.DeleteOutgoing(webhookId, time) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerWebhookStore) GetIncoming(id string, allowFromCache bool) (*model.IncomingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.GetIncoming(id, allowFromCache) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) GetIncomingByChannel(channelId string) ([]*model.IncomingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.GetIncomingByChannel(channelId) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) GetIncomingByTeam(teamId string, offset int, limit int) ([]*model.IncomingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.GetIncomingByTeam(teamId, offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) GetIncomingByTeamByUser(teamId string, userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.GetIncomingByTeamByUser(teamId, userId, offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) GetIncomingList(offset int, limit int) ([]*model.IncomingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.GetIncomingList(offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) GetIncomingListByUser(userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.GetIncomingListByUser(userId, offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) GetOutgoing(id string) (*model.OutgoingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.GetOutgoing(id) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) GetOutgoingByChannel(channelId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.GetOutgoingByChannel(channelId, offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) GetOutgoingByChannelByUser(channelId string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.GetOutgoingByChannelByUser(channelId, userId, offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) GetOutgoingByTeam(teamId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.GetOutgoingByTeam(teamId, offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) GetOutgoingByTeamByUser(teamId string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.GetOutgoingByTeamByUser(teamId, userId, offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) GetOutgoingList(offset int, limit int) ([]*model.OutgoingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.GetOutgoingList(offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) GetOutgoingListByUser(userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.GetOutgoingListByUser(userId, offset, limit) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) InvalidateWebhookCache(webhook string) { + + s.WebhookStore.InvalidateWebhookCache(webhook) + +} + +func (s *RetryLayerWebhookStore) PermanentDeleteIncomingByChannel(channelId string) error { + + tries := 0 + for { + err := s.WebhookStore.PermanentDeleteIncomingByChannel(channelId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerWebhookStore) PermanentDeleteIncomingByUser(userId string) error { + + tries := 0 + for { + err := s.WebhookStore.PermanentDeleteIncomingByUser(userId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerWebhookStore) PermanentDeleteOutgoingByChannel(channelId string) error { + + tries := 0 + for { + err := s.WebhookStore.PermanentDeleteOutgoingByChannel(channelId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerWebhookStore) PermanentDeleteOutgoingByUser(userId string) error { + + tries := 0 + for { + err := s.WebhookStore.PermanentDeleteOutgoingByUser(userId) + if err == nil { + return err + } + if !isRepeatableError(err) { + return err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return err + } + } + +} + +func (s *RetryLayerWebhookStore) SaveIncoming(webhook *model.IncomingWebhook) (*model.IncomingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.SaveIncoming(webhook) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) SaveOutgoing(webhook *model.OutgoingWebhook) (*model.OutgoingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.SaveOutgoing(webhook) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) UpdateIncoming(webhook *model.IncomingWebhook) (*model.IncomingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.UpdateIncoming(webhook) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayerWebhookStore) UpdateOutgoing(hook *model.OutgoingWebhook) (*model.OutgoingWebhook, error) { + + tries := 0 + for { + result, err := s.WebhookStore.UpdateOutgoing(hook) + if err == nil { + return result, err + } + if !isRepeatableError(err) { + return result, err + } + tries++ + if tries >= 3 { + err = errors.Wrap(err, "giving up after 3 consecutive repeatable transaction failures") + return result, err + } + } + +} + +func (s *RetryLayer) Close() { + s.Store.Close() +} + +func (s *RetryLayer) DropAllTables() { + s.Store.DropAllTables() +} + +func (s *RetryLayer) GetCurrentSchemaVersion() string { + return s.Store.GetCurrentSchemaVersion() +} + +func (s *RetryLayer) LockToMaster() { + s.Store.LockToMaster() +} + +func (s *RetryLayer) MarkSystemRanUnitTests() { + s.Store.MarkSystemRanUnitTests() +} + +func (s *RetryLayer) SetContext(context context.Context) { + s.Store.SetContext(context) +} + +func (s *RetryLayer) TotalMasterDbConnections() int { + return s.Store.TotalMasterDbConnections() +} + +func (s *RetryLayer) TotalReadDbConnections() int { + return s.Store.TotalReadDbConnections() +} + +func (s *RetryLayer) TotalSearchDbConnections() int { + return s.Store.TotalSearchDbConnections() +} + +func (s *RetryLayer) UnlockFromMaster() { + s.Store.UnlockFromMaster() +} + +func New(childStore store.Store) *RetryLayer { + newStore := RetryLayer{ + Store: childStore, + } + + newStore.AuditStore = &RetryLayerAuditStore{AuditStore: childStore.Audit(), Root: &newStore} + newStore.BotStore = &RetryLayerBotStore{BotStore: childStore.Bot(), Root: &newStore} + newStore.ChannelStore = &RetryLayerChannelStore{ChannelStore: childStore.Channel(), Root: &newStore} + newStore.ChannelMemberHistoryStore = &RetryLayerChannelMemberHistoryStore{ChannelMemberHistoryStore: childStore.ChannelMemberHistory(), Root: &newStore} + newStore.ClusterDiscoveryStore = &RetryLayerClusterDiscoveryStore{ClusterDiscoveryStore: childStore.ClusterDiscovery(), Root: &newStore} + newStore.CommandStore = &RetryLayerCommandStore{CommandStore: childStore.Command(), Root: &newStore} + newStore.CommandWebhookStore = &RetryLayerCommandWebhookStore{CommandWebhookStore: childStore.CommandWebhook(), Root: &newStore} + newStore.ComplianceStore = &RetryLayerComplianceStore{ComplianceStore: childStore.Compliance(), Root: &newStore} + newStore.EmojiStore = &RetryLayerEmojiStore{EmojiStore: childStore.Emoji(), Root: &newStore} + newStore.FileInfoStore = &RetryLayerFileInfoStore{FileInfoStore: childStore.FileInfo(), Root: &newStore} + newStore.GroupStore = &RetryLayerGroupStore{GroupStore: childStore.Group(), Root: &newStore} + newStore.JobStore = &RetryLayerJobStore{JobStore: childStore.Job(), Root: &newStore} + newStore.LicenseStore = &RetryLayerLicenseStore{LicenseStore: childStore.License(), Root: &newStore} + newStore.LinkMetadataStore = &RetryLayerLinkMetadataStore{LinkMetadataStore: childStore.LinkMetadata(), Root: &newStore} + newStore.OAuthStore = &RetryLayerOAuthStore{OAuthStore: childStore.OAuth(), Root: &newStore} + newStore.PluginStore = &RetryLayerPluginStore{PluginStore: childStore.Plugin(), Root: &newStore} + newStore.PostStore = &RetryLayerPostStore{PostStore: childStore.Post(), Root: &newStore} + newStore.PreferenceStore = &RetryLayerPreferenceStore{PreferenceStore: childStore.Preference(), Root: &newStore} + newStore.ReactionStore = &RetryLayerReactionStore{ReactionStore: childStore.Reaction(), Root: &newStore} + newStore.RoleStore = &RetryLayerRoleStore{RoleStore: childStore.Role(), Root: &newStore} + newStore.SchemeStore = &RetryLayerSchemeStore{SchemeStore: childStore.Scheme(), Root: &newStore} + newStore.SessionStore = &RetryLayerSessionStore{SessionStore: childStore.Session(), Root: &newStore} + newStore.StatusStore = &RetryLayerStatusStore{StatusStore: childStore.Status(), Root: &newStore} + newStore.SystemStore = &RetryLayerSystemStore{SystemStore: childStore.System(), Root: &newStore} + newStore.TeamStore = &RetryLayerTeamStore{TeamStore: childStore.Team(), Root: &newStore} + newStore.TermsOfServiceStore = &RetryLayerTermsOfServiceStore{TermsOfServiceStore: childStore.TermsOfService(), Root: &newStore} + newStore.TokenStore = &RetryLayerTokenStore{TokenStore: childStore.Token(), Root: &newStore} + newStore.UserStore = &RetryLayerUserStore{UserStore: childStore.User(), Root: &newStore} + newStore.UserAccessTokenStore = &RetryLayerUserAccessTokenStore{UserAccessTokenStore: childStore.UserAccessToken(), Root: &newStore} + newStore.UserTermsOfServiceStore = &RetryLayerUserTermsOfServiceStore{UserTermsOfServiceStore: childStore.UserTermsOfService(), Root: &newStore} + newStore.WebhookStore = &RetryLayerWebhookStore{WebhookStore: childStore.Webhook(), Root: &newStore} + return &newStore +} diff --git a/store/retrylayer/retrylayer_test.go b/store/retrylayer/retrylayer_test.go new file mode 100644 index 0000000000..4504a54ec2 --- /dev/null +++ b/store/retrylayer/retrylayer_test.go @@ -0,0 +1,117 @@ +// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. +// See LICENSE.txt for license information. + +package retrylayer + +import ( + "testing" + + "github.com/go-sql-driver/mysql" + "github.com/lib/pq" + "github.com/mattermost/mattermost-server/v5/model" + "github.com/mattermost/mattermost-server/v5/store/storetest/mocks" + "github.com/pkg/errors" +) + +func genStore() *mocks.Store { + mock := &mocks.Store{} + mock.On("Audit").Return(&mocks.AuditStore{}) + mock.On("Bot").Return(&mocks.BotStore{}) + mock.On("Channel").Return(&mocks.ChannelStore{}) + mock.On("ChannelMemberHistory").Return(&mocks.ChannelMemberHistoryStore{}) + mock.On("ClusterDiscovery").Return(&mocks.ClusterDiscoveryStore{}) + mock.On("Command").Return(&mocks.CommandStore{}) + mock.On("CommandWebhook").Return(&mocks.CommandWebhookStore{}) + mock.On("Compliance").Return(&mocks.ComplianceStore{}) + mock.On("Emoji").Return(&mocks.EmojiStore{}) + mock.On("FileInfo").Return(&mocks.FileInfoStore{}) + mock.On("Group").Return(&mocks.GroupStore{}) + mock.On("Job").Return(&mocks.JobStore{}) + mock.On("License").Return(&mocks.LicenseStore{}) + mock.On("LinkMetadata").Return(&mocks.LinkMetadataStore{}) + mock.On("OAuth").Return(&mocks.OAuthStore{}) + mock.On("Plugin").Return(&mocks.PluginStore{}) + mock.On("Post").Return(&mocks.PostStore{}) + mock.On("Preference").Return(&mocks.PreferenceStore{}) + mock.On("Reaction").Return(&mocks.ReactionStore{}) + mock.On("Role").Return(&mocks.RoleStore{}) + mock.On("Scheme").Return(&mocks.SchemeStore{}) + mock.On("Session").Return(&mocks.SessionStore{}) + mock.On("Status").Return(&mocks.StatusStore{}) + mock.On("System").Return(&mocks.SystemStore{}) + mock.On("Team").Return(&mocks.TeamStore{}) + mock.On("TermsOfService").Return(&mocks.TermsOfServiceStore{}) + mock.On("Token").Return(&mocks.TokenStore{}) + mock.On("User").Return(&mocks.UserStore{}) + mock.On("UserAccessToken").Return(&mocks.UserAccessTokenStore{}) + mock.On("UserTermsOfService").Return(&mocks.UserTermsOfServiceStore{}) + mock.On("Webhook").Return(&mocks.WebhookStore{}) + return mock +} + +func TestRetry(t *testing.T) { + t.Run("on regular error should not retry", func(t *testing.T) { + mock := genStore() + mockBotStore := mock.Bot().(*mocks.BotStore) + mockBotStore.On("Get", "test", false).Return(nil, errors.New("regular error")).Times(1) + mock.On("Bot").Return(&mockBotStore) + layer := New(mock) + layer.Bot().Get("test", false) + mockBotStore.AssertExpectations(t) + }) + t.Run("on success should not retry", func(t *testing.T) { + mock := genStore() + mockBotStore := mock.Bot().(*mocks.BotStore) + mockBotStore.On("Get", "test", false).Return(&model.Bot{}, nil).Times(1) + mock.On("Bot").Return(&mockBotStore) + layer := New(mock) + layer.Bot().Get("test", false) + mockBotStore.AssertExpectations(t) + }) + t.Run("on mysql repeatable error should retry", func(t *testing.T) { + mock := genStore() + mockBotStore := mock.Bot().(*mocks.BotStore) + mysqlErr := mysql.MySQLError{Number: uint16(1213), Message: "Deadlock"} + mockBotStore.On("Get", "test", false).Return(nil, errors.Wrap(&mysqlErr, "test-error")).Times(3) + mock.On("Bot").Return(&mockBotStore) + layer := New(mock) + layer.Bot().Get("test", false) + mockBotStore.AssertExpectations(t) + }) + t.Run("on mysql not repeatable error should not retry", func(t *testing.T) { + mock := genStore() + mockBotStore := mock.Bot().(*mocks.BotStore) + mysqlErr := mysql.MySQLError{Number: uint16(1000), Message: "Not repeatable error"} + mockBotStore.On("Get", "test", false).Return(nil, errors.Wrap(&mysqlErr, "test-error")).Times(1) + mock.On("Bot").Return(&mockBotStore) + layer := New(mock) + layer.Bot().Get("test", false) + mockBotStore.AssertExpectations(t) + }) + + t.Run("on postgres repeatable error should retry", func(t *testing.T) { + for _, errCode := range []string{"40001", "40P01"} { + t.Run("error "+errCode, func(t *testing.T) { + mock := genStore() + mockBotStore := mock.Bot().(*mocks.BotStore) + pqErr := pq.Error{Code: pq.ErrorCode(errCode)} + mockBotStore.On("Get", "test", false).Return(nil, errors.Wrap(&pqErr, "test-error")).Times(3) + mock.On("Bot").Return(&mockBotStore) + layer := New(mock) + layer.Bot().Get("test", false) + mockBotStore.AssertExpectations(t) + }) + } + }) + + t.Run("on postgres not repeatable error should not retry", func(t *testing.T) { + mock := genStore() + mockBotStore := mock.Bot().(*mocks.BotStore) + pqErr := pq.Error{Code: "20000"} + mockBotStore.On("Get", "test", false).Return(nil, errors.Wrap(&pqErr, "test-error")).Times(1) + mock.On("Bot").Return(&mockBotStore) + layer := New(mock) + layer.Bot().Get("test", false) + mockBotStore.AssertExpectations(t) + }) +} diff --git a/store/sqlstore/channel_store.go b/store/sqlstore/channel_store.go index fb2e03fb18..c5b8c8c74e 100644 --- a/store/sqlstore/channel_store.go +++ b/store/sqlstore/channel_store.go @@ -736,28 +736,25 @@ func (s SqlChannelStore) Save(channel *model.Channel, maxChannelsPerTeam int64) } var newChannel *model.Channel - err := store.WithDeadlockRetry(func() error { - transaction, err := s.GetMaster().Begin() - if err != nil { - return errors.Wrap(err, "begin_transaction") - } - defer finalizeTransaction(transaction) + transaction, err := s.GetMaster().Begin() + if err != nil { + return nil, errors.Wrap(err, "begin_transaction") + } + defer finalizeTransaction(transaction) - newChannel, err = s.saveChannelT(transaction, channel, maxChannelsPerTeam) - if err != nil { - return err - } + newChannel, err = s.saveChannelT(transaction, channel, maxChannelsPerTeam) + if err != nil { + return newChannel, err + } - // Additionally propagate the write to the PublicChannels table. - if err := s.upsertPublicChannelT(transaction, newChannel); err != nil { - return errors.Wrap(err, "upsert_public_channel") - } + // Additionally propagate the write to the PublicChannels table. + if err = s.upsertPublicChannelT(transaction, newChannel); err != nil { + return nil, errors.Wrap(err, "upsert_public_channel") + } - if err := transaction.Commit(); err != nil { - return errors.Wrap(err, "commit_transaction") - } - return nil - }) + if err = transaction.Commit(); err != nil { + return nil, errors.Wrap(err, "commit_transaction") + } // There are cases when in case of conflict, the original channel value is returned. // So we return both and let the caller do the checks. return newChannel, err diff --git a/store/sqlstore/supplier_reactions.go b/store/sqlstore/supplier_reactions.go index 40843a2aae..b31ff1c493 100644 --- a/store/sqlstore/supplier_reactions.go +++ b/store/sqlstore/supplier_reactions.go @@ -56,24 +56,18 @@ func (s *SqlReactionStore) Save(reaction *model.Reaction) (*model.Reaction, erro } func (s *SqlReactionStore) Delete(reaction *model.Reaction) (*model.Reaction, error) { - err := store.WithDeadlockRetry(func() error { - transaction, err := s.GetMaster().Begin() - if err != nil { - return errors.Wrap(err, "begin_transaction") - } - defer finalizeTransaction(transaction) - - if err := deleteReactionAndUpdatePost(transaction, reaction); err != nil { - return errors.Wrap(err, "deleteReactionAndUpdatePost") - } - - if err := transaction.Commit(); err != nil { - return errors.Wrap(err, "commit_transaction") - } - return nil - }) + transaction, err := s.GetMaster().Begin() if err != nil { - return nil, errors.Wrap(err, "failed to delete reaction") + return nil, errors.Wrap(err, "begin_transaction") + } + defer finalizeTransaction(transaction) + + if err := deleteReactionAndUpdatePost(transaction, reaction); err != nil { + return nil, errors.Wrap(err, "deleteReactionAndUpdatePost") + } + + if err := transaction.Commit(); err != nil { + return nil, errors.Wrap(err, "commit_transaction") } return reaction, nil @@ -127,28 +121,22 @@ func (s *SqlReactionStore) DeleteAllWithEmojiName(emojiName string) error { return errors.Wrapf(err, "failed to get Reactions with emojiName=%s", emojiName) } - err := store.WithDeadlockRetry(func() error { - _, err := s.GetMaster().Exec( - `DELETE FROM - Reactions - WHERE - EmojiName = :EmojiName`, map[string]interface{}{"EmojiName": emojiName}) - return err - }) + _, err := s.GetMaster().Exec( + `DELETE FROM + Reactions + WHERE + EmojiName = :EmojiName`, map[string]interface{}{"EmojiName": emojiName}) if err != nil { return errors.Wrapf(err, "failed to delete Reactions with emojiName=%s", emojiName) } for _, reaction := range reactions { reaction := reaction - err := store.WithDeadlockRetry(func() error { - _, err := s.GetMaster().Exec(UPDATE_POST_HAS_REACTIONS_ON_DELETE_QUERY, - map[string]interface{}{ - "PostId": reaction.PostId, - "UpdateAt": model.GetMillis(), - }) - return err - }) + _, err := s.GetMaster().Exec(UPDATE_POST_HAS_REACTIONS_ON_DELETE_QUERY, + map[string]interface{}{ + "PostId": reaction.PostId, + "UpdateAt": model.GetMillis(), + }) if err != nil { mlog.Warn("Unable to update Post.HasReactions while removing reactions", mlog.String("post_id", reaction.PostId), diff --git a/store/store.go b/store/store.go index 201a530e51..ac89e80e02 100644 --- a/store/store.go +++ b/store/store.go @@ -9,11 +9,7 @@ import ( "context" "time" - "github.com/mattermost/mattermost-server/v5/mlog" "github.com/mattermost/mattermost-server/v5/model" - - "github.com/go-sql-driver/mysql" - "github.com/pkg/errors" ) type StoreResult struct { @@ -775,31 +771,3 @@ type UserGetByIdsOpts struct { // Since filters the users based on their UpdateAt timestamp. Since int64 } - -const mySQLDeadlockCode = uint16(1213) - -// WithDeadlockRetry retries a given f if it throws a deadlock error. -// It breaks after a threshold and propagates the error upwards. -// TODO: This can be a separate retry layer in itself where transaction retries -// are automatically applied. -func WithDeadlockRetry(f func() error) error { - var err error - for i := 0; i < 3; i++ { - err = f() - if err == nil { - // No error, return nil. - return nil - } - // XXX: Possibly add check for postgres deadlocks later. - // But deadlocks are very rarely seen in postgres. - var mysqlErr *mysql.MySQLError - if errors.As(err, &mysqlErr) && mysqlErr.Number == mySQLDeadlockCode { - mlog.Warn("A deadlock happened. Retrying.", mlog.Err(err)) - // This is a deadlock, retry. - continue - } - // Some other error, return as-is. - return err - } - return errors.Wrap(err, "giving up after 3 consecutive deadlocks") -} diff --git a/store/store_test.go b/store/store_test.go deleted file mode 100644 index bf64a28ace..0000000000 --- a/store/store_test.go +++ /dev/null @@ -1,56 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See LICENSE.txt for license information. - -package store - -import ( - "testing" - - "github.com/go-sql-driver/mysql" - "github.com/stretchr/testify/assert" - "github.com/stretchr/testify/require" -) - -type deadlock struct { - numRetries int - hasRetried int -} - -func newDeadlock(numRetries int) *deadlock { - return &deadlock{ - numRetries: numRetries, - } -} - -func (d *deadlock) f() error { - if d.numRetries == d.hasRetried { - return nil - } - d.hasRetried++ - return &mysql.MySQLError{ - Number: mySQLDeadlockCode, - } -} - -func TestDeadlockRetry(t *testing.T) { - t.Run("NoDeadlock", func(t *testing.T) { - d := newDeadlock(0) - err := WithDeadlockRetry(d.f) - require.NoError(t, err) - assert.Equal(t, 0, d.hasRetried) - }) - - t.Run("1Deadlock", func(t *testing.T) { - d := newDeadlock(1) - err := WithDeadlockRetry(d.f) - require.NoError(t, err) - assert.Equal(t, 1, d.hasRetried) - }) - - t.Run("AlwaysDeadlock", func(t *testing.T) { - d := newDeadlock(4) - err := WithDeadlockRetry(d.f) - require.Error(t, err) - assert.Equal(t, 3, d.hasRetried) - }) -} diff --git a/store/storetest/reaction_store.go b/store/storetest/reaction_store.go index a3f5e4d681..e464cce1b6 100644 --- a/store/storetest/reaction_store.go +++ b/store/storetest/reaction_store.go @@ -9,6 +9,7 @@ import ( "github.com/mattermost/mattermost-server/v5/model" "github.com/mattermost/mattermost-server/v5/store" + "github.com/mattermost/mattermost-server/v5/store/retrylayer" "github.com/stretchr/testify/assert" "github.com/stretchr/testify/require" @@ -429,6 +430,8 @@ func testReactionBulkGetForPosts(t *testing.T, ss store.Store) { // testReactionDeadlock is a best-case attempt to recreate the deadlock scenario. // It at least deadlocks 2 times out of 5. func testReactionDeadlock(t *testing.T, ss store.Store) { + ss = retrylayer.New(ss) + post, err := ss.Post().Save(&model.Post{ ChannelId: model.NewId(), UserId: model.NewId(), diff --git a/store/timerlayer/timerlayer.go b/store/timerlayer/timerlayer.go index 58cbe25160..008818319b 100644 --- a/store/timerlayer/timerlayer.go +++ b/store/timerlayer/timerlayer.go @@ -333,209 +333,209 @@ type TimerLayerWebhookStore struct { func (s *TimerLayerAuditStore) Get(user_id string, offset int, limit int) (model.Audits, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.AuditStore.Get(user_id, offset, limit) + result, err := s.AuditStore.Get(user_id, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("AuditStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerAuditStore) PermanentDeleteByUser(userId string) error { start := timemodule.Now() - resultVar0 := s.AuditStore.PermanentDeleteByUser(userId) + err := s.AuditStore.PermanentDeleteByUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("AuditStore.PermanentDeleteByUser", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerAuditStore) Save(audit *model.Audit) error { start := timemodule.Now() - resultVar0 := s.AuditStore.Save(audit) + err := s.AuditStore.Save(audit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("AuditStore.Save", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerBotStore) Get(userId string, includeDeleted bool) (*model.Bot, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.BotStore.Get(userId, includeDeleted) + result, err := s.BotStore.Get(userId, includeDeleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("BotStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerBotStore) GetAll(options *model.BotGetOptions) ([]*model.Bot, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.BotStore.GetAll(options) + result, err := s.BotStore.GetAll(options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("BotStore.GetAll", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerBotStore) PermanentDelete(userId string) error { start := timemodule.Now() - resultVar0 := s.BotStore.PermanentDelete(userId) + err := s.BotStore.PermanentDelete(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("BotStore.PermanentDelete", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerBotStore) Save(bot *model.Bot) (*model.Bot, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.BotStore.Save(bot) + result, err := s.BotStore.Save(bot) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("BotStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerBotStore) Update(bot *model.Bot) (*model.Bot, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.BotStore.Update(bot) + result, err := s.BotStore.Update(bot) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("BotStore.Update", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) AnalyticsDeletedTypeCount(teamId string, channelType string) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.AnalyticsDeletedTypeCount(teamId, channelType) + result, err := s.ChannelStore.AnalyticsDeletedTypeCount(teamId, channelType) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.AnalyticsDeletedTypeCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) AnalyticsTypeCount(teamId string, channelType string) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.AnalyticsTypeCount(teamId, channelType) + result, err := s.ChannelStore.AnalyticsTypeCount(teamId, channelType) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.AnalyticsTypeCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) AutocompleteInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.AutocompleteInTeam(teamId, term, includeDeleted) + result, err := s.ChannelStore.AutocompleteInTeam(teamId, term, includeDeleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.AutocompleteInTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) AutocompleteInTeamForSearch(teamId string, userId string, term string, includeDeleted bool) (*model.ChannelList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.AutocompleteInTeamForSearch(teamId, userId, term, includeDeleted) + result, err := s.ChannelStore.AutocompleteInTeamForSearch(teamId, userId, term, includeDeleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.AutocompleteInTeamForSearch", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) ClearAllCustomRoleAssignments() *model.AppError { start := timemodule.Now() - resultVar0 := s.ChannelStore.ClearAllCustomRoleAssignments() + err := s.ChannelStore.ClearAllCustomRoleAssignments() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.ClearAllCustomRoleAssignments", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) ClearCaches() { @@ -556,551 +556,551 @@ func (s *TimerLayerChannelStore) ClearCaches() { func (s *TimerLayerChannelStore) ClearSidebarOnTeamLeave(userId string, teamId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.ChannelStore.ClearSidebarOnTeamLeave(userId, teamId) + err := s.ChannelStore.ClearSidebarOnTeamLeave(userId, teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.ClearSidebarOnTeamLeave", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) CountPostsAfter(channelId string, timestamp int64, userId string) (int, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.CountPostsAfter(channelId, timestamp, userId) + result, err := s.ChannelStore.CountPostsAfter(channelId, timestamp, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.CountPostsAfter", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) CreateDirectChannel(userId *model.User, otherUserId *model.User) (*model.Channel, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.CreateDirectChannel(userId, otherUserId) + result, err := s.ChannelStore.CreateDirectChannel(userId, otherUserId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.CreateDirectChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) CreateInitialSidebarCategories(userId string, teamId string) error { start := timemodule.Now() - resultVar0 := s.ChannelStore.CreateInitialSidebarCategories(userId, teamId) + err := s.ChannelStore.CreateInitialSidebarCategories(userId, teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.CreateInitialSidebarCategories", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) CreateSidebarCategory(userId string, teamId string, newCategory *model.SidebarCategoryWithChannels) (*model.SidebarCategoryWithChannels, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.CreateSidebarCategory(userId, teamId, newCategory) + result, err := s.ChannelStore.CreateSidebarCategory(userId, teamId, newCategory) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.CreateSidebarCategory", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) Delete(channelId string, time int64) error { start := timemodule.Now() - resultVar0 := s.ChannelStore.Delete(channelId, time) + err := s.ChannelStore.Delete(channelId, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.Delete", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) DeleteSidebarCategory(categoryId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.ChannelStore.DeleteSidebarCategory(categoryId) + err := s.ChannelStore.DeleteSidebarCategory(categoryId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.DeleteSidebarCategory", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) DeleteSidebarChannelsByPreferences(preferences *model.Preferences) error { start := timemodule.Now() - resultVar0 := s.ChannelStore.DeleteSidebarChannelsByPreferences(preferences) + err := s.ChannelStore.DeleteSidebarChannelsByPreferences(preferences) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.DeleteSidebarChannelsByPreferences", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) Get(id string, allowFromCache bool) (*model.Channel, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.Get(id, allowFromCache) + result, err := s.ChannelStore.Get(id, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetAll(teamId string) ([]*model.Channel, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetAll(teamId) + result, err := s.ChannelStore.GetAll(teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetAll", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetAllChannelMembersForUser(userId string, allowFromCache bool, includeDeleted bool) (map[string]string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetAllChannelMembersForUser(userId, allowFromCache, includeDeleted) + result, err := s.ChannelStore.GetAllChannelMembersForUser(userId, allowFromCache, includeDeleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetAllChannelMembersForUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetAllChannelMembersNotifyPropsForChannel(channelId string, allowFromCache bool) (map[string]model.StringMap, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetAllChannelMembersNotifyPropsForChannel(channelId, allowFromCache) + result, err := s.ChannelStore.GetAllChannelMembersNotifyPropsForChannel(channelId, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetAllChannelMembersNotifyPropsForChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetAllChannels(page int, perPage int, opts store.ChannelSearchOpts) (*model.ChannelListWithTeamData, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetAllChannels(page, perPage, opts) + result, err := s.ChannelStore.GetAllChannels(page, perPage, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetAllChannels", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetAllChannelsCount(opts store.ChannelSearchOpts) (int64, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetAllChannelsCount(opts) + result, err := s.ChannelStore.GetAllChannelsCount(opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetAllChannelsCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetAllChannelsForExportAfter(limit int, afterId string) ([]*model.ChannelForExport, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetAllChannelsForExportAfter(limit, afterId) + result, err := s.ChannelStore.GetAllChannelsForExportAfter(limit, afterId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetAllChannelsForExportAfter", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetAllDirectChannelsForExportAfter(limit int, afterId string) ([]*model.DirectChannelForExport, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetAllDirectChannelsForExportAfter(limit, afterId) + result, err := s.ChannelStore.GetAllDirectChannelsForExportAfter(limit, afterId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetAllDirectChannelsForExportAfter", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetByName(team_id string, name string, allowFromCache bool) (*model.Channel, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetByName(team_id, name, allowFromCache) + result, err := s.ChannelStore.GetByName(team_id, name, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetByName", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetByNameIncludeDeleted(team_id string, name string, allowFromCache bool) (*model.Channel, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetByNameIncludeDeleted(team_id, name, allowFromCache) + result, err := s.ChannelStore.GetByNameIncludeDeleted(team_id, name, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetByNameIncludeDeleted", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetByNames(team_id string, names []string, allowFromCache bool) ([]*model.Channel, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetByNames(team_id, names, allowFromCache) + result, err := s.ChannelStore.GetByNames(team_id, names, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetByNames", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetChannelCounts(teamId string, userId string) (*model.ChannelCounts, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetChannelCounts(teamId, userId) + result, err := s.ChannelStore.GetChannelCounts(teamId, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetChannelCounts", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetChannelMembersForExport(userId string, teamId string) ([]*model.ChannelMemberForExport, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetChannelMembersForExport(userId, teamId) + result, err := s.ChannelStore.GetChannelMembersForExport(userId, teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetChannelMembersForExport", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetChannelMembersTimezones(channelId string) ([]model.StringMap, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetChannelMembersTimezones(channelId) + result, err := s.ChannelStore.GetChannelMembersTimezones(channelId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetChannelMembersTimezones", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetChannelUnread(channelId string, userId string) (*model.ChannelUnread, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetChannelUnread(channelId, userId) + result, err := s.ChannelStore.GetChannelUnread(channelId, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetChannelUnread", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetChannels(teamId string, userId string, includeDeleted bool, lastDeleteAt int) (*model.ChannelList, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetChannels(teamId, userId, includeDeleted, lastDeleteAt) + result, err := s.ChannelStore.GetChannels(teamId, userId, includeDeleted, lastDeleteAt) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetChannels", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetChannelsBatchForIndexing(startTime int64, endTime int64, limit int) ([]*model.Channel, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetChannelsBatchForIndexing(startTime, endTime, limit) + result, err := s.ChannelStore.GetChannelsBatchForIndexing(startTime, endTime, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetChannelsBatchForIndexing", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetChannelsByIds(channelIds []string, includeDeleted bool) ([]*model.Channel, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetChannelsByIds(channelIds, includeDeleted) + result, err := s.ChannelStore.GetChannelsByIds(channelIds, includeDeleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetChannelsByIds", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetChannelsByScheme(schemeId string, offset int, limit int) (model.ChannelList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetChannelsByScheme(schemeId, offset, limit) + result, err := s.ChannelStore.GetChannelsByScheme(schemeId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetChannelsByScheme", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetDeleted(team_id string, offset int, limit int, userId string) (*model.ChannelList, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetDeleted(team_id, offset, limit, userId) + result, err := s.ChannelStore.GetDeleted(team_id, offset, limit, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetDeleted", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetDeletedByName(team_id string, name string) (*model.Channel, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetDeletedByName(team_id, name) + result, err := s.ChannelStore.GetDeletedByName(team_id, name) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetDeletedByName", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetForPost(postId string) (*model.Channel, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetForPost(postId) + result, err := s.ChannelStore.GetForPost(postId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetForPost", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetFromMaster(id string) (*model.Channel, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetFromMaster(id) + result, err := s.ChannelStore.GetFromMaster(id) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetFromMaster", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetGuestCount(channelId string, allowFromCache bool) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetGuestCount(channelId, allowFromCache) + result, err := s.ChannelStore.GetGuestCount(channelId, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetGuestCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetMember(channelId string, userId string) (*model.ChannelMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetMember(channelId, userId) + result, err := s.ChannelStore.GetMember(channelId, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetMember", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetMemberCount(channelId string, allowFromCache bool) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetMemberCount(channelId, allowFromCache) + result, err := s.ChannelStore.GetMemberCount(channelId, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetMemberCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetMemberCountFromCache(channelId string) int64 { start := timemodule.Now() - resultVar0 := s.ChannelStore.GetMemberCountFromCache(channelId) + result := s.ChannelStore.GetMemberCountFromCache(channelId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1110,295 +1110,295 @@ func (s *TimerLayerChannelStore) GetMemberCountFromCache(channelId string) int64 } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetMemberCountFromCache", success, elapsed) } - return resultVar0 + return result } func (s *TimerLayerChannelStore) GetMemberCountsByGroup(channelID string, includeTimezones bool) ([]*model.ChannelMemberCountByGroup, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetMemberCountsByGroup(channelID, includeTimezones) + result, err := s.ChannelStore.GetMemberCountsByGroup(channelID, includeTimezones) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetMemberCountsByGroup", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetMemberForPost(postId string, userId string) (*model.ChannelMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetMemberForPost(postId, userId) + result, err := s.ChannelStore.GetMemberForPost(postId, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetMemberForPost", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetMembers(channelId string, offset int, limit int) (*model.ChannelMembers, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetMembers(channelId, offset, limit) + result, err := s.ChannelStore.GetMembers(channelId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetMembers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetMembersByIds(channelId string, userIds []string) (*model.ChannelMembers, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetMembersByIds(channelId, userIds) + result, err := s.ChannelStore.GetMembersByIds(channelId, userIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetMembersByIds", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetMembersForUser(teamId string, userId string) (*model.ChannelMembers, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetMembersForUser(teamId, userId) + result, err := s.ChannelStore.GetMembersForUser(teamId, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetMembersForUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetMembersForUserWithPagination(teamId string, userId string, page int, perPage int) (*model.ChannelMembers, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetMembersForUserWithPagination(teamId, userId, page, perPage) + result, err := s.ChannelStore.GetMembersForUserWithPagination(teamId, userId, page, perPage) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetMembersForUserWithPagination", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetMoreChannels(teamId string, userId string, offset int, limit int) (*model.ChannelList, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetMoreChannels(teamId, userId, offset, limit) + result, err := s.ChannelStore.GetMoreChannels(teamId, userId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetMoreChannels", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetPinnedPostCount(channelId string, allowFromCache bool) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetPinnedPostCount(channelId, allowFromCache) + result, err := s.ChannelStore.GetPinnedPostCount(channelId, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetPinnedPostCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetPinnedPosts(channelId string) (*model.PostList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetPinnedPosts(channelId) + result, err := s.ChannelStore.GetPinnedPosts(channelId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetPinnedPosts", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetPrivateChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetPrivateChannelsForTeam(teamId, offset, limit) + result, err := s.ChannelStore.GetPrivateChannelsForTeam(teamId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetPrivateChannelsForTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetPublicChannelsByIdsForTeam(teamId string, channelIds []string) (*model.ChannelList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetPublicChannelsByIdsForTeam(teamId, channelIds) + result, err := s.ChannelStore.GetPublicChannelsByIdsForTeam(teamId, channelIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetPublicChannelsByIdsForTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetPublicChannelsForTeam(teamId string, offset int, limit int) (*model.ChannelList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetPublicChannelsForTeam(teamId, offset, limit) + result, err := s.ChannelStore.GetPublicChannelsForTeam(teamId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetPublicChannelsForTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetSidebarCategories(userId string, teamId string) (*model.OrderedSidebarCategories, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetSidebarCategories(userId, teamId) + result, err := s.ChannelStore.GetSidebarCategories(userId, teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetSidebarCategories", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetSidebarCategory(categoryId string) (*model.SidebarCategoryWithChannels, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetSidebarCategory(categoryId) + result, err := s.ChannelStore.GetSidebarCategory(categoryId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetSidebarCategory", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetSidebarCategoryOrder(userId string, teamId string) ([]string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetSidebarCategoryOrder(userId, teamId) + result, err := s.ChannelStore.GetSidebarCategoryOrder(userId, teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetSidebarCategoryOrder", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GetTeamChannels(teamId string) (*model.ChannelList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GetTeamChannels(teamId) + result, err := s.ChannelStore.GetTeamChannels(teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GetTeamChannels", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) GroupSyncedChannelCount() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.GroupSyncedChannelCount() + result, err := s.ChannelStore.GroupSyncedChannelCount() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.GroupSyncedChannelCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) IncrementMentionCount(channelId string, userId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.ChannelStore.IncrementMentionCount(channelId, userId) + err := s.ChannelStore.IncrementMentionCount(channelId, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.IncrementMentionCount", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) InvalidateAllChannelMembersForUser(userId string) { @@ -1509,7 +1509,7 @@ func (s *TimerLayerChannelStore) InvalidatePinnedPostCount(channelId string) { func (s *TimerLayerChannelStore) IsUserInChannelUseCache(userId string, channelId string) bool { start := timemodule.Now() - resultVar0 := s.ChannelStore.IsUserInChannelUseCache(userId, channelId) + result := s.ChannelStore.IsUserInChannelUseCache(userId, channelId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -1519,839 +1519,839 @@ func (s *TimerLayerChannelStore) IsUserInChannelUseCache(userId string, channelI } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.IsUserInChannelUseCache", success, elapsed) } - return resultVar0 + return result } func (s *TimerLayerChannelStore) MigrateChannelMembers(fromChannelId string, fromUserId string) (map[string]string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.MigrateChannelMembers(fromChannelId, fromUserId) + result, err := s.ChannelStore.MigrateChannelMembers(fromChannelId, fromUserId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.MigrateChannelMembers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) MigratePublicChannels() error { start := timemodule.Now() - resultVar0 := s.ChannelStore.MigratePublicChannels() + err := s.ChannelStore.MigratePublicChannels() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.MigratePublicChannels", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) PermanentDelete(channelId string) error { start := timemodule.Now() - resultVar0 := s.ChannelStore.PermanentDelete(channelId) + err := s.ChannelStore.PermanentDelete(channelId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.PermanentDelete", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) PermanentDeleteByTeam(teamId string) error { start := timemodule.Now() - resultVar0 := s.ChannelStore.PermanentDeleteByTeam(teamId) + err := s.ChannelStore.PermanentDeleteByTeam(teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.PermanentDeleteByTeam", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) PermanentDeleteMembersByChannel(channelId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.ChannelStore.PermanentDeleteMembersByChannel(channelId) + err := s.ChannelStore.PermanentDeleteMembersByChannel(channelId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.PermanentDeleteMembersByChannel", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) PermanentDeleteMembersByUser(userId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.ChannelStore.PermanentDeleteMembersByUser(userId) + err := s.ChannelStore.PermanentDeleteMembersByUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.PermanentDeleteMembersByUser", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) RemoveAllDeactivatedMembers(channelId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.ChannelStore.RemoveAllDeactivatedMembers(channelId) + err := s.ChannelStore.RemoveAllDeactivatedMembers(channelId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.RemoveAllDeactivatedMembers", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) RemoveMember(channelId string, userId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.ChannelStore.RemoveMember(channelId, userId) + err := s.ChannelStore.RemoveMember(channelId, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.RemoveMember", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) RemoveMembers(channelId string, userIds []string) *model.AppError { start := timemodule.Now() - resultVar0 := s.ChannelStore.RemoveMembers(channelId, userIds) + err := s.ChannelStore.RemoveMembers(channelId, userIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.RemoveMembers", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) ResetAllChannelSchemes() *model.AppError { start := timemodule.Now() - resultVar0 := s.ChannelStore.ResetAllChannelSchemes() + err := s.ChannelStore.ResetAllChannelSchemes() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.ResetAllChannelSchemes", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) Restore(channelId string, time int64) error { start := timemodule.Now() - resultVar0 := s.ChannelStore.Restore(channelId, time) + err := s.ChannelStore.Restore(channelId, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.Restore", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) Save(channel *model.Channel, maxChannelsPerTeam int64) (*model.Channel, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.Save(channel, maxChannelsPerTeam) + result, err := s.ChannelStore.Save(channel, maxChannelsPerTeam) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) SaveDirectChannel(channel *model.Channel, member1 *model.ChannelMember, member2 *model.ChannelMember) (*model.Channel, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.SaveDirectChannel(channel, member1, member2) + result, err := s.ChannelStore.SaveDirectChannel(channel, member1, member2) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.SaveDirectChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) SaveMember(member *model.ChannelMember) (*model.ChannelMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.SaveMember(member) + result, err := s.ChannelStore.SaveMember(member) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.SaveMember", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) SaveMultipleMembers(members []*model.ChannelMember) ([]*model.ChannelMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.SaveMultipleMembers(members) + result, err := s.ChannelStore.SaveMultipleMembers(members) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.SaveMultipleMembers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) SearchAllChannels(term string, opts store.ChannelSearchOpts) (*model.ChannelListWithTeamData, int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1, resultVar2 := s.ChannelStore.SearchAllChannels(term, opts) + result, resultVar1, err := s.ChannelStore.SearchAllChannels(term, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar2 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.SearchAllChannels", success, elapsed) } - return resultVar0, resultVar1, resultVar2 + return result, resultVar1, err } func (s *TimerLayerChannelStore) SearchArchivedInTeam(teamId string, term string, userId string) (*model.ChannelList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.SearchArchivedInTeam(teamId, term, userId) + result, err := s.ChannelStore.SearchArchivedInTeam(teamId, term, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.SearchArchivedInTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) SearchForUserInTeam(userId string, teamId string, term string, includeDeleted bool) (*model.ChannelList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.SearchForUserInTeam(userId, teamId, term, includeDeleted) + result, err := s.ChannelStore.SearchForUserInTeam(userId, teamId, term, includeDeleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.SearchForUserInTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) SearchGroupChannels(userId string, term string) (*model.ChannelList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.SearchGroupChannels(userId, term) + result, err := s.ChannelStore.SearchGroupChannels(userId, term) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.SearchGroupChannels", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) SearchInTeam(teamId string, term string, includeDeleted bool) (*model.ChannelList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.SearchInTeam(teamId, term, includeDeleted) + result, err := s.ChannelStore.SearchInTeam(teamId, term, includeDeleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.SearchInTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) SearchMore(userId string, teamId string, term string) (*model.ChannelList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.SearchMore(userId, teamId, term) + result, err := s.ChannelStore.SearchMore(userId, teamId, term) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.SearchMore", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) SetDeleteAt(channelId string, deleteAt int64, updateAt int64) error { start := timemodule.Now() - resultVar0 := s.ChannelStore.SetDeleteAt(channelId, deleteAt, updateAt) + err := s.ChannelStore.SetDeleteAt(channelId, deleteAt, updateAt) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.SetDeleteAt", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) Update(channel *model.Channel) (*model.Channel, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.Update(channel) + result, err := s.ChannelStore.Update(channel) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.Update", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) UpdateLastViewedAt(channelIds []string, userId string) (map[string]int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.UpdateLastViewedAt(channelIds, userId) + result, err := s.ChannelStore.UpdateLastViewedAt(channelIds, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.UpdateLastViewedAt", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) UpdateLastViewedAtPost(unreadPost *model.Post, userID string, mentionCount int) (*model.ChannelUnreadAt, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.UpdateLastViewedAtPost(unreadPost, userID, mentionCount) + result, err := s.ChannelStore.UpdateLastViewedAtPost(unreadPost, userID, mentionCount) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.UpdateLastViewedAtPost", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) UpdateMember(member *model.ChannelMember) (*model.ChannelMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.UpdateMember(member) + result, err := s.ChannelStore.UpdateMember(member) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.UpdateMember", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) UpdateMembersRole(channelID string, userIDs []string) *model.AppError { start := timemodule.Now() - resultVar0 := s.ChannelStore.UpdateMembersRole(channelID, userIDs) + err := s.ChannelStore.UpdateMembersRole(channelID, userIDs) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.UpdateMembersRole", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) UpdateMultipleMembers(members []*model.ChannelMember) ([]*model.ChannelMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.UpdateMultipleMembers(members) + result, err := s.ChannelStore.UpdateMultipleMembers(members) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.UpdateMultipleMembers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) UpdateSidebarCategories(userId string, teamId string, categories []*model.SidebarCategoryWithChannels) ([]*model.SidebarCategoryWithChannels, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.UpdateSidebarCategories(userId, teamId, categories) + result, err := s.ChannelStore.UpdateSidebarCategories(userId, teamId, categories) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.UpdateSidebarCategories", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelStore) UpdateSidebarCategoryOrder(userId string, teamId string, categoryOrder []string) *model.AppError { start := timemodule.Now() - resultVar0 := s.ChannelStore.UpdateSidebarCategoryOrder(userId, teamId, categoryOrder) + err := s.ChannelStore.UpdateSidebarCategoryOrder(userId, teamId, categoryOrder) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.UpdateSidebarCategoryOrder", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) UpdateSidebarChannelCategoryOnMove(channel *model.Channel, newTeamId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.ChannelStore.UpdateSidebarChannelCategoryOnMove(channel, newTeamId) + err := s.ChannelStore.UpdateSidebarChannelCategoryOnMove(channel, newTeamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.UpdateSidebarChannelCategoryOnMove", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) UpdateSidebarChannelsByPreferences(preferences *model.Preferences) error { start := timemodule.Now() - resultVar0 := s.ChannelStore.UpdateSidebarChannelsByPreferences(preferences) + err := s.ChannelStore.UpdateSidebarChannelsByPreferences(preferences) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.UpdateSidebarChannelsByPreferences", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelStore) UserBelongsToChannels(userId string, channelIds []string) (bool, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelStore.UserBelongsToChannels(userId, channelIds) + result, err := s.ChannelStore.UserBelongsToChannels(userId, channelIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelStore.UserBelongsToChannels", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelMemberHistoryStore) GetUsersInChannelDuring(startTime int64, endTime int64, channelId string) ([]*model.ChannelMemberHistoryResult, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelMemberHistoryStore.GetUsersInChannelDuring(startTime, endTime, channelId) + result, err := s.ChannelMemberHistoryStore.GetUsersInChannelDuring(startTime, endTime, channelId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelMemberHistoryStore.GetUsersInChannelDuring", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerChannelMemberHistoryStore) LogJoinEvent(userId string, channelId string, joinTime int64) error { start := timemodule.Now() - resultVar0 := s.ChannelMemberHistoryStore.LogJoinEvent(userId, channelId, joinTime) + err := s.ChannelMemberHistoryStore.LogJoinEvent(userId, channelId, joinTime) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelMemberHistoryStore.LogJoinEvent", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelMemberHistoryStore) LogLeaveEvent(userId string, channelId string, leaveTime int64) error { start := timemodule.Now() - resultVar0 := s.ChannelMemberHistoryStore.LogLeaveEvent(userId, channelId, leaveTime) + err := s.ChannelMemberHistoryStore.LogLeaveEvent(userId, channelId, leaveTime) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelMemberHistoryStore.LogLeaveEvent", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerChannelMemberHistoryStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ChannelMemberHistoryStore.PermanentDeleteBatch(endTime, limit) + result, err := s.ChannelMemberHistoryStore.PermanentDeleteBatch(endTime, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ChannelMemberHistoryStore.PermanentDeleteBatch", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerClusterDiscoveryStore) Cleanup() error { start := timemodule.Now() - resultVar0 := s.ClusterDiscoveryStore.Cleanup() + err := s.ClusterDiscoveryStore.Cleanup() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ClusterDiscoveryStore.Cleanup", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerClusterDiscoveryStore) Delete(discovery *model.ClusterDiscovery) (bool, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ClusterDiscoveryStore.Delete(discovery) + result, err := s.ClusterDiscoveryStore.Delete(discovery) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ClusterDiscoveryStore.Delete", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerClusterDiscoveryStore) Exists(discovery *model.ClusterDiscovery) (bool, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ClusterDiscoveryStore.Exists(discovery) + result, err := s.ClusterDiscoveryStore.Exists(discovery) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ClusterDiscoveryStore.Exists", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerClusterDiscoveryStore) GetAll(discoveryType string, clusterName string) ([]*model.ClusterDiscovery, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ClusterDiscoveryStore.GetAll(discoveryType, clusterName) + result, err := s.ClusterDiscoveryStore.GetAll(discoveryType, clusterName) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ClusterDiscoveryStore.GetAll", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerClusterDiscoveryStore) Save(discovery *model.ClusterDiscovery) error { start := timemodule.Now() - resultVar0 := s.ClusterDiscoveryStore.Save(discovery) + err := s.ClusterDiscoveryStore.Save(discovery) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ClusterDiscoveryStore.Save", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerClusterDiscoveryStore) SetLastPingAt(discovery *model.ClusterDiscovery) error { start := timemodule.Now() - resultVar0 := s.ClusterDiscoveryStore.SetLastPingAt(discovery) + err := s.ClusterDiscoveryStore.SetLastPingAt(discovery) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ClusterDiscoveryStore.SetLastPingAt", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerCommandStore) AnalyticsCommandCount(teamId string) (int64, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.CommandStore.AnalyticsCommandCount(teamId) + result, err := s.CommandStore.AnalyticsCommandCount(teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("CommandStore.AnalyticsCommandCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerCommandStore) Delete(commandId string, time int64) error { start := timemodule.Now() - resultVar0 := s.CommandStore.Delete(commandId, time) + err := s.CommandStore.Delete(commandId, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("CommandStore.Delete", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerCommandStore) Get(id string) (*model.Command, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.CommandStore.Get(id) + result, err := s.CommandStore.Get(id) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("CommandStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerCommandStore) GetByTeam(teamId string) ([]*model.Command, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.CommandStore.GetByTeam(teamId) + result, err := s.CommandStore.GetByTeam(teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("CommandStore.GetByTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerCommandStore) GetByTrigger(teamId string, trigger string) (*model.Command, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.CommandStore.GetByTrigger(teamId, trigger) + result, err := s.CommandStore.GetByTrigger(teamId, trigger) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("CommandStore.GetByTrigger", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerCommandStore) PermanentDeleteByTeam(teamId string) error { start := timemodule.Now() - resultVar0 := s.CommandStore.PermanentDeleteByTeam(teamId) + err := s.CommandStore.PermanentDeleteByTeam(teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("CommandStore.PermanentDeleteByTeam", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerCommandStore) PermanentDeleteByUser(userId string) error { start := timemodule.Now() - resultVar0 := s.CommandStore.PermanentDeleteByUser(userId) + err := s.CommandStore.PermanentDeleteByUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("CommandStore.PermanentDeleteByUser", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerCommandStore) Save(webhook *model.Command) (*model.Command, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.CommandStore.Save(webhook) + result, err := s.CommandStore.Save(webhook) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("CommandStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerCommandStore) Update(hook *model.Command) (*model.Command, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.CommandStore.Update(hook) + result, err := s.CommandStore.Update(hook) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("CommandStore.Update", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerCommandWebhookStore) Cleanup() { @@ -2372,273 +2372,273 @@ func (s *TimerLayerCommandWebhookStore) Cleanup() { func (s *TimerLayerCommandWebhookStore) Get(id string) (*model.CommandWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.CommandWebhookStore.Get(id) + result, err := s.CommandWebhookStore.Get(id) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("CommandWebhookStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerCommandWebhookStore) Save(webhook *model.CommandWebhook) (*model.CommandWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.CommandWebhookStore.Save(webhook) + result, err := s.CommandWebhookStore.Save(webhook) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("CommandWebhookStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerCommandWebhookStore) TryUse(id string, limit int) error { start := timemodule.Now() - resultVar0 := s.CommandWebhookStore.TryUse(id, limit) + err := s.CommandWebhookStore.TryUse(id, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("CommandWebhookStore.TryUse", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerComplianceStore) ComplianceExport(compliance *model.Compliance) ([]*model.CompliancePost, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ComplianceStore.ComplianceExport(compliance) + result, err := s.ComplianceStore.ComplianceExport(compliance) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ComplianceStore.ComplianceExport", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerComplianceStore) Get(id string) (*model.Compliance, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ComplianceStore.Get(id) + result, err := s.ComplianceStore.Get(id) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ComplianceStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerComplianceStore) GetAll(offset int, limit int) (model.Compliances, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ComplianceStore.GetAll(offset, limit) + result, err := s.ComplianceStore.GetAll(offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ComplianceStore.GetAll", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerComplianceStore) MessageExport(after int64, limit int) ([]*model.MessageExport, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ComplianceStore.MessageExport(after, limit) + result, err := s.ComplianceStore.MessageExport(after, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ComplianceStore.MessageExport", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerComplianceStore) Save(compliance *model.Compliance) (*model.Compliance, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ComplianceStore.Save(compliance) + result, err := s.ComplianceStore.Save(compliance) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ComplianceStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerComplianceStore) Update(compliance *model.Compliance) (*model.Compliance, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ComplianceStore.Update(compliance) + result, err := s.ComplianceStore.Update(compliance) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ComplianceStore.Update", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerEmojiStore) Delete(emoji *model.Emoji, time int64) error { start := timemodule.Now() - resultVar0 := s.EmojiStore.Delete(emoji, time) + err := s.EmojiStore.Delete(emoji, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("EmojiStore.Delete", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerEmojiStore) Get(id string, allowFromCache bool) (*model.Emoji, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.EmojiStore.Get(id, allowFromCache) + result, err := s.EmojiStore.Get(id, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("EmojiStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerEmojiStore) GetByName(name string, allowFromCache bool) (*model.Emoji, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.EmojiStore.GetByName(name, allowFromCache) + result, err := s.EmojiStore.GetByName(name, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("EmojiStore.GetByName", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerEmojiStore) GetList(offset int, limit int, sort string) ([]*model.Emoji, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.EmojiStore.GetList(offset, limit, sort) + result, err := s.EmojiStore.GetList(offset, limit, sort) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("EmojiStore.GetList", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerEmojiStore) GetMultipleByName(names []string) ([]*model.Emoji, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.EmojiStore.GetMultipleByName(names) + result, err := s.EmojiStore.GetMultipleByName(names) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("EmojiStore.GetMultipleByName", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerEmojiStore) Save(emoji *model.Emoji) (*model.Emoji, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.EmojiStore.Save(emoji) + result, err := s.EmojiStore.Save(emoji) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("EmojiStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerEmojiStore) Search(name string, prefixOnly bool, limit int) ([]*model.Emoji, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.EmojiStore.Search(name, prefixOnly, limit) + result, err := s.EmojiStore.Search(name, prefixOnly, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("EmojiStore.Search", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerFileInfoStore) AttachToPost(fileId string, postId string, creatorId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.FileInfoStore.AttachToPost(fileId, postId, creatorId) + err := s.FileInfoStore.AttachToPost(fileId, postId, creatorId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("FileInfoStore.AttachToPost", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerFileInfoStore) ClearCaches() { @@ -2659,97 +2659,97 @@ func (s *TimerLayerFileInfoStore) ClearCaches() { func (s *TimerLayerFileInfoStore) DeleteForPost(postId string) (string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.FileInfoStore.DeleteForPost(postId) + result, err := s.FileInfoStore.DeleteForPost(postId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("FileInfoStore.DeleteForPost", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerFileInfoStore) Get(id string) (*model.FileInfo, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.FileInfoStore.Get(id) + result, err := s.FileInfoStore.Get(id) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("FileInfoStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerFileInfoStore) GetByPath(path string) (*model.FileInfo, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.FileInfoStore.GetByPath(path) + result, err := s.FileInfoStore.GetByPath(path) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("FileInfoStore.GetByPath", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerFileInfoStore) GetForPost(postId string, readFromMaster bool, includeDeleted bool, allowFromCache bool) ([]*model.FileInfo, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.FileInfoStore.GetForPost(postId, readFromMaster, includeDeleted, allowFromCache) + result, err := s.FileInfoStore.GetForPost(postId, readFromMaster, includeDeleted, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("FileInfoStore.GetForPost", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerFileInfoStore) GetForUser(userId string) ([]*model.FileInfo, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.FileInfoStore.GetForUser(userId) + result, err := s.FileInfoStore.GetForUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("FileInfoStore.GetForUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerFileInfoStore) GetWithOptions(page int, perPage int, opt *model.GetFileInfosOptions) ([]*model.FileInfo, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.FileInfoStore.GetWithOptions(page, perPage, opt) + result, err := s.FileInfoStore.GetWithOptions(page, perPage, opt) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("FileInfoStore.GetWithOptions", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerFileInfoStore) InvalidateFileInfosForPostCache(postId string, deleted bool) { @@ -2770,1521 +2770,1521 @@ func (s *TimerLayerFileInfoStore) InvalidateFileInfosForPostCache(postId string, func (s *TimerLayerFileInfoStore) PermanentDelete(fileId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.FileInfoStore.PermanentDelete(fileId) + err := s.FileInfoStore.PermanentDelete(fileId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("FileInfoStore.PermanentDelete", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerFileInfoStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.FileInfoStore.PermanentDeleteBatch(endTime, limit) + result, err := s.FileInfoStore.PermanentDeleteBatch(endTime, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("FileInfoStore.PermanentDeleteBatch", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerFileInfoStore) PermanentDeleteByUser(userId string) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.FileInfoStore.PermanentDeleteByUser(userId) + result, err := s.FileInfoStore.PermanentDeleteByUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("FileInfoStore.PermanentDeleteByUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerFileInfoStore) Save(info *model.FileInfo) (*model.FileInfo, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.FileInfoStore.Save(info) + result, err := s.FileInfoStore.Save(info) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("FileInfoStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) AdminRoleGroupsForSyncableMember(userID string, syncableID string, syncableType model.GroupSyncableType) ([]string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.AdminRoleGroupsForSyncableMember(userID, syncableID, syncableType) + result, err := s.GroupStore.AdminRoleGroupsForSyncableMember(userID, syncableID, syncableType) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.AdminRoleGroupsForSyncableMember", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) ChannelMembersMinusGroupMembers(channelID string, groupIDs []string, page int, perPage int) ([]*model.UserWithGroups, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.ChannelMembersMinusGroupMembers(channelID, groupIDs, page, perPage) + result, err := s.GroupStore.ChannelMembersMinusGroupMembers(channelID, groupIDs, page, perPage) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.ChannelMembersMinusGroupMembers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) ChannelMembersToAdd(since int64, channelID *string) ([]*model.UserChannelIDPair, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.ChannelMembersToAdd(since, channelID) + result, err := s.GroupStore.ChannelMembersToAdd(since, channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.ChannelMembersToAdd", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) ChannelMembersToRemove(channelID *string) ([]*model.ChannelMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.ChannelMembersToRemove(channelID) + result, err := s.GroupStore.ChannelMembersToRemove(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.ChannelMembersToRemove", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) CountChannelMembersMinusGroupMembers(channelID string, groupIDs []string) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.CountChannelMembersMinusGroupMembers(channelID, groupIDs) + result, err := s.GroupStore.CountChannelMembersMinusGroupMembers(channelID, groupIDs) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.CountChannelMembersMinusGroupMembers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) CountGroupsByChannel(channelId string, opts model.GroupSearchOpts) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.CountGroupsByChannel(channelId, opts) + result, err := s.GroupStore.CountGroupsByChannel(channelId, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.CountGroupsByChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) CountGroupsByTeam(teamId string, opts model.GroupSearchOpts) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.CountGroupsByTeam(teamId, opts) + result, err := s.GroupStore.CountGroupsByTeam(teamId, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.CountGroupsByTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) CountTeamMembersMinusGroupMembers(teamID string, groupIDs []string) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.CountTeamMembersMinusGroupMembers(teamID, groupIDs) + result, err := s.GroupStore.CountTeamMembersMinusGroupMembers(teamID, groupIDs) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.CountTeamMembersMinusGroupMembers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) Create(group *model.Group) (*model.Group, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.Create(group) + result, err := s.GroupStore.Create(group) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.Create", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) CreateGroupSyncable(groupSyncable *model.GroupSyncable) (*model.GroupSyncable, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.CreateGroupSyncable(groupSyncable) + result, err := s.GroupStore.CreateGroupSyncable(groupSyncable) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.CreateGroupSyncable", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) Delete(groupID string) (*model.Group, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.Delete(groupID) + result, err := s.GroupStore.Delete(groupID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.Delete", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) DeleteGroupSyncable(groupID string, syncableID string, syncableType model.GroupSyncableType) (*model.GroupSyncable, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.DeleteGroupSyncable(groupID, syncableID, syncableType) + result, err := s.GroupStore.DeleteGroupSyncable(groupID, syncableID, syncableType) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.DeleteGroupSyncable", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) DeleteMember(groupID string, userID string) (*model.GroupMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.DeleteMember(groupID, userID) + result, err := s.GroupStore.DeleteMember(groupID, userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.DeleteMember", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) DistinctGroupMemberCount() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.DistinctGroupMemberCount() + result, err := s.GroupStore.DistinctGroupMemberCount() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.DistinctGroupMemberCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) Get(groupID string) (*model.Group, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.Get(groupID) + result, err := s.GroupStore.Get(groupID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetAllBySource(groupSource model.GroupSource) ([]*model.Group, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetAllBySource(groupSource) + result, err := s.GroupStore.GetAllBySource(groupSource) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetAllBySource", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetAllGroupSyncablesByGroupId(groupID string, syncableType model.GroupSyncableType) ([]*model.GroupSyncable, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetAllGroupSyncablesByGroupId(groupID, syncableType) + result, err := s.GroupStore.GetAllGroupSyncablesByGroupId(groupID, syncableType) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetAllGroupSyncablesByGroupId", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetByIDs(groupIDs []string) ([]*model.Group, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetByIDs(groupIDs) + result, err := s.GroupStore.GetByIDs(groupIDs) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetByIDs", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetByName(name string, opts model.GroupSearchOpts) (*model.Group, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetByName(name, opts) + result, err := s.GroupStore.GetByName(name, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetByName", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetByRemoteID(remoteID string, groupSource model.GroupSource) (*model.Group, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetByRemoteID(remoteID, groupSource) + result, err := s.GroupStore.GetByRemoteID(remoteID, groupSource) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetByRemoteID", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetByUser(userId string) ([]*model.Group, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetByUser(userId) + result, err := s.GroupStore.GetByUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetByUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetGroupSyncable(groupID string, syncableID string, syncableType model.GroupSyncableType) (*model.GroupSyncable, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetGroupSyncable(groupID, syncableID, syncableType) + result, err := s.GroupStore.GetGroupSyncable(groupID, syncableID, syncableType) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetGroupSyncable", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetGroups(page int, perPage int, opts model.GroupSearchOpts) ([]*model.Group, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetGroups(page, perPage, opts) + result, err := s.GroupStore.GetGroups(page, perPage, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetGroups", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetGroupsAssociatedToChannelsByTeam(teamId string, opts model.GroupSearchOpts) (map[string][]*model.GroupWithSchemeAdmin, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetGroupsAssociatedToChannelsByTeam(teamId, opts) + result, err := s.GroupStore.GetGroupsAssociatedToChannelsByTeam(teamId, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetGroupsAssociatedToChannelsByTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetGroupsByChannel(channelId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetGroupsByChannel(channelId, opts) + result, err := s.GroupStore.GetGroupsByChannel(channelId, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetGroupsByChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetGroupsByTeam(teamId string, opts model.GroupSearchOpts) ([]*model.GroupWithSchemeAdmin, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetGroupsByTeam(teamId, opts) + result, err := s.GroupStore.GetGroupsByTeam(teamId, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetGroupsByTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetMemberCount(groupID string) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetMemberCount(groupID) + result, err := s.GroupStore.GetMemberCount(groupID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetMemberCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetMemberUsers(groupID string) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetMemberUsers(groupID) + result, err := s.GroupStore.GetMemberUsers(groupID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetMemberUsers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetMemberUsersInTeam(groupID string, teamID string) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetMemberUsersInTeam(groupID, teamID) + result, err := s.GroupStore.GetMemberUsersInTeam(groupID, teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetMemberUsersInTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetMemberUsersNotInChannel(groupID string, channelID string) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetMemberUsersNotInChannel(groupID, channelID) + result, err := s.GroupStore.GetMemberUsersNotInChannel(groupID, channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetMemberUsersNotInChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GetMemberUsersPage(groupID string, page int, perPage int) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GetMemberUsersPage(groupID, page, perPage) + result, err := s.GroupStore.GetMemberUsersPage(groupID, page, perPage) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GetMemberUsersPage", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GroupChannelCount() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GroupChannelCount() + result, err := s.GroupStore.GroupChannelCount() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GroupChannelCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GroupCount() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GroupCount() + result, err := s.GroupStore.GroupCount() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GroupCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GroupCountWithAllowReference() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GroupCountWithAllowReference() + result, err := s.GroupStore.GroupCountWithAllowReference() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GroupCountWithAllowReference", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GroupMemberCount() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GroupMemberCount() + result, err := s.GroupStore.GroupMemberCount() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GroupMemberCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) GroupTeamCount() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.GroupTeamCount() + result, err := s.GroupStore.GroupTeamCount() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.GroupTeamCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) PermanentDeleteMembersByUser(userId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.GroupStore.PermanentDeleteMembersByUser(userId) + err := s.GroupStore.PermanentDeleteMembersByUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.PermanentDeleteMembersByUser", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerGroupStore) PermittedSyncableAdmins(syncableID string, syncableType model.GroupSyncableType) ([]string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.PermittedSyncableAdmins(syncableID, syncableType) + result, err := s.GroupStore.PermittedSyncableAdmins(syncableID, syncableType) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.PermittedSyncableAdmins", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) TeamMembersMinusGroupMembers(teamID string, groupIDs []string, page int, perPage int) ([]*model.UserWithGroups, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.TeamMembersMinusGroupMembers(teamID, groupIDs, page, perPage) + result, err := s.GroupStore.TeamMembersMinusGroupMembers(teamID, groupIDs, page, perPage) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.TeamMembersMinusGroupMembers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) TeamMembersToAdd(since int64, teamID *string) ([]*model.UserTeamIDPair, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.TeamMembersToAdd(since, teamID) + result, err := s.GroupStore.TeamMembersToAdd(since, teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.TeamMembersToAdd", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) TeamMembersToRemove(teamID *string) ([]*model.TeamMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.TeamMembersToRemove(teamID) + result, err := s.GroupStore.TeamMembersToRemove(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.TeamMembersToRemove", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) Update(group *model.Group) (*model.Group, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.Update(group) + result, err := s.GroupStore.Update(group) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.Update", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) UpdateGroupSyncable(groupSyncable *model.GroupSyncable) (*model.GroupSyncable, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.UpdateGroupSyncable(groupSyncable) + result, err := s.GroupStore.UpdateGroupSyncable(groupSyncable) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.UpdateGroupSyncable", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerGroupStore) UpsertMember(groupID string, userID string) (*model.GroupMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.GroupStore.UpsertMember(groupID, userID) + result, err := s.GroupStore.UpsertMember(groupID, userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("GroupStore.UpsertMember", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerJobStore) Delete(id string) (string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.JobStore.Delete(id) + result, err := s.JobStore.Delete(id) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("JobStore.Delete", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerJobStore) Get(id string) (*model.Job, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.JobStore.Get(id) + result, err := s.JobStore.Get(id) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("JobStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerJobStore) GetAllByStatus(status string) ([]*model.Job, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.JobStore.GetAllByStatus(status) + result, err := s.JobStore.GetAllByStatus(status) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("JobStore.GetAllByStatus", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerJobStore) GetAllByType(jobType string) ([]*model.Job, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.JobStore.GetAllByType(jobType) + result, err := s.JobStore.GetAllByType(jobType) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("JobStore.GetAllByType", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerJobStore) GetAllByTypePage(jobType string, offset int, limit int) ([]*model.Job, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.JobStore.GetAllByTypePage(jobType, offset, limit) + result, err := s.JobStore.GetAllByTypePage(jobType, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("JobStore.GetAllByTypePage", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerJobStore) GetAllPage(offset int, limit int) ([]*model.Job, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.JobStore.GetAllPage(offset, limit) + result, err := s.JobStore.GetAllPage(offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("JobStore.GetAllPage", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerJobStore) GetCountByStatusAndType(status string, jobType string) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.JobStore.GetCountByStatusAndType(status, jobType) + result, err := s.JobStore.GetCountByStatusAndType(status, jobType) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("JobStore.GetCountByStatusAndType", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerJobStore) GetNewestJobByStatusAndType(status string, jobType string) (*model.Job, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.JobStore.GetNewestJobByStatusAndType(status, jobType) + result, err := s.JobStore.GetNewestJobByStatusAndType(status, jobType) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("JobStore.GetNewestJobByStatusAndType", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerJobStore) Save(job *model.Job) (*model.Job, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.JobStore.Save(job) + result, err := s.JobStore.Save(job) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("JobStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerJobStore) UpdateOptimistically(job *model.Job, currentStatus string) (bool, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.JobStore.UpdateOptimistically(job, currentStatus) + result, err := s.JobStore.UpdateOptimistically(job, currentStatus) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("JobStore.UpdateOptimistically", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerJobStore) UpdateStatus(id string, status string) (*model.Job, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.JobStore.UpdateStatus(id, status) + result, err := s.JobStore.UpdateStatus(id, status) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("JobStore.UpdateStatus", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerJobStore) UpdateStatusOptimistically(id string, currentStatus string, newStatus string) (bool, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.JobStore.UpdateStatusOptimistically(id, currentStatus, newStatus) + result, err := s.JobStore.UpdateStatusOptimistically(id, currentStatus, newStatus) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("JobStore.UpdateStatusOptimistically", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerLicenseStore) Get(id string) (*model.LicenseRecord, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.LicenseStore.Get(id) + result, err := s.LicenseStore.Get(id) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("LicenseStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerLicenseStore) Save(license *model.LicenseRecord) (*model.LicenseRecord, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.LicenseStore.Save(license) + result, err := s.LicenseStore.Save(license) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("LicenseStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerLinkMetadataStore) Get(url string, timestamp int64) (*model.LinkMetadata, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.LinkMetadataStore.Get(url, timestamp) + result, err := s.LinkMetadataStore.Get(url, timestamp) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("LinkMetadataStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerLinkMetadataStore) Save(linkMetadata *model.LinkMetadata) (*model.LinkMetadata, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.LinkMetadataStore.Save(linkMetadata) + result, err := s.LinkMetadataStore.Save(linkMetadata) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("LinkMetadataStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerOAuthStore) DeleteApp(id string) error { start := timemodule.Now() - resultVar0 := s.OAuthStore.DeleteApp(id) + err := s.OAuthStore.DeleteApp(id) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.DeleteApp", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerOAuthStore) GetAccessData(token string) (*model.AccessData, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.OAuthStore.GetAccessData(token) + result, err := s.OAuthStore.GetAccessData(token) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.GetAccessData", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerOAuthStore) GetAccessDataByRefreshToken(token string) (*model.AccessData, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.OAuthStore.GetAccessDataByRefreshToken(token) + result, err := s.OAuthStore.GetAccessDataByRefreshToken(token) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.GetAccessDataByRefreshToken", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerOAuthStore) GetAccessDataByUserForApp(userId string, clientId string) ([]*model.AccessData, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.OAuthStore.GetAccessDataByUserForApp(userId, clientId) + result, err := s.OAuthStore.GetAccessDataByUserForApp(userId, clientId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.GetAccessDataByUserForApp", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerOAuthStore) GetApp(id string) (*model.OAuthApp, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.OAuthStore.GetApp(id) + result, err := s.OAuthStore.GetApp(id) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.GetApp", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerOAuthStore) GetAppByUser(userId string, offset int, limit int) ([]*model.OAuthApp, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.OAuthStore.GetAppByUser(userId, offset, limit) + result, err := s.OAuthStore.GetAppByUser(userId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.GetAppByUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerOAuthStore) GetApps(offset int, limit int) ([]*model.OAuthApp, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.OAuthStore.GetApps(offset, limit) + result, err := s.OAuthStore.GetApps(offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.GetApps", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerOAuthStore) GetAuthData(code string) (*model.AuthData, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.OAuthStore.GetAuthData(code) + result, err := s.OAuthStore.GetAuthData(code) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.GetAuthData", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerOAuthStore) GetAuthorizedApps(userId string, offset int, limit int) ([]*model.OAuthApp, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.OAuthStore.GetAuthorizedApps(userId, offset, limit) + result, err := s.OAuthStore.GetAuthorizedApps(userId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.GetAuthorizedApps", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerOAuthStore) GetPreviousAccessData(userId string, clientId string) (*model.AccessData, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.OAuthStore.GetPreviousAccessData(userId, clientId) + result, err := s.OAuthStore.GetPreviousAccessData(userId, clientId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.GetPreviousAccessData", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerOAuthStore) PermanentDeleteAuthDataByUser(userId string) error { start := timemodule.Now() - resultVar0 := s.OAuthStore.PermanentDeleteAuthDataByUser(userId) + err := s.OAuthStore.PermanentDeleteAuthDataByUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.PermanentDeleteAuthDataByUser", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerOAuthStore) RemoveAccessData(token string) error { start := timemodule.Now() - resultVar0 := s.OAuthStore.RemoveAccessData(token) + err := s.OAuthStore.RemoveAccessData(token) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.RemoveAccessData", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerOAuthStore) RemoveAllAccessData() error { start := timemodule.Now() - resultVar0 := s.OAuthStore.RemoveAllAccessData() + err := s.OAuthStore.RemoveAllAccessData() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.RemoveAllAccessData", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerOAuthStore) RemoveAuthData(code string) error { start := timemodule.Now() - resultVar0 := s.OAuthStore.RemoveAuthData(code) + err := s.OAuthStore.RemoveAuthData(code) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.RemoveAuthData", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerOAuthStore) SaveAccessData(accessData *model.AccessData) (*model.AccessData, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.OAuthStore.SaveAccessData(accessData) + result, err := s.OAuthStore.SaveAccessData(accessData) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.SaveAccessData", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerOAuthStore) SaveApp(app *model.OAuthApp) (*model.OAuthApp, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.OAuthStore.SaveApp(app) + result, err := s.OAuthStore.SaveApp(app) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.SaveApp", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerOAuthStore) SaveAuthData(authData *model.AuthData) (*model.AuthData, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.OAuthStore.SaveAuthData(authData) + result, err := s.OAuthStore.SaveAuthData(authData) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.SaveAuthData", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerOAuthStore) UpdateAccessData(accessData *model.AccessData) (*model.AccessData, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.OAuthStore.UpdateAccessData(accessData) + result, err := s.OAuthStore.UpdateAccessData(accessData) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.UpdateAccessData", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerOAuthStore) UpdateApp(app *model.OAuthApp) (*model.OAuthApp, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.OAuthStore.UpdateApp(app) + result, err := s.OAuthStore.UpdateApp(app) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("OAuthStore.UpdateApp", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPluginStore) CompareAndDelete(keyVal *model.PluginKeyValue, oldValue []byte) (bool, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PluginStore.CompareAndDelete(keyVal, oldValue) + result, err := s.PluginStore.CompareAndDelete(keyVal, oldValue) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PluginStore.CompareAndDelete", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPluginStore) CompareAndSet(keyVal *model.PluginKeyValue, oldValue []byte) (bool, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PluginStore.CompareAndSet(keyVal, oldValue) + result, err := s.PluginStore.CompareAndSet(keyVal, oldValue) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PluginStore.CompareAndSet", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPluginStore) Delete(pluginId string, key string) *model.AppError { start := timemodule.Now() - resultVar0 := s.PluginStore.Delete(pluginId, key) + err := s.PluginStore.Delete(pluginId, key) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PluginStore.Delete", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerPluginStore) DeleteAllExpired() *model.AppError { start := timemodule.Now() - resultVar0 := s.PluginStore.DeleteAllExpired() + err := s.PluginStore.DeleteAllExpired() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PluginStore.DeleteAllExpired", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerPluginStore) DeleteAllForPlugin(PluginId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.PluginStore.DeleteAllForPlugin(PluginId) + err := s.PluginStore.DeleteAllForPlugin(PluginId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PluginStore.DeleteAllForPlugin", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerPluginStore) Get(pluginId string, key string) (*model.PluginKeyValue, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PluginStore.Get(pluginId, key) + result, err := s.PluginStore.Get(pluginId, key) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PluginStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPluginStore) List(pluginId string, page int, perPage int) ([]string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PluginStore.List(pluginId, page, perPage) + result, err := s.PluginStore.List(pluginId, page, perPage) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PluginStore.List", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPluginStore) SaveOrUpdate(keyVal *model.PluginKeyValue) (*model.PluginKeyValue, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PluginStore.SaveOrUpdate(keyVal) + result, err := s.PluginStore.SaveOrUpdate(keyVal) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PluginStore.SaveOrUpdate", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPluginStore) SetWithOptions(pluginId string, key string, value []byte, options model.PluginKVSetOptions) (bool, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PluginStore.SetWithOptions(pluginId, key, value, options) + result, err := s.PluginStore.SetWithOptions(pluginId, key, value, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PluginStore.SetWithOptions", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) AnalyticsPostCount(teamId string, mustHaveFile bool, mustHaveHashtag bool) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.AnalyticsPostCount(teamId, mustHaveFile, mustHaveHashtag) + result, err := s.PostStore.AnalyticsPostCount(teamId, mustHaveFile, mustHaveHashtag) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.AnalyticsPostCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) AnalyticsPostCountsByDay(options *model.AnalyticsPostCountsOptions) (model.AnalyticsRows, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.AnalyticsPostCountsByDay(options) + result, err := s.PostStore.AnalyticsPostCountsByDay(options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.AnalyticsPostCountsByDay", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) AnalyticsUserCountsWithPostsByDay(teamId string) (model.AnalyticsRows, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.AnalyticsUserCountsWithPostsByDay(teamId) + result, err := s.PostStore.AnalyticsUserCountsWithPostsByDay(teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.AnalyticsUserCountsWithPostsByDay", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) ClearCaches() { @@ -4305,55 +4305,55 @@ func (s *TimerLayerPostStore) ClearCaches() { func (s *TimerLayerPostStore) Delete(postId string, time int64, deleteByID string) error { start := timemodule.Now() - resultVar0 := s.PostStore.Delete(postId, time, deleteByID) + err := s.PostStore.Delete(postId, time, deleteByID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.Delete", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerPostStore) Get(id string, skipFetchThreads bool) (*model.PostList, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.Get(id, skipFetchThreads) + result, err := s.PostStore.Get(id, skipFetchThreads) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetDirectPostParentsForExportAfter(limit int, afterId string) ([]*model.DirectPostForExport, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetDirectPostParentsForExportAfter(limit, afterId) + result, err := s.PostStore.GetDirectPostParentsForExportAfter(limit, afterId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetDirectPostParentsForExportAfter", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetEtag(channelId string, allowFromCache bool) string { start := timemodule.Now() - resultVar0 := s.PostStore.GetEtag(channelId, allowFromCache) + result := s.PostStore.GetEtag(channelId, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4363,61 +4363,61 @@ func (s *TimerLayerPostStore) GetEtag(channelId string, allowFromCache bool) str } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetEtag", success, elapsed) } - return resultVar0 + return result } func (s *TimerLayerPostStore) GetFlaggedPosts(userId string, offset int, limit int) (*model.PostList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetFlaggedPosts(userId, offset, limit) + result, err := s.PostStore.GetFlaggedPosts(userId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetFlaggedPosts", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetFlaggedPostsForChannel(userId string, channelId string, offset int, limit int) (*model.PostList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetFlaggedPostsForChannel(userId, channelId, offset, limit) + result, err := s.PostStore.GetFlaggedPostsForChannel(userId, channelId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetFlaggedPostsForChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetFlaggedPostsForTeam(userId string, teamId string, offset int, limit int) (*model.PostList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetFlaggedPostsForTeam(userId, teamId, offset, limit) + result, err := s.PostStore.GetFlaggedPostsForTeam(userId, teamId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetFlaggedPostsForTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetMaxPostSize() int { start := timemodule.Now() - resultVar0 := s.PostStore.GetMaxPostSize() + result := s.PostStore.GetMaxPostSize() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -4427,247 +4427,247 @@ func (s *TimerLayerPostStore) GetMaxPostSize() int { } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetMaxPostSize", success, elapsed) } - return resultVar0 + return result } func (s *TimerLayerPostStore) GetOldest() (*model.Post, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetOldest() + result, err := s.PostStore.GetOldest() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetOldest", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetOldestEntityCreationTime() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetOldestEntityCreationTime() + result, err := s.PostStore.GetOldestEntityCreationTime() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetOldestEntityCreationTime", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetParentsForExportAfter(limit int, afterId string) ([]*model.PostForExport, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetParentsForExportAfter(limit, afterId) + result, err := s.PostStore.GetParentsForExportAfter(limit, afterId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetParentsForExportAfter", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetPostAfterTime(channelId string, time int64) (*model.Post, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetPostAfterTime(channelId, time) + result, err := s.PostStore.GetPostAfterTime(channelId, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetPostAfterTime", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetPostIdAfterTime(channelId string, time int64) (string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetPostIdAfterTime(channelId, time) + result, err := s.PostStore.GetPostIdAfterTime(channelId, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetPostIdAfterTime", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetPostIdBeforeTime(channelId string, time int64) (string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetPostIdBeforeTime(channelId, time) + result, err := s.PostStore.GetPostIdBeforeTime(channelId, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetPostIdBeforeTime", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetPosts(options model.GetPostsOptions, allowFromCache bool) (*model.PostList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetPosts(options, allowFromCache) + result, err := s.PostStore.GetPosts(options, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetPosts", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetPostsAfter(options model.GetPostsOptions) (*model.PostList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetPostsAfter(options) + result, err := s.PostStore.GetPostsAfter(options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetPostsAfter", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetPostsBatchForIndexing(startTime int64, endTime int64, limit int) ([]*model.PostForIndexing, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetPostsBatchForIndexing(startTime, endTime, limit) + result, err := s.PostStore.GetPostsBatchForIndexing(startTime, endTime, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetPostsBatchForIndexing", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetPostsBefore(options model.GetPostsOptions) (*model.PostList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetPostsBefore(options) + result, err := s.PostStore.GetPostsBefore(options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetPostsBefore", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetPostsByIds(postIds []string) ([]*model.Post, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetPostsByIds(postIds) + result, err := s.PostStore.GetPostsByIds(postIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetPostsByIds", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetPostsCreatedAt(channelId string, time int64) ([]*model.Post, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetPostsCreatedAt(channelId, time) + result, err := s.PostStore.GetPostsCreatedAt(channelId, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetPostsCreatedAt", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetPostsSince(options model.GetPostsSinceOptions, allowFromCache bool) (*model.PostList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetPostsSince(options, allowFromCache) + result, err := s.PostStore.GetPostsSince(options, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetPostsSince", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetRepliesForExport(parentId string) ([]*model.ReplyForExport, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetRepliesForExport(parentId) + result, err := s.PostStore.GetRepliesForExport(parentId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetRepliesForExport", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) GetSingle(id string) (*model.Post, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.GetSingle(id) + result, err := s.PostStore.GetSingle(id) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.GetSingle", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) InvalidateLastPostTimeCache(channelId string) { @@ -4688,705 +4688,705 @@ func (s *TimerLayerPostStore) InvalidateLastPostTimeCache(channelId string) { func (s *TimerLayerPostStore) Overwrite(post *model.Post) (*model.Post, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.Overwrite(post) + result, err := s.PostStore.Overwrite(post) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.Overwrite", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) OverwriteMultiple(posts []*model.Post) ([]*model.Post, int, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1, resultVar2 := s.PostStore.OverwriteMultiple(posts) + result, resultVar1, err := s.PostStore.OverwriteMultiple(posts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar2 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.OverwriteMultiple", success, elapsed) } - return resultVar0, resultVar1, resultVar2 + return result, resultVar1, err } func (s *TimerLayerPostStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.PermanentDeleteBatch(endTime, limit) + result, err := s.PostStore.PermanentDeleteBatch(endTime, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.PermanentDeleteBatch", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) PermanentDeleteByChannel(channelId string) error { start := timemodule.Now() - resultVar0 := s.PostStore.PermanentDeleteByChannel(channelId) + err := s.PostStore.PermanentDeleteByChannel(channelId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.PermanentDeleteByChannel", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerPostStore) PermanentDeleteByUser(userId string) error { start := timemodule.Now() - resultVar0 := s.PostStore.PermanentDeleteByUser(userId) + err := s.PostStore.PermanentDeleteByUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.PermanentDeleteByUser", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerPostStore) Save(post *model.Post) (*model.Post, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.Save(post) + result, err := s.PostStore.Save(post) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) SaveMultiple(posts []*model.Post) ([]*model.Post, int, error) { start := timemodule.Now() - resultVar0, resultVar1, resultVar2 := s.PostStore.SaveMultiple(posts) + result, resultVar1, err := s.PostStore.SaveMultiple(posts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar2 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.SaveMultiple", success, elapsed) } - return resultVar0, resultVar1, resultVar2 + return result, resultVar1, err } func (s *TimerLayerPostStore) Search(teamId string, userId string, params *model.SearchParams) (*model.PostList, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.Search(teamId, userId, params) + result, err := s.PostStore.Search(teamId, userId, params) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.Search", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) SearchPostsInTeamForUser(paramsList []*model.SearchParams, userId string, teamId string, isOrSearch bool, includeDeletedChannels bool, page int, perPage int) (*model.PostSearchResults, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.SearchPostsInTeamForUser(paramsList, userId, teamId, isOrSearch, includeDeletedChannels, page, perPage) + result, err := s.PostStore.SearchPostsInTeamForUser(paramsList, userId, teamId, isOrSearch, includeDeletedChannels, page, perPage) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.SearchPostsInTeamForUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPostStore) Update(newPost *model.Post, oldPost *model.Post) (*model.Post, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.PostStore.Update(newPost, oldPost) + result, err := s.PostStore.Update(newPost, oldPost) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PostStore.Update", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPreferenceStore) CleanupFlagsBatch(limit int64) (int64, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.PreferenceStore.CleanupFlagsBatch(limit) + result, err := s.PreferenceStore.CleanupFlagsBatch(limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PreferenceStore.CleanupFlagsBatch", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPreferenceStore) Delete(userId string, category string, name string) error { start := timemodule.Now() - resultVar0 := s.PreferenceStore.Delete(userId, category, name) + err := s.PreferenceStore.Delete(userId, category, name) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PreferenceStore.Delete", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerPreferenceStore) DeleteCategory(userId string, category string) error { start := timemodule.Now() - resultVar0 := s.PreferenceStore.DeleteCategory(userId, category) + err := s.PreferenceStore.DeleteCategory(userId, category) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PreferenceStore.DeleteCategory", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerPreferenceStore) DeleteCategoryAndName(category string, name string) error { start := timemodule.Now() - resultVar0 := s.PreferenceStore.DeleteCategoryAndName(category, name) + err := s.PreferenceStore.DeleteCategoryAndName(category, name) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PreferenceStore.DeleteCategoryAndName", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerPreferenceStore) Get(userId string, category string, name string) (*model.Preference, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.PreferenceStore.Get(userId, category, name) + result, err := s.PreferenceStore.Get(userId, category, name) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PreferenceStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPreferenceStore) GetAll(userId string) (model.Preferences, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.PreferenceStore.GetAll(userId) + result, err := s.PreferenceStore.GetAll(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PreferenceStore.GetAll", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPreferenceStore) GetCategory(userId string, category string) (model.Preferences, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.PreferenceStore.GetCategory(userId, category) + result, err := s.PreferenceStore.GetCategory(userId, category) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PreferenceStore.GetCategory", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerPreferenceStore) PermanentDeleteByUser(userId string) error { start := timemodule.Now() - resultVar0 := s.PreferenceStore.PermanentDeleteByUser(userId) + err := s.PreferenceStore.PermanentDeleteByUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PreferenceStore.PermanentDeleteByUser", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerPreferenceStore) Save(preferences *model.Preferences) error { start := timemodule.Now() - resultVar0 := s.PreferenceStore.Save(preferences) + err := s.PreferenceStore.Save(preferences) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("PreferenceStore.Save", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerReactionStore) BulkGetForPosts(postIds []string) ([]*model.Reaction, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ReactionStore.BulkGetForPosts(postIds) + result, err := s.ReactionStore.BulkGetForPosts(postIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ReactionStore.BulkGetForPosts", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerReactionStore) Delete(reaction *model.Reaction) (*model.Reaction, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ReactionStore.Delete(reaction) + result, err := s.ReactionStore.Delete(reaction) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ReactionStore.Delete", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerReactionStore) DeleteAllWithEmojiName(emojiName string) error { start := timemodule.Now() - resultVar0 := s.ReactionStore.DeleteAllWithEmojiName(emojiName) + err := s.ReactionStore.DeleteAllWithEmojiName(emojiName) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ReactionStore.DeleteAllWithEmojiName", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerReactionStore) GetForPost(postId string, allowFromCache bool) ([]*model.Reaction, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ReactionStore.GetForPost(postId, allowFromCache) + result, err := s.ReactionStore.GetForPost(postId, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ReactionStore.GetForPost", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerReactionStore) PermanentDeleteBatch(endTime int64, limit int64) (int64, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ReactionStore.PermanentDeleteBatch(endTime, limit) + result, err := s.ReactionStore.PermanentDeleteBatch(endTime, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ReactionStore.PermanentDeleteBatch", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerReactionStore) Save(reaction *model.Reaction) (*model.Reaction, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.ReactionStore.Save(reaction) + result, err := s.ReactionStore.Save(reaction) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("ReactionStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerRoleStore) AllChannelSchemeRoles() ([]*model.Role, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.RoleStore.AllChannelSchemeRoles() + result, err := s.RoleStore.AllChannelSchemeRoles() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("RoleStore.AllChannelSchemeRoles", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerRoleStore) ChannelHigherScopedPermissions(roleNames []string) (map[string]*model.RolePermissions, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.RoleStore.ChannelHigherScopedPermissions(roleNames) + result, err := s.RoleStore.ChannelHigherScopedPermissions(roleNames) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("RoleStore.ChannelHigherScopedPermissions", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerRoleStore) ChannelRolesUnderTeamRole(roleName string) ([]*model.Role, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.RoleStore.ChannelRolesUnderTeamRole(roleName) + result, err := s.RoleStore.ChannelRolesUnderTeamRole(roleName) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("RoleStore.ChannelRolesUnderTeamRole", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerRoleStore) Delete(roleId string) (*model.Role, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.RoleStore.Delete(roleId) + result, err := s.RoleStore.Delete(roleId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("RoleStore.Delete", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerRoleStore) Get(roleId string) (*model.Role, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.RoleStore.Get(roleId) + result, err := s.RoleStore.Get(roleId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("RoleStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerRoleStore) GetAll() ([]*model.Role, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.RoleStore.GetAll() + result, err := s.RoleStore.GetAll() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("RoleStore.GetAll", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerRoleStore) GetByName(name string) (*model.Role, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.RoleStore.GetByName(name) + result, err := s.RoleStore.GetByName(name) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("RoleStore.GetByName", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerRoleStore) GetByNames(names []string) ([]*model.Role, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.RoleStore.GetByNames(names) + result, err := s.RoleStore.GetByNames(names) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("RoleStore.GetByNames", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerRoleStore) PermanentDeleteAll() error { start := timemodule.Now() - resultVar0 := s.RoleStore.PermanentDeleteAll() + err := s.RoleStore.PermanentDeleteAll() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("RoleStore.PermanentDeleteAll", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerRoleStore) Save(role *model.Role) (*model.Role, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.RoleStore.Save(role) + result, err := s.RoleStore.Save(role) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("RoleStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSchemeStore) CountByScope(scope string) (int64, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SchemeStore.CountByScope(scope) + result, err := s.SchemeStore.CountByScope(scope) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SchemeStore.CountByScope", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSchemeStore) CountWithoutPermission(scope string, permissionID string, roleScope model.RoleScope, roleType model.RoleType) (int64, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SchemeStore.CountWithoutPermission(scope, permissionID, roleScope, roleType) + result, err := s.SchemeStore.CountWithoutPermission(scope, permissionID, roleScope, roleType) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SchemeStore.CountWithoutPermission", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSchemeStore) Delete(schemeId string) (*model.Scheme, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SchemeStore.Delete(schemeId) + result, err := s.SchemeStore.Delete(schemeId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SchemeStore.Delete", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSchemeStore) Get(schemeId string) (*model.Scheme, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SchemeStore.Get(schemeId) + result, err := s.SchemeStore.Get(schemeId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SchemeStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSchemeStore) GetAllPage(scope string, offset int, limit int) ([]*model.Scheme, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SchemeStore.GetAllPage(scope, offset, limit) + result, err := s.SchemeStore.GetAllPage(scope, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SchemeStore.GetAllPage", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSchemeStore) GetByName(schemeName string) (*model.Scheme, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SchemeStore.GetByName(schemeName) + result, err := s.SchemeStore.GetByName(schemeName) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SchemeStore.GetByName", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSchemeStore) PermanentDeleteAll() error { start := timemodule.Now() - resultVar0 := s.SchemeStore.PermanentDeleteAll() + err := s.SchemeStore.PermanentDeleteAll() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SchemeStore.PermanentDeleteAll", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerSchemeStore) Save(scheme *model.Scheme) (*model.Scheme, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SchemeStore.Save(scheme) + result, err := s.SchemeStore.Save(scheme) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SchemeStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSessionStore) AnalyticsSessionCount() (int64, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SessionStore.AnalyticsSessionCount() + result, err := s.SessionStore.AnalyticsSessionCount() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.AnalyticsSessionCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSessionStore) Cleanup(expiryTime int64, batchSize int64) { @@ -5407,513 +5407,513 @@ func (s *TimerLayerSessionStore) Cleanup(expiryTime int64, batchSize int64) { func (s *TimerLayerSessionStore) Get(sessionIdOrToken string) (*model.Session, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SessionStore.Get(sessionIdOrToken) + result, err := s.SessionStore.Get(sessionIdOrToken) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSessionStore) GetSessions(userId string) ([]*model.Session, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SessionStore.GetSessions(userId) + result, err := s.SessionStore.GetSessions(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.GetSessions", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSessionStore) GetSessionsExpired(thresholdMillis int64, mobileOnly bool, unnotifiedOnly bool) ([]*model.Session, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SessionStore.GetSessionsExpired(thresholdMillis, mobileOnly, unnotifiedOnly) + result, err := s.SessionStore.GetSessionsExpired(thresholdMillis, mobileOnly, unnotifiedOnly) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.GetSessionsExpired", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSessionStore) GetSessionsWithActiveDeviceIds(userId string) ([]*model.Session, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SessionStore.GetSessionsWithActiveDeviceIds(userId) + result, err := s.SessionStore.GetSessionsWithActiveDeviceIds(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.GetSessionsWithActiveDeviceIds", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSessionStore) PermanentDeleteSessionsByUser(teamId string) error { start := timemodule.Now() - resultVar0 := s.SessionStore.PermanentDeleteSessionsByUser(teamId) + err := s.SessionStore.PermanentDeleteSessionsByUser(teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.PermanentDeleteSessionsByUser", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerSessionStore) Remove(sessionIdOrToken string) error { start := timemodule.Now() - resultVar0 := s.SessionStore.Remove(sessionIdOrToken) + err := s.SessionStore.Remove(sessionIdOrToken) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.Remove", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerSessionStore) RemoveAllSessions() error { start := timemodule.Now() - resultVar0 := s.SessionStore.RemoveAllSessions() + err := s.SessionStore.RemoveAllSessions() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.RemoveAllSessions", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerSessionStore) Save(session *model.Session) (*model.Session, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SessionStore.Save(session) + result, err := s.SessionStore.Save(session) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSessionStore) UpdateDeviceId(id string, deviceId string, expiresAt int64) (string, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SessionStore.UpdateDeviceId(id, deviceId, expiresAt) + result, err := s.SessionStore.UpdateDeviceId(id, deviceId, expiresAt) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.UpdateDeviceId", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSessionStore) UpdateExpiredNotify(sessionid string, notified bool) error { start := timemodule.Now() - resultVar0 := s.SessionStore.UpdateExpiredNotify(sessionid, notified) + err := s.SessionStore.UpdateExpiredNotify(sessionid, notified) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.UpdateExpiredNotify", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerSessionStore) UpdateExpiresAt(sessionId string, time int64) error { start := timemodule.Now() - resultVar0 := s.SessionStore.UpdateExpiresAt(sessionId, time) + err := s.SessionStore.UpdateExpiresAt(sessionId, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.UpdateExpiresAt", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerSessionStore) UpdateLastActivityAt(sessionId string, time int64) error { start := timemodule.Now() - resultVar0 := s.SessionStore.UpdateLastActivityAt(sessionId, time) + err := s.SessionStore.UpdateLastActivityAt(sessionId, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.UpdateLastActivityAt", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerSessionStore) UpdateProps(session *model.Session) error { start := timemodule.Now() - resultVar0 := s.SessionStore.UpdateProps(session) + err := s.SessionStore.UpdateProps(session) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.UpdateProps", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerSessionStore) UpdateRoles(userId string, roles string) (string, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.SessionStore.UpdateRoles(userId, roles) + result, err := s.SessionStore.UpdateRoles(userId, roles) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SessionStore.UpdateRoles", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerStatusStore) Get(userId string) (*model.Status, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.StatusStore.Get(userId) + result, err := s.StatusStore.Get(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("StatusStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerStatusStore) GetByIds(userIds []string) ([]*model.Status, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.StatusStore.GetByIds(userIds) + result, err := s.StatusStore.GetByIds(userIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("StatusStore.GetByIds", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerStatusStore) GetTotalActiveUsersCount() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.StatusStore.GetTotalActiveUsersCount() + result, err := s.StatusStore.GetTotalActiveUsersCount() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("StatusStore.GetTotalActiveUsersCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerStatusStore) ResetAll() *model.AppError { start := timemodule.Now() - resultVar0 := s.StatusStore.ResetAll() + err := s.StatusStore.ResetAll() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("StatusStore.ResetAll", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerStatusStore) SaveOrUpdate(status *model.Status) *model.AppError { start := timemodule.Now() - resultVar0 := s.StatusStore.SaveOrUpdate(status) + err := s.StatusStore.SaveOrUpdate(status) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("StatusStore.SaveOrUpdate", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerStatusStore) UpdateLastActivityAt(userId string, lastActivityAt int64) *model.AppError { start := timemodule.Now() - resultVar0 := s.StatusStore.UpdateLastActivityAt(userId, lastActivityAt) + err := s.StatusStore.UpdateLastActivityAt(userId, lastActivityAt) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("StatusStore.UpdateLastActivityAt", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerSystemStore) Get() (model.StringMap, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.SystemStore.Get() + result, err := s.SystemStore.Get() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SystemStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSystemStore) GetByName(name string) (*model.System, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.SystemStore.GetByName(name) + result, err := s.SystemStore.GetByName(name) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SystemStore.GetByName", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSystemStore) InsertIfExists(system *model.System) (*model.System, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.SystemStore.InsertIfExists(system) + result, err := s.SystemStore.InsertIfExists(system) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SystemStore.InsertIfExists", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSystemStore) PermanentDeleteByName(name string) (*model.System, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.SystemStore.PermanentDeleteByName(name) + result, err := s.SystemStore.PermanentDeleteByName(name) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SystemStore.PermanentDeleteByName", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerSystemStore) Save(system *model.System) *model.AppError { start := timemodule.Now() - resultVar0 := s.SystemStore.Save(system) + err := s.SystemStore.Save(system) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SystemStore.Save", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerSystemStore) SaveOrUpdate(system *model.System) *model.AppError { start := timemodule.Now() - resultVar0 := s.SystemStore.SaveOrUpdate(system) + err := s.SystemStore.SaveOrUpdate(system) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SystemStore.SaveOrUpdate", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerSystemStore) Update(system *model.System) *model.AppError { start := timemodule.Now() - resultVar0 := s.SystemStore.Update(system) + err := s.SystemStore.Update(system) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("SystemStore.Update", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerTeamStore) AnalyticsGetTeamCountForScheme(schemeId string) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.AnalyticsGetTeamCountForScheme(schemeId) + result, err := s.TeamStore.AnalyticsGetTeamCountForScheme(schemeId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.AnalyticsGetTeamCountForScheme", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) AnalyticsPrivateTeamCount() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.AnalyticsPrivateTeamCount() + result, err := s.TeamStore.AnalyticsPrivateTeamCount() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.AnalyticsPrivateTeamCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) AnalyticsPublicTeamCount() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.AnalyticsPublicTeamCount() + result, err := s.TeamStore.AnalyticsPublicTeamCount() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.AnalyticsPublicTeamCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) AnalyticsTeamCount(includeDeleted bool) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.AnalyticsTeamCount(includeDeleted) + result, err := s.TeamStore.AnalyticsTeamCount(includeDeleted) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.AnalyticsTeamCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) ClearAllCustomRoleAssignments() *model.AppError { start := timemodule.Now() - resultVar0 := s.TeamStore.ClearAllCustomRoleAssignments() + err := s.TeamStore.ClearAllCustomRoleAssignments() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.ClearAllCustomRoleAssignments", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerTeamStore) ClearCaches() { @@ -5934,417 +5934,417 @@ func (s *TimerLayerTeamStore) ClearCaches() { func (s *TimerLayerTeamStore) Get(id string) (*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.Get(id) + result, err := s.TeamStore.Get(id) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetActiveMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetActiveMemberCount(teamId, restrictions) + result, err := s.TeamStore.GetActiveMemberCount(teamId, restrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetActiveMemberCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetAll() ([]*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetAll() + result, err := s.TeamStore.GetAll() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetAll", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetAllForExportAfter(limit int, afterId string) ([]*model.TeamForExport, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetAllForExportAfter(limit, afterId) + result, err := s.TeamStore.GetAllForExportAfter(limit, afterId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetAllForExportAfter", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetAllPage(offset int, limit int) ([]*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetAllPage(offset, limit) + result, err := s.TeamStore.GetAllPage(offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetAllPage", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetAllPrivateTeamListing() ([]*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetAllPrivateTeamListing() + result, err := s.TeamStore.GetAllPrivateTeamListing() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetAllPrivateTeamListing", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetAllPrivateTeamPageListing(offset int, limit int) ([]*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetAllPrivateTeamPageListing(offset, limit) + result, err := s.TeamStore.GetAllPrivateTeamPageListing(offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetAllPrivateTeamPageListing", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetAllPublicTeamPageListing(offset int, limit int) ([]*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetAllPublicTeamPageListing(offset, limit) + result, err := s.TeamStore.GetAllPublicTeamPageListing(offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetAllPublicTeamPageListing", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetAllTeamListing() ([]*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetAllTeamListing() + result, err := s.TeamStore.GetAllTeamListing() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetAllTeamListing", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetAllTeamPageListing(offset int, limit int) ([]*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetAllTeamPageListing(offset, limit) + result, err := s.TeamStore.GetAllTeamPageListing(offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetAllTeamPageListing", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetByInviteId(inviteId string) (*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetByInviteId(inviteId) + result, err := s.TeamStore.GetByInviteId(inviteId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetByInviteId", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetByName(name string) (*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetByName(name) + result, err := s.TeamStore.GetByName(name) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetByName", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetByNames(name []string) ([]*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetByNames(name) + result, err := s.TeamStore.GetByNames(name) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetByNames", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetChannelUnreadsForAllTeams(excludeTeamId string, userId string) ([]*model.ChannelUnread, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetChannelUnreadsForAllTeams(excludeTeamId, userId) + result, err := s.TeamStore.GetChannelUnreadsForAllTeams(excludeTeamId, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetChannelUnreadsForAllTeams", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetChannelUnreadsForTeam(teamId string, userId string) ([]*model.ChannelUnread, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetChannelUnreadsForTeam(teamId, userId) + result, err := s.TeamStore.GetChannelUnreadsForTeam(teamId, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetChannelUnreadsForTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetMember(teamId string, userId string) (*model.TeamMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetMember(teamId, userId) + result, err := s.TeamStore.GetMember(teamId, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetMember", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetMembers(teamId string, offset int, limit int, teamMembersGetOptions *model.TeamMembersGetOptions) ([]*model.TeamMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetMembers(teamId, offset, limit, teamMembersGetOptions) + result, err := s.TeamStore.GetMembers(teamId, offset, limit, teamMembersGetOptions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetMembers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetMembersByIds(teamId string, userIds []string, restrictions *model.ViewUsersRestrictions) ([]*model.TeamMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetMembersByIds(teamId, userIds, restrictions) + result, err := s.TeamStore.GetMembersByIds(teamId, userIds, restrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetMembersByIds", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetTeamMembersForExport(userId string) ([]*model.TeamMemberForExport, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetTeamMembersForExport(userId) + result, err := s.TeamStore.GetTeamMembersForExport(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetTeamMembersForExport", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetTeamsByScheme(schemeId string, offset int, limit int) ([]*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetTeamsByScheme(schemeId, offset, limit) + result, err := s.TeamStore.GetTeamsByScheme(schemeId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetTeamsByScheme", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetTeamsByUserId(userId string) ([]*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetTeamsByUserId(userId) + result, err := s.TeamStore.GetTeamsByUserId(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetTeamsByUserId", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetTeamsForUser(userId string) ([]*model.TeamMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetTeamsForUser(userId) + result, err := s.TeamStore.GetTeamsForUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetTeamsForUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetTeamsForUserWithPagination(userId string, page int, perPage int) ([]*model.TeamMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetTeamsForUserWithPagination(userId, page, perPage) + result, err := s.TeamStore.GetTeamsForUserWithPagination(userId, page, perPage) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetTeamsForUserWithPagination", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetTotalMemberCount(teamId string, restrictions *model.ViewUsersRestrictions) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetTotalMemberCount(teamId, restrictions) + result, err := s.TeamStore.GetTotalMemberCount(teamId, restrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetTotalMemberCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GetUserTeamIds(userId string, allowFromCache bool) ([]string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GetUserTeamIds(userId, allowFromCache) + result, err := s.TeamStore.GetUserTeamIds(userId, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GetUserTeamIds", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) GroupSyncedTeamCount() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.GroupSyncedTeamCount() + result, err := s.TeamStore.GroupSyncedTeamCount() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.GroupSyncedTeamCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) InvalidateAllTeamIdsForUser(userId string) { @@ -6365,369 +6365,369 @@ func (s *TimerLayerTeamStore) InvalidateAllTeamIdsForUser(userId string) { func (s *TimerLayerTeamStore) MigrateTeamMembers(fromTeamId string, fromUserId string) (map[string]string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.MigrateTeamMembers(fromTeamId, fromUserId) + result, err := s.TeamStore.MigrateTeamMembers(fromTeamId, fromUserId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.MigrateTeamMembers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) PermanentDelete(teamId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.TeamStore.PermanentDelete(teamId) + err := s.TeamStore.PermanentDelete(teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.PermanentDelete", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerTeamStore) RemoveAllMembersByTeam(teamId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.TeamStore.RemoveAllMembersByTeam(teamId) + err := s.TeamStore.RemoveAllMembersByTeam(teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.RemoveAllMembersByTeam", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerTeamStore) RemoveAllMembersByUser(userId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.TeamStore.RemoveAllMembersByUser(userId) + err := s.TeamStore.RemoveAllMembersByUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.RemoveAllMembersByUser", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerTeamStore) RemoveMember(teamId string, userId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.TeamStore.RemoveMember(teamId, userId) + err := s.TeamStore.RemoveMember(teamId, userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.RemoveMember", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerTeamStore) RemoveMembers(teamId string, userIds []string) *model.AppError { start := timemodule.Now() - resultVar0 := s.TeamStore.RemoveMembers(teamId, userIds) + err := s.TeamStore.RemoveMembers(teamId, userIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.RemoveMembers", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerTeamStore) ResetAllTeamSchemes() *model.AppError { start := timemodule.Now() - resultVar0 := s.TeamStore.ResetAllTeamSchemes() + err := s.TeamStore.ResetAllTeamSchemes() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.ResetAllTeamSchemes", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerTeamStore) Save(team *model.Team) (*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.Save(team) + result, err := s.TeamStore.Save(team) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) SaveMember(member *model.TeamMember, maxUsersPerTeam int) (*model.TeamMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.SaveMember(member, maxUsersPerTeam) + result, err := s.TeamStore.SaveMember(member, maxUsersPerTeam) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.SaveMember", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) SaveMultipleMembers(members []*model.TeamMember, maxUsersPerTeam int) ([]*model.TeamMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.SaveMultipleMembers(members, maxUsersPerTeam) + result, err := s.TeamStore.SaveMultipleMembers(members, maxUsersPerTeam) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.SaveMultipleMembers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) SearchAll(term string, opts *model.TeamSearch) ([]*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.SearchAll(term, opts) + result, err := s.TeamStore.SearchAll(term, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.SearchAll", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) SearchAllPaged(term string, opts *model.TeamSearch) ([]*model.Team, int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1, resultVar2 := s.TeamStore.SearchAllPaged(term, opts) + result, resultVar1, err := s.TeamStore.SearchAllPaged(term, opts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar2 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.SearchAllPaged", success, elapsed) } - return resultVar0, resultVar1, resultVar2 + return result, resultVar1, err } func (s *TimerLayerTeamStore) SearchOpen(term string) ([]*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.SearchOpen(term) + result, err := s.TeamStore.SearchOpen(term) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.SearchOpen", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) SearchPrivate(term string) ([]*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.SearchPrivate(term) + result, err := s.TeamStore.SearchPrivate(term) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.SearchPrivate", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) Update(team *model.Team) (*model.Team, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.Update(team) + result, err := s.TeamStore.Update(team) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.Update", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) UpdateLastTeamIconUpdate(teamId string, curTime int64) *model.AppError { start := timemodule.Now() - resultVar0 := s.TeamStore.UpdateLastTeamIconUpdate(teamId, curTime) + err := s.TeamStore.UpdateLastTeamIconUpdate(teamId, curTime) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.UpdateLastTeamIconUpdate", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerTeamStore) UpdateMember(member *model.TeamMember) (*model.TeamMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.UpdateMember(member) + result, err := s.TeamStore.UpdateMember(member) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.UpdateMember", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) UpdateMembersRole(teamID string, userIDs []string) *model.AppError { start := timemodule.Now() - resultVar0 := s.TeamStore.UpdateMembersRole(teamID, userIDs) + err := s.TeamStore.UpdateMembersRole(teamID, userIDs) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.UpdateMembersRole", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerTeamStore) UpdateMultipleMembers(members []*model.TeamMember) ([]*model.TeamMember, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.UpdateMultipleMembers(members) + result, err := s.TeamStore.UpdateMultipleMembers(members) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.UpdateMultipleMembers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTeamStore) UserBelongsToTeams(userId string, teamIds []string) (bool, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.TeamStore.UserBelongsToTeams(userId, teamIds) + result, err := s.TeamStore.UserBelongsToTeams(userId, teamIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TeamStore.UserBelongsToTeams", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTermsOfServiceStore) Get(id string, allowFromCache bool) (*model.TermsOfService, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.TermsOfServiceStore.Get(id, allowFromCache) + result, err := s.TermsOfServiceStore.Get(id, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TermsOfServiceStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTermsOfServiceStore) GetLatest(allowFromCache bool) (*model.TermsOfService, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.TermsOfServiceStore.GetLatest(allowFromCache) + result, err := s.TermsOfServiceStore.GetLatest(allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TermsOfServiceStore.GetLatest", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTermsOfServiceStore) Save(termsOfService *model.TermsOfService) (*model.TermsOfService, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.TermsOfServiceStore.Save(termsOfService) + result, err := s.TermsOfServiceStore.Save(termsOfService) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TermsOfServiceStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTokenStore) Cleanup() { @@ -6748,161 +6748,161 @@ func (s *TimerLayerTokenStore) Cleanup() { func (s *TimerLayerTokenStore) Delete(token string) error { start := timemodule.Now() - resultVar0 := s.TokenStore.Delete(token) + err := s.TokenStore.Delete(token) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TokenStore.Delete", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerTokenStore) GetByToken(token string) (*model.Token, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.TokenStore.GetByToken(token) + result, err := s.TokenStore.GetByToken(token) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TokenStore.GetByToken", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerTokenStore) RemoveAllTokensByType(tokenType string) error { start := timemodule.Now() - resultVar0 := s.TokenStore.RemoveAllTokensByType(tokenType) + err := s.TokenStore.RemoveAllTokensByType(tokenType) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TokenStore.RemoveAllTokensByType", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerTokenStore) Save(recovery *model.Token) error { start := timemodule.Now() - resultVar0 := s.TokenStore.Save(recovery) + err := s.TokenStore.Save(recovery) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("TokenStore.Save", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserStore) AnalyticsActiveCount(time int64, options model.UserCountOptions) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.AnalyticsActiveCount(time, options) + result, err := s.UserStore.AnalyticsActiveCount(time, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.AnalyticsActiveCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) AnalyticsGetGuestCount() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.AnalyticsGetGuestCount() + result, err := s.UserStore.AnalyticsGetGuestCount() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.AnalyticsGetGuestCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) AnalyticsGetInactiveUsersCount() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.AnalyticsGetInactiveUsersCount() + result, err := s.UserStore.AnalyticsGetInactiveUsersCount() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.AnalyticsGetInactiveUsersCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) AnalyticsGetSystemAdminCount() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.AnalyticsGetSystemAdminCount() + result, err := s.UserStore.AnalyticsGetSystemAdminCount() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.AnalyticsGetSystemAdminCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) AutocompleteUsersInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) (*model.UserAutocompleteInChannel, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.AutocompleteUsersInChannel(teamId, channelId, term, options) + result, err := s.UserStore.AutocompleteUsersInChannel(teamId, channelId, term, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.AutocompleteUsersInChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) ClearAllCustomRoleAssignments() *model.AppError { start := timemodule.Now() - resultVar0 := s.UserStore.ClearAllCustomRoleAssignments() + err := s.UserStore.ClearAllCustomRoleAssignments() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.ClearAllCustomRoleAssignments", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserStore) ClearCaches() { @@ -6923,247 +6923,247 @@ func (s *TimerLayerUserStore) ClearCaches() { func (s *TimerLayerUserStore) Count(options model.UserCountOptions) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.Count(options) + result, err := s.UserStore.Count(options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.Count", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) DeactivateGuests() ([]string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.DeactivateGuests() + result, err := s.UserStore.DeactivateGuests() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.DeactivateGuests", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) DemoteUserToGuest(userID string) *model.AppError { start := timemodule.Now() - resultVar0 := s.UserStore.DemoteUserToGuest(userID) + err := s.UserStore.DemoteUserToGuest(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.DemoteUserToGuest", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserStore) Get(id string) (*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.Get(id) + result, err := s.UserStore.Get(id) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetAll() ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetAll() + result, err := s.UserStore.GetAll() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetAll", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetAllAfter(limit int, afterId string) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetAllAfter(limit, afterId) + result, err := s.UserStore.GetAllAfter(limit, afterId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetAllAfter", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetAllNotInAuthService(authServices []string) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetAllNotInAuthService(authServices) + result, err := s.UserStore.GetAllNotInAuthService(authServices) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetAllNotInAuthService", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetAllProfiles(options *model.UserGetOptions) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetAllProfiles(options) + result, err := s.UserStore.GetAllProfiles(options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetAllProfiles", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetAllProfilesInChannel(channelId string, allowFromCache bool) (map[string]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetAllProfilesInChannel(channelId, allowFromCache) + result, err := s.UserStore.GetAllProfilesInChannel(channelId, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetAllProfilesInChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetAllUsingAuthService(authService string) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetAllUsingAuthService(authService) + result, err := s.UserStore.GetAllUsingAuthService(authService) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetAllUsingAuthService", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetAnyUnreadPostCountForChannel(userId string, channelId string) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetAnyUnreadPostCountForChannel(userId, channelId) + result, err := s.UserStore.GetAnyUnreadPostCountForChannel(userId, channelId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetAnyUnreadPostCountForChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetByAuth(authData *string, authService string) (*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetByAuth(authData, authService) + result, err := s.UserStore.GetByAuth(authData, authService) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetByAuth", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetByEmail(email string) (*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetByEmail(email) + result, err := s.UserStore.GetByEmail(email) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetByEmail", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetByUsername(username string) (*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetByUsername(username) + result, err := s.UserStore.GetByUsername(username) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetByUsername", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetChannelGroupUsers(channelID string) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetChannelGroupUsers(channelID) + result, err := s.UserStore.GetChannelGroupUsers(channelID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetChannelGroupUsers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetEtagForAllProfiles() string { start := timemodule.Now() - resultVar0 := s.UserStore.GetEtagForAllProfiles() + result := s.UserStore.GetEtagForAllProfiles() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7173,13 +7173,13 @@ func (s *TimerLayerUserStore) GetEtagForAllProfiles() string { } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetEtagForAllProfiles", success, elapsed) } - return resultVar0 + return result } func (s *TimerLayerUserStore) GetEtagForProfiles(teamId string) string { start := timemodule.Now() - resultVar0 := s.UserStore.GetEtagForProfiles(teamId) + result := s.UserStore.GetEtagForProfiles(teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7189,13 +7189,13 @@ func (s *TimerLayerUserStore) GetEtagForProfiles(teamId string) string { } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetEtagForProfiles", success, elapsed) } - return resultVar0 + return result } func (s *TimerLayerUserStore) GetEtagForProfilesNotInTeam(teamId string) string { start := timemodule.Now() - resultVar0 := s.UserStore.GetEtagForProfilesNotInTeam(teamId) + result := s.UserStore.GetEtagForProfilesNotInTeam(teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { @@ -7205,311 +7205,311 @@ func (s *TimerLayerUserStore) GetEtagForProfilesNotInTeam(teamId string) string } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetEtagForProfilesNotInTeam", success, elapsed) } - return resultVar0 + return result } func (s *TimerLayerUserStore) GetForLogin(loginId string, allowSignInWithUsername bool, allowSignInWithEmail bool) (*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetForLogin(loginId, allowSignInWithUsername, allowSignInWithEmail) + result, err := s.UserStore.GetForLogin(loginId, allowSignInWithUsername, allowSignInWithEmail) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetForLogin", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetKnownUsers(userID string) ([]string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetKnownUsers(userID) + result, err := s.UserStore.GetKnownUsers(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetKnownUsers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetNewUsersForTeam(teamId string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetNewUsersForTeam(teamId, offset, limit, viewRestrictions) + result, err := s.UserStore.GetNewUsersForTeam(teamId, offset, limit, viewRestrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetNewUsersForTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetProfileByGroupChannelIdsForUser(userId string, channelIds []string) (map[string][]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetProfileByGroupChannelIdsForUser(userId, channelIds) + result, err := s.UserStore.GetProfileByGroupChannelIdsForUser(userId, channelIds) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetProfileByGroupChannelIdsForUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetProfileByIds(userIds []string, options *store.UserGetByIdsOpts, allowFromCache bool) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetProfileByIds(userIds, options, allowFromCache) + result, err := s.UserStore.GetProfileByIds(userIds, options, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetProfileByIds", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetProfiles(options *model.UserGetOptions) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetProfiles(options) + result, err := s.UserStore.GetProfiles(options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetProfiles", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetProfilesByUsernames(usernames []string, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetProfilesByUsernames(usernames, viewRestrictions) + result, err := s.UserStore.GetProfilesByUsernames(usernames, viewRestrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetProfilesByUsernames", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetProfilesInChannel(channelId string, offset int, limit int) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetProfilesInChannel(channelId, offset, limit) + result, err := s.UserStore.GetProfilesInChannel(channelId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetProfilesInChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetProfilesInChannelByStatus(channelId string, offset int, limit int) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetProfilesInChannelByStatus(channelId, offset, limit) + result, err := s.UserStore.GetProfilesInChannelByStatus(channelId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetProfilesInChannelByStatus", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetProfilesNotInChannel(teamId string, channelId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetProfilesNotInChannel(teamId, channelId, groupConstrained, offset, limit, viewRestrictions) + result, err := s.UserStore.GetProfilesNotInChannel(teamId, channelId, groupConstrained, offset, limit, viewRestrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetProfilesNotInChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetProfilesNotInTeam(teamId string, groupConstrained bool, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetProfilesNotInTeam(teamId, groupConstrained, offset, limit, viewRestrictions) + result, err := s.UserStore.GetProfilesNotInTeam(teamId, groupConstrained, offset, limit, viewRestrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetProfilesNotInTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetProfilesWithoutTeam(options *model.UserGetOptions) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetProfilesWithoutTeam(options) + result, err := s.UserStore.GetProfilesWithoutTeam(options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetProfilesWithoutTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetRecentlyActiveUsersForTeam(teamId string, offset int, limit int, viewRestrictions *model.ViewUsersRestrictions) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetRecentlyActiveUsersForTeam(teamId, offset, limit, viewRestrictions) + result, err := s.UserStore.GetRecentlyActiveUsersForTeam(teamId, offset, limit, viewRestrictions) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetRecentlyActiveUsersForTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetSystemAdminProfiles() (map[string]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetSystemAdminProfiles() + result, err := s.UserStore.GetSystemAdminProfiles() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetSystemAdminProfiles", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetTeamGroupUsers(teamID string) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetTeamGroupUsers(teamID) + result, err := s.UserStore.GetTeamGroupUsers(teamID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetTeamGroupUsers", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetUnreadCount(userId string) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetUnreadCount(userId) + result, err := s.UserStore.GetUnreadCount(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetUnreadCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetUnreadCountForChannel(userId string, channelId string) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetUnreadCountForChannel(userId, channelId) + result, err := s.UserStore.GetUnreadCountForChannel(userId, channelId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetUnreadCountForChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) GetUsersBatchForIndexing(startTime int64, endTime int64, limit int) ([]*model.UserForIndexing, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.GetUsersBatchForIndexing(startTime, endTime, limit) + result, err := s.UserStore.GetUsersBatchForIndexing(startTime, endTime, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.GetUsersBatchForIndexing", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) InferSystemInstallDate() (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.InferSystemInstallDate() + result, err := s.UserStore.InferSystemInstallDate() elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.InferSystemInstallDate", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) InvalidateProfileCacheForUser(userId string) { @@ -7560,545 +7560,545 @@ func (s *TimerLayerUserStore) InvalidateProfilesInChannelCacheByUser(userId stri func (s *TimerLayerUserStore) PermanentDelete(userId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.UserStore.PermanentDelete(userId) + err := s.UserStore.PermanentDelete(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.PermanentDelete", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserStore) PromoteGuestToUser(userID string) *model.AppError { start := timemodule.Now() - resultVar0 := s.UserStore.PromoteGuestToUser(userID) + err := s.UserStore.PromoteGuestToUser(userID) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.PromoteGuestToUser", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserStore) ResetLastPictureUpdate(userId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.UserStore.ResetLastPictureUpdate(userId) + err := s.UserStore.ResetLastPictureUpdate(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.ResetLastPictureUpdate", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserStore) Save(user *model.User) (*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.Save(user) + result, err := s.UserStore.Save(user) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) Search(teamId string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.Search(teamId, term, options) + result, err := s.UserStore.Search(teamId, term, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.Search", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) SearchInChannel(channelId string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.SearchInChannel(channelId, term, options) + result, err := s.UserStore.SearchInChannel(channelId, term, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.SearchInChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) SearchInGroup(groupID string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.SearchInGroup(groupID, term, options) + result, err := s.UserStore.SearchInGroup(groupID, term, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.SearchInGroup", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) SearchNotInChannel(teamId string, channelId string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.SearchNotInChannel(teamId, channelId, term, options) + result, err := s.UserStore.SearchNotInChannel(teamId, channelId, term, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.SearchNotInChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) SearchNotInTeam(notInTeamId string, term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.SearchNotInTeam(notInTeamId, term, options) + result, err := s.UserStore.SearchNotInTeam(notInTeamId, term, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.SearchNotInTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) SearchWithoutTeam(term string, options *model.UserSearchOptions) ([]*model.User, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.SearchWithoutTeam(term, options) + result, err := s.UserStore.SearchWithoutTeam(term, options) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.SearchWithoutTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) Update(user *model.User, allowRoleUpdate bool) (*model.UserUpdate, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.Update(user, allowRoleUpdate) + result, err := s.UserStore.Update(user, allowRoleUpdate) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.Update", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) UpdateAuthData(userId string, service string, authData *string, email string, resetMfa bool) (string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.UpdateAuthData(userId, service, authData, email, resetMfa) + result, err := s.UserStore.UpdateAuthData(userId, service, authData, email, resetMfa) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.UpdateAuthData", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) UpdateFailedPasswordAttempts(userId string, attempts int) *model.AppError { start := timemodule.Now() - resultVar0 := s.UserStore.UpdateFailedPasswordAttempts(userId, attempts) + err := s.UserStore.UpdateFailedPasswordAttempts(userId, attempts) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.UpdateFailedPasswordAttempts", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserStore) UpdateLastPictureUpdate(userId string) *model.AppError { start := timemodule.Now() - resultVar0 := s.UserStore.UpdateLastPictureUpdate(userId) + err := s.UserStore.UpdateLastPictureUpdate(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.UpdateLastPictureUpdate", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserStore) UpdateMfaActive(userId string, active bool) *model.AppError { start := timemodule.Now() - resultVar0 := s.UserStore.UpdateMfaActive(userId, active) + err := s.UserStore.UpdateMfaActive(userId, active) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.UpdateMfaActive", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserStore) UpdateMfaSecret(userId string, secret string) *model.AppError { start := timemodule.Now() - resultVar0 := s.UserStore.UpdateMfaSecret(userId, secret) + err := s.UserStore.UpdateMfaSecret(userId, secret) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.UpdateMfaSecret", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserStore) UpdatePassword(userId string, newPassword string) *model.AppError { start := timemodule.Now() - resultVar0 := s.UserStore.UpdatePassword(userId, newPassword) + err := s.UserStore.UpdatePassword(userId, newPassword) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.UpdatePassword", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserStore) UpdateUpdateAt(userId string) (int64, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.UpdateUpdateAt(userId) + result, err := s.UserStore.UpdateUpdateAt(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.UpdateUpdateAt", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserStore) VerifyEmail(userId string, email string) (string, *model.AppError) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserStore.VerifyEmail(userId, email) + result, err := s.UserStore.VerifyEmail(userId, email) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserStore.VerifyEmail", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserAccessTokenStore) Delete(tokenId string) error { start := timemodule.Now() - resultVar0 := s.UserAccessTokenStore.Delete(tokenId) + err := s.UserAccessTokenStore.Delete(tokenId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserAccessTokenStore.Delete", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserAccessTokenStore) DeleteAllForUser(userId string) error { start := timemodule.Now() - resultVar0 := s.UserAccessTokenStore.DeleteAllForUser(userId) + err := s.UserAccessTokenStore.DeleteAllForUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserAccessTokenStore.DeleteAllForUser", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserAccessTokenStore) Get(tokenId string) (*model.UserAccessToken, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserAccessTokenStore.Get(tokenId) + result, err := s.UserAccessTokenStore.Get(tokenId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserAccessTokenStore.Get", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserAccessTokenStore) GetAll(offset int, limit int) ([]*model.UserAccessToken, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserAccessTokenStore.GetAll(offset, limit) + result, err := s.UserAccessTokenStore.GetAll(offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserAccessTokenStore.GetAll", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserAccessTokenStore) GetByToken(tokenString string) (*model.UserAccessToken, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserAccessTokenStore.GetByToken(tokenString) + result, err := s.UserAccessTokenStore.GetByToken(tokenString) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserAccessTokenStore.GetByToken", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserAccessTokenStore) GetByUser(userId string, page int, perPage int) ([]*model.UserAccessToken, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserAccessTokenStore.GetByUser(userId, page, perPage) + result, err := s.UserAccessTokenStore.GetByUser(userId, page, perPage) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserAccessTokenStore.GetByUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserAccessTokenStore) Save(token *model.UserAccessToken) (*model.UserAccessToken, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserAccessTokenStore.Save(token) + result, err := s.UserAccessTokenStore.Save(token) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserAccessTokenStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserAccessTokenStore) Search(term string) ([]*model.UserAccessToken, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserAccessTokenStore.Search(term) + result, err := s.UserAccessTokenStore.Search(term) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserAccessTokenStore.Search", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserAccessTokenStore) UpdateTokenDisable(tokenId string) error { start := timemodule.Now() - resultVar0 := s.UserAccessTokenStore.UpdateTokenDisable(tokenId) + err := s.UserAccessTokenStore.UpdateTokenDisable(tokenId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserAccessTokenStore.UpdateTokenDisable", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserAccessTokenStore) UpdateTokenEnable(tokenId string) error { start := timemodule.Now() - resultVar0 := s.UserAccessTokenStore.UpdateTokenEnable(tokenId) + err := s.UserAccessTokenStore.UpdateTokenEnable(tokenId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserAccessTokenStore.UpdateTokenEnable", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserTermsOfServiceStore) Delete(userId string, termsOfServiceId string) error { start := timemodule.Now() - resultVar0 := s.UserTermsOfServiceStore.Delete(userId, termsOfServiceId) + err := s.UserTermsOfServiceStore.Delete(userId, termsOfServiceId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserTermsOfServiceStore.Delete", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerUserTermsOfServiceStore) GetByUser(userId string) (*model.UserTermsOfService, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserTermsOfServiceStore.GetByUser(userId) + result, err := s.UserTermsOfServiceStore.GetByUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserTermsOfServiceStore.GetByUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerUserTermsOfServiceStore) Save(userTermsOfService *model.UserTermsOfService) (*model.UserTermsOfService, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.UserTermsOfServiceStore.Save(userTermsOfService) + result, err := s.UserTermsOfServiceStore.Save(userTermsOfService) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("UserTermsOfServiceStore.Save", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) AnalyticsIncomingCount(teamId string) (int64, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.AnalyticsIncomingCount(teamId) + result, err := s.WebhookStore.AnalyticsIncomingCount(teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.AnalyticsIncomingCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) AnalyticsOutgoingCount(teamId string) (int64, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.AnalyticsOutgoingCount(teamId) + result, err := s.WebhookStore.AnalyticsOutgoingCount(teamId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.AnalyticsOutgoingCount", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) ClearCaches() { @@ -8119,241 +8119,241 @@ func (s *TimerLayerWebhookStore) ClearCaches() { func (s *TimerLayerWebhookStore) DeleteIncoming(webhookId string, time int64) error { start := timemodule.Now() - resultVar0 := s.WebhookStore.DeleteIncoming(webhookId, time) + err := s.WebhookStore.DeleteIncoming(webhookId, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.DeleteIncoming", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerWebhookStore) DeleteOutgoing(webhookId string, time int64) error { start := timemodule.Now() - resultVar0 := s.WebhookStore.DeleteOutgoing(webhookId, time) + err := s.WebhookStore.DeleteOutgoing(webhookId, time) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.DeleteOutgoing", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerWebhookStore) GetIncoming(id string, allowFromCache bool) (*model.IncomingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.GetIncoming(id, allowFromCache) + result, err := s.WebhookStore.GetIncoming(id, allowFromCache) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.GetIncoming", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) GetIncomingByChannel(channelId string) ([]*model.IncomingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.GetIncomingByChannel(channelId) + result, err := s.WebhookStore.GetIncomingByChannel(channelId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.GetIncomingByChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) GetIncomingByTeam(teamId string, offset int, limit int) ([]*model.IncomingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.GetIncomingByTeam(teamId, offset, limit) + result, err := s.WebhookStore.GetIncomingByTeam(teamId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.GetIncomingByTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) GetIncomingByTeamByUser(teamId string, userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.GetIncomingByTeamByUser(teamId, userId, offset, limit) + result, err := s.WebhookStore.GetIncomingByTeamByUser(teamId, userId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.GetIncomingByTeamByUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) GetIncomingList(offset int, limit int) ([]*model.IncomingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.GetIncomingList(offset, limit) + result, err := s.WebhookStore.GetIncomingList(offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.GetIncomingList", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) GetIncomingListByUser(userId string, offset int, limit int) ([]*model.IncomingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.GetIncomingListByUser(userId, offset, limit) + result, err := s.WebhookStore.GetIncomingListByUser(userId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.GetIncomingListByUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) GetOutgoing(id string) (*model.OutgoingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.GetOutgoing(id) + result, err := s.WebhookStore.GetOutgoing(id) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.GetOutgoing", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) GetOutgoingByChannel(channelId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.GetOutgoingByChannel(channelId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByChannel(channelId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.GetOutgoingByChannel", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) GetOutgoingByChannelByUser(channelId string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.GetOutgoingByChannelByUser(channelId, userId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByChannelByUser(channelId, userId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.GetOutgoingByChannelByUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) GetOutgoingByTeam(teamId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.GetOutgoingByTeam(teamId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByTeam(teamId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.GetOutgoingByTeam", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) GetOutgoingByTeamByUser(teamId string, userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.GetOutgoingByTeamByUser(teamId, userId, offset, limit) + result, err := s.WebhookStore.GetOutgoingByTeamByUser(teamId, userId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.GetOutgoingByTeamByUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) GetOutgoingList(offset int, limit int) ([]*model.OutgoingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.GetOutgoingList(offset, limit) + result, err := s.WebhookStore.GetOutgoingList(offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.GetOutgoingList", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) GetOutgoingListByUser(userId string, offset int, limit int) ([]*model.OutgoingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.GetOutgoingListByUser(userId, offset, limit) + result, err := s.WebhookStore.GetOutgoingListByUser(userId, offset, limit) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.GetOutgoingListByUser", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) InvalidateWebhookCache(webhook string) { @@ -8374,129 +8374,129 @@ func (s *TimerLayerWebhookStore) InvalidateWebhookCache(webhook string) { func (s *TimerLayerWebhookStore) PermanentDeleteIncomingByChannel(channelId string) error { start := timemodule.Now() - resultVar0 := s.WebhookStore.PermanentDeleteIncomingByChannel(channelId) + err := s.WebhookStore.PermanentDeleteIncomingByChannel(channelId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.PermanentDeleteIncomingByChannel", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerWebhookStore) PermanentDeleteIncomingByUser(userId string) error { start := timemodule.Now() - resultVar0 := s.WebhookStore.PermanentDeleteIncomingByUser(userId) + err := s.WebhookStore.PermanentDeleteIncomingByUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.PermanentDeleteIncomingByUser", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerWebhookStore) PermanentDeleteOutgoingByChannel(channelId string) error { start := timemodule.Now() - resultVar0 := s.WebhookStore.PermanentDeleteOutgoingByChannel(channelId) + err := s.WebhookStore.PermanentDeleteOutgoingByChannel(channelId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.PermanentDeleteOutgoingByChannel", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerWebhookStore) PermanentDeleteOutgoingByUser(userId string) error { start := timemodule.Now() - resultVar0 := s.WebhookStore.PermanentDeleteOutgoingByUser(userId) + err := s.WebhookStore.PermanentDeleteOutgoingByUser(userId) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar0 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.PermanentDeleteOutgoingByUser", success, elapsed) } - return resultVar0 + return err } func (s *TimerLayerWebhookStore) SaveIncoming(webhook *model.IncomingWebhook) (*model.IncomingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.SaveIncoming(webhook) + result, err := s.WebhookStore.SaveIncoming(webhook) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.SaveIncoming", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) SaveOutgoing(webhook *model.OutgoingWebhook) (*model.OutgoingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.SaveOutgoing(webhook) + result, err := s.WebhookStore.SaveOutgoing(webhook) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.SaveOutgoing", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) UpdateIncoming(webhook *model.IncomingWebhook) (*model.IncomingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.UpdateIncoming(webhook) + result, err := s.WebhookStore.UpdateIncoming(webhook) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.UpdateIncoming", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayerWebhookStore) UpdateOutgoing(hook *model.OutgoingWebhook) (*model.OutgoingWebhook, error) { start := timemodule.Now() - resultVar0, resultVar1 := s.WebhookStore.UpdateOutgoing(hook) + result, err := s.WebhookStore.UpdateOutgoing(hook) elapsed := float64(timemodule.Since(start)) / float64(timemodule.Second) if s.Root.Metrics != nil { success := "false" - if resultVar1 == nil { + if err == nil { success = "true" } s.Root.Metrics.ObserveStoreMethodDuration("WebhookStore.UpdateOutgoing", success, elapsed) } - return resultVar0, resultVar1 + return result, err } func (s *TimerLayer) Close() {