[chore/performance] Avoid unnecessary "uncached" queries (#3265)
* [chore/performance] Avoid unnecessary "uncached" queries * go fmt
This commit is contained in:
parent
f924297af1
commit
25a815a8a4
|
@ -64,8 +64,15 @@ func (a *accountDB) GetAccountsByIDs(ctx context.Context, ids []string) ([]*gtsm
|
||||||
accounts, err := a.state.Caches.DB.Account.LoadIDs("ID",
|
accounts, err := a.state.Caches.DB.Account.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.Account, error) {
|
func(uncached []string) ([]*gtsmodel.Account, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached accounts.
|
// Preallocate expected length of uncached accounts.
|
||||||
accounts := make([]*gtsmodel.Account, 0, len(uncached))
|
accounts := make([]*gtsmodel.Account, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) account IDs.
|
// the remaining (uncached) account IDs.
|
||||||
|
|
|
@ -147,8 +147,15 @@ func (a *applicationDB) GetAllTokens(ctx context.Context) ([]*gtsmodel.Token, er
|
||||||
tokens, err := a.state.Caches.DB.Token.LoadIDs("ID",
|
tokens, err := a.state.Caches.DB.Token.LoadIDs("ID",
|
||||||
tokenIDs,
|
tokenIDs,
|
||||||
func(uncached []string) ([]*gtsmodel.Token, error) {
|
func(uncached []string) ([]*gtsmodel.Token, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached tokens.
|
// Preallocate expected length of uncached tokens.
|
||||||
tokens := make([]*gtsmodel.Token, 0, len(uncached))
|
tokens := make([]*gtsmodel.Token, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) token IDs.
|
// the remaining (uncached) token IDs.
|
||||||
|
|
|
@ -187,8 +187,15 @@ func (c *conversationDB) getConversationsByLastStatusIDs(
|
||||||
accountID,
|
accountID,
|
||||||
conversationLastStatusIDs,
|
conversationLastStatusIDs,
|
||||||
func(accountID string, uncached []string) ([]*gtsmodel.Conversation, error) {
|
func(accountID string, uncached []string) ([]*gtsmodel.Conversation, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached conversations.
|
// Preallocate expected length of uncached conversations.
|
||||||
conversations := make([]*gtsmodel.Conversation, 0, len(uncached))
|
conversations := make([]*gtsmodel.Conversation, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning the remaining (uncached) IDs.
|
// Perform database query scanning the remaining (uncached) IDs.
|
||||||
if err := c.db.NewSelect().
|
if err := c.db.NewSelect().
|
||||||
|
|
|
@ -586,8 +586,15 @@ func (e *emojiDB) GetEmojisByIDs(ctx context.Context, ids []string) ([]*gtsmodel
|
||||||
emojis, err := e.state.Caches.DB.Emoji.LoadIDs("ID",
|
emojis, err := e.state.Caches.DB.Emoji.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.Emoji, error) {
|
func(uncached []string) ([]*gtsmodel.Emoji, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached emojis.
|
// Preallocate expected length of uncached emojis.
|
||||||
emojis := make([]*gtsmodel.Emoji, 0, len(uncached))
|
emojis := make([]*gtsmodel.Emoji, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) IDs.
|
// the remaining (uncached) IDs.
|
||||||
|
@ -650,8 +657,15 @@ func (e *emojiDB) GetEmojiCategoriesByIDs(ctx context.Context, ids []string) ([]
|
||||||
categories, err := e.state.Caches.DB.EmojiCategory.LoadIDs("ID",
|
categories, err := e.state.Caches.DB.EmojiCategory.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.EmojiCategory, error) {
|
func(uncached []string) ([]*gtsmodel.EmojiCategory, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached categories.
|
// Preallocate expected length of uncached categories.
|
||||||
categories := make([]*gtsmodel.EmojiCategory, 0, len(uncached))
|
categories := make([]*gtsmodel.EmojiCategory, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) IDs.
|
// the remaining (uncached) IDs.
|
||||||
|
|
|
@ -353,8 +353,15 @@ func (l *listDB) GetListsByIDs(ctx context.Context, ids []string) ([]*gtsmodel.L
|
||||||
lists, err := l.state.Caches.DB.List.LoadIDs("ID",
|
lists, err := l.state.Caches.DB.List.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.List, error) {
|
func(uncached []string) ([]*gtsmodel.List, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached lists.
|
// Preallocate expected length of uncached lists.
|
||||||
lists := make([]*gtsmodel.List, 0, len(uncached))
|
lists := make([]*gtsmodel.List, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) IDs.
|
// the remaining (uncached) IDs.
|
||||||
|
@ -400,8 +407,15 @@ func (l *listDB) GetListEntriesByIDs(ctx context.Context, ids []string) ([]*gtsm
|
||||||
entries, err := l.state.Caches.DB.ListEntry.LoadIDs("ID",
|
entries, err := l.state.Caches.DB.ListEntry.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.ListEntry, error) {
|
func(uncached []string) ([]*gtsmodel.ListEntry, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached entries.
|
// Preallocate expected length of uncached entries.
|
||||||
entries := make([]*gtsmodel.ListEntry, 0, len(uncached))
|
entries := make([]*gtsmodel.ListEntry, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) IDs.
|
// the remaining (uncached) IDs.
|
||||||
|
|
|
@ -57,8 +57,15 @@ func (m *mediaDB) GetAttachmentsByIDs(ctx context.Context, ids []string) ([]*gts
|
||||||
media, err := m.state.Caches.DB.Media.LoadIDs("ID",
|
media, err := m.state.Caches.DB.Media.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.MediaAttachment, error) {
|
func(uncached []string) ([]*gtsmodel.MediaAttachment, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached media attachments.
|
// Preallocate expected length of uncached media attachments.
|
||||||
media := make([]*gtsmodel.MediaAttachment, 0, len(uncached))
|
media := make([]*gtsmodel.MediaAttachment, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) IDs.
|
// the remaining (uncached) IDs.
|
||||||
|
|
|
@ -69,8 +69,15 @@ func (m *mentionDB) GetMentions(ctx context.Context, ids []string) ([]*gtsmodel.
|
||||||
mentions, err := m.state.Caches.DB.Mention.LoadIDs("ID",
|
mentions, err := m.state.Caches.DB.Mention.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.Mention, error) {
|
func(uncached []string) ([]*gtsmodel.Mention, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached mentions.
|
// Preallocate expected length of uncached mentions.
|
||||||
mentions := make([]*gtsmodel.Mention, 0, len(uncached))
|
mentions := make([]*gtsmodel.Mention, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) IDs.
|
// the remaining (uncached) IDs.
|
||||||
|
|
|
@ -107,13 +107,15 @@ func (n *notificationDB) GetNotificationsByIDs(ctx context.Context, ids []string
|
||||||
notifs, err := n.state.Caches.DB.Notification.LoadIDs("ID",
|
notifs, err := n.state.Caches.DB.Notification.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.Notification, error) {
|
func(uncached []string) ([]*gtsmodel.Notification, error) {
|
||||||
// Skip query if everything was cached.
|
// Avoid querying
|
||||||
if len(uncached) == 0 {
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
return nil, nil
|
return nil, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached notifications.
|
// Preallocate expected length of uncached notifications.
|
||||||
notifs := make([]*gtsmodel.Notification, 0, len(uncached))
|
notifs := make([]*gtsmodel.Notification, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) IDs.
|
// the remaining (uncached) IDs.
|
||||||
|
|
|
@ -274,8 +274,15 @@ func (p *pollDB) GetPollVotes(ctx context.Context, pollID string) ([]*gtsmodel.P
|
||||||
votes, err := p.state.Caches.DB.PollVote.LoadIDs("ID",
|
votes, err := p.state.Caches.DB.PollVote.LoadIDs("ID",
|
||||||
voteIDs,
|
voteIDs,
|
||||||
func(uncached []string) ([]*gtsmodel.PollVote, error) {
|
func(uncached []string) ([]*gtsmodel.PollVote, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached votes.
|
// Preallocate expected length of uncached votes.
|
||||||
votes := make([]*gtsmodel.PollVote, 0, len(uncached))
|
votes := make([]*gtsmodel.PollVote, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) IDs.
|
// the remaining (uncached) IDs.
|
||||||
|
|
|
@ -105,8 +105,15 @@ func (r *relationshipDB) GetBlocksByIDs(ctx context.Context, ids []string) ([]*g
|
||||||
blocks, err := r.state.Caches.DB.Block.LoadIDs("ID",
|
blocks, err := r.state.Caches.DB.Block.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.Block, error) {
|
func(uncached []string) ([]*gtsmodel.Block, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached blocks.
|
// Preallocate expected length of uncached blocks.
|
||||||
blocks := make([]*gtsmodel.Block, 0, len(uncached))
|
blocks := make([]*gtsmodel.Block, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) IDs.
|
// the remaining (uncached) IDs.
|
||||||
|
|
|
@ -82,8 +82,15 @@ func (r *relationshipDB) GetFollowsByIDs(ctx context.Context, ids []string) ([]*
|
||||||
follows, err := r.state.Caches.DB.Follow.LoadIDs("ID",
|
follows, err := r.state.Caches.DB.Follow.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.Follow, error) {
|
func(uncached []string) ([]*gtsmodel.Follow, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached follows.
|
// Preallocate expected length of uncached follows.
|
||||||
follows := make([]*gtsmodel.Follow, 0, len(uncached))
|
follows := make([]*gtsmodel.Follow, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) IDs.
|
// the remaining (uncached) IDs.
|
||||||
|
|
|
@ -81,8 +81,15 @@ func (r *relationshipDB) GetFollowRequestsByIDs(ctx context.Context, ids []strin
|
||||||
follows, err := r.state.Caches.DB.FollowRequest.LoadIDs("ID",
|
follows, err := r.state.Caches.DB.FollowRequest.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.FollowRequest, error) {
|
func(uncached []string) ([]*gtsmodel.FollowRequest, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached followReqs.
|
// Preallocate expected length of uncached followReqs.
|
||||||
follows := make([]*gtsmodel.FollowRequest, 0, len(uncached))
|
follows := make([]*gtsmodel.FollowRequest, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) IDs.
|
// the remaining (uncached) IDs.
|
||||||
|
|
|
@ -87,8 +87,15 @@ func (r *relationshipDB) getMutesByIDs(ctx context.Context, ids []string) ([]*gt
|
||||||
mutes, err := r.state.Caches.DB.UserMute.LoadIDs("ID",
|
mutes, err := r.state.Caches.DB.UserMute.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.UserMute, error) {
|
func(uncached []string) ([]*gtsmodel.UserMute, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached mutes.
|
// Preallocate expected length of uncached mutes.
|
||||||
mutes := make([]*gtsmodel.UserMute, 0, len(uncached))
|
mutes := make([]*gtsmodel.UserMute, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) IDs.
|
// the remaining (uncached) IDs.
|
||||||
|
|
|
@ -54,8 +54,15 @@ func (s *statusDB) GetStatusesByIDs(ctx context.Context, ids []string) ([]*gtsmo
|
||||||
statuses, err := s.state.Caches.DB.Status.LoadIDs("ID",
|
statuses, err := s.state.Caches.DB.Status.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.Status, error) {
|
func(uncached []string) ([]*gtsmodel.Status, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached statuses.
|
// Preallocate expected length of uncached statuses.
|
||||||
statuses := make([]*gtsmodel.Status, 0, len(uncached))
|
statuses := make([]*gtsmodel.Status, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) status IDs.
|
// the remaining (uncached) status IDs.
|
||||||
|
|
|
@ -73,8 +73,15 @@ func (s *statusBookmarkDB) GetStatusBookmarksByIDs(ctx context.Context, ids []st
|
||||||
bookmarks, err := s.state.Caches.DB.StatusBookmark.LoadIDs("ID",
|
bookmarks, err := s.state.Caches.DB.StatusBookmark.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.StatusBookmark, error) {
|
func(uncached []string) ([]*gtsmodel.StatusBookmark, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached bookmarks.
|
// Preallocate expected length of uncached bookmarks.
|
||||||
bookmarks := make([]*gtsmodel.StatusBookmark, 0, len(uncached))
|
bookmarks := make([]*gtsmodel.StatusBookmark, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) bookmarks.
|
// the remaining (uncached) bookmarks.
|
||||||
|
|
|
@ -133,8 +133,15 @@ func (s *statusFaveDB) GetStatusFaves(ctx context.Context, statusID string) ([]*
|
||||||
faves, err := s.state.Caches.DB.StatusFave.LoadIDs("ID",
|
faves, err := s.state.Caches.DB.StatusFave.LoadIDs("ID",
|
||||||
faveIDs,
|
faveIDs,
|
||||||
func(uncached []string) ([]*gtsmodel.StatusFave, error) {
|
func(uncached []string) ([]*gtsmodel.StatusFave, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached faves.
|
// Preallocate expected length of uncached faves.
|
||||||
faves := make([]*gtsmodel.StatusFave, 0, len(uncached))
|
faves := make([]*gtsmodel.StatusFave, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) fave IDs.
|
// the remaining (uncached) fave IDs.
|
||||||
|
|
|
@ -79,8 +79,15 @@ func (t *tagDB) GetTags(ctx context.Context, ids []string) ([]*gtsmodel.Tag, err
|
||||||
tags, err := t.state.Caches.DB.Tag.LoadIDs("ID",
|
tags, err := t.state.Caches.DB.Tag.LoadIDs("ID",
|
||||||
ids,
|
ids,
|
||||||
func(uncached []string) ([]*gtsmodel.Tag, error) {
|
func(uncached []string) ([]*gtsmodel.Tag, error) {
|
||||||
|
// Avoid querying
|
||||||
|
// if none uncached.
|
||||||
|
count := len(uncached)
|
||||||
|
if count == 0 {
|
||||||
|
return nil, nil
|
||||||
|
}
|
||||||
|
|
||||||
// Preallocate expected length of uncached tags.
|
// Preallocate expected length of uncached tags.
|
||||||
tags := make([]*gtsmodel.Tag, 0, len(uncached))
|
tags := make([]*gtsmodel.Tag, 0, count)
|
||||||
|
|
||||||
// Perform database query scanning
|
// Perform database query scanning
|
||||||
// the remaining (uncached) IDs.
|
// the remaining (uncached) IDs.
|
||||||
|
|
Loading…
Reference in New Issue