remove zero checks in uncached key load functions (go-structr now handles this)

internal/db/bundb/account.go

@@ -64,15 +64,8 @@ func (a *accountDB) GetAccountsByIDs(ctx context.Context, ids []string) ([]*gtsm
 	accounts, err := a.state.Caches.DB.Account.LoadIDs("ID",
 		ids,
 		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.
-			accounts := make([]*gtsmodel.Account, 0, count)
+			accounts := make([]*gtsmodel.Account, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) account IDs.

internal/db/bundb/application.go

@@ -147,15 +147,8 @@ func (a *applicationDB) GetAllTokens(ctx context.Context) ([]*gtsmodel.Token, er
 	tokens, err := a.state.Caches.DB.Token.LoadIDs("ID",
 		tokenIDs,
 		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.
-			tokens := make([]*gtsmodel.Token, 0, count)
+			tokens := make([]*gtsmodel.Token, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) token IDs.

internal/db/bundb/conversation.go

@@ -188,15 +188,8 @@ func (c *conversationDB) getConversationsByLastStatusIDs(
 		accountID,
 		conversationLastStatusIDs,
 		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.
-			conversations := make([]*gtsmodel.Conversation, 0, count)
+			conversations := make([]*gtsmodel.Conversation, 0, len(uncached))
 
 			// Perform database query scanning the remaining (uncached) IDs.
 			if err := c.db.NewSelect().

internal/db/bundb/emoji.go

@@ -586,15 +586,8 @@ func (e *emojiDB) GetEmojisByIDs(ctx context.Context, ids []string) ([]*gtsmodel
 	emojis, err := e.state.Caches.DB.Emoji.LoadIDs("ID",
 		ids,
 		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.
-			emojis := make([]*gtsmodel.Emoji, 0, count)
+			emojis := make([]*gtsmodel.Emoji, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) IDs.
@@ -657,15 +650,8 @@ func (e *emojiDB) GetEmojiCategoriesByIDs(ctx context.Context, ids []string) ([]
 	categories, err := e.state.Caches.DB.EmojiCategory.LoadIDs("ID",
 		ids,
 		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.
-			categories := make([]*gtsmodel.EmojiCategory, 0, count)
+			categories := make([]*gtsmodel.EmojiCategory, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) IDs.

internal/db/bundb/filter.go

@@ -83,14 +83,7 @@ func (f *filterDB) GetFiltersForAccountID(ctx context.Context, accountID string)
 	filters, err := f.state.Caches.DB.Filter.LoadIDs("ID",
 		filterIDs,
 		func(uncached []string) ([]*gtsmodel.Filter, error) {
-			// Avoid querying
+			filters := make([]*gtsmodel.Filter, 0, len(uncached))
-			// if none uncached.
-			count := len(uncached)
-			if count == 0 {
-				return nil, nil
-			}
-
-			filters := make([]*gtsmodel.Filter, 0, count)
 			if err := f.db.
 				NewSelect().
 				Model(&filters).

internal/db/bundb/filterkeyword.go

@@ -113,14 +113,8 @@ func (f *filterDB) getFilterKeywords(ctx context.Context, idColumn string, id st
 	filterKeywords, err := f.state.Caches.DB.FilterKeyword.LoadIDs("ID",
 		filterKeywordIDs,
 		func(uncached []string) ([]*gtsmodel.FilterKeyword, error) {
-			// Avoid querying
+			filterKeywords := make([]*gtsmodel.FilterKeyword, 0, len(uncached))
-			// if none uncached.
-			count := len(uncached)
-			if count == 0 {
-				return nil, nil
-			}
 
-			filterKeywords := make([]*gtsmodel.FilterKeyword, 0, count)
 			if err := f.db.
 				NewSelect().
 				Model(&filterKeywords).

internal/db/bundb/filterstatus.go

@@ -100,14 +100,7 @@ func (f *filterDB) getFilterStatuses(ctx context.Context, idColumn string, id st
 	filterStatuses, err := f.state.Caches.DB.FilterStatus.LoadIDs("ID",
 		filterStatusIDs,
 		func(uncached []string) ([]*gtsmodel.FilterStatus, error) {
-			// Avoid querying
+			filterStatuses := make([]*gtsmodel.FilterStatus, 0, len(uncached))
-			// if none uncached.
-			count := len(uncached)
-			if count == 0 {
-				return nil, nil
-			}
-
-			filterStatuses := make([]*gtsmodel.FilterStatus, 0, count)
 			if err := f.db.
 				NewSelect().
 				Model(&filterStatuses).

internal/db/bundb/list.go

@@ -325,15 +325,8 @@ func (l *listDB) GetListsByIDs(ctx context.Context, ids []string) ([]*gtsmodel.L
 	lists, err := l.state.Caches.DB.List.LoadIDs("ID",
 		ids,
 		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.
-			lists := make([]*gtsmodel.List, 0, count)
+			lists := make([]*gtsmodel.List, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) IDs.

internal/db/bundb/media.go

@@ -57,15 +57,8 @@ func (m *mediaDB) GetAttachmentsByIDs(ctx context.Context, ids []string) ([]*gts
 	media, err := m.state.Caches.DB.Media.LoadIDs("ID",
 		ids,
 		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.
-			media := make([]*gtsmodel.MediaAttachment, 0, count)
+			media := make([]*gtsmodel.MediaAttachment, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) IDs.

internal/db/bundb/mention.go

@@ -69,15 +69,8 @@ func (m *mentionDB) GetMentions(ctx context.Context, ids []string) ([]*gtsmodel.
 	mentions, err := m.state.Caches.DB.Mention.LoadIDs("ID",
 		ids,
 		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.
-			mentions := make([]*gtsmodel.Mention, 0, count)
+			mentions := make([]*gtsmodel.Mention, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) IDs.

internal/db/bundb/notification.go

@@ -107,15 +107,8 @@ func (n *notificationDB) GetNotificationsByIDs(ctx context.Context, ids []string
 	notifs, err := n.state.Caches.DB.Notification.LoadIDs("ID",
 		ids,
 		func(uncached []string) ([]*gtsmodel.Notification, error) {
-			// Avoid querying
-			// if none uncached.
-			count := len(uncached)
-			if count == 0 {
-				return nil, nil
-			}
-
 			// Preallocate expected length of uncached notifications.
-			notifs := make([]*gtsmodel.Notification, 0, count)
+			notifs := make([]*gtsmodel.Notification, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) IDs.

internal/db/bundb/poll.go

@@ -274,15 +274,8 @@ func (p *pollDB) GetPollVotes(ctx context.Context, pollID string) ([]*gtsmodel.P
 	votes, err := p.state.Caches.DB.PollVote.LoadIDs("ID",
 		voteIDs,
 		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.
-			votes := make([]*gtsmodel.PollVote, 0, count)
+			votes := make([]*gtsmodel.PollVote, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) IDs.

internal/db/bundb/relationship_block.go

@@ -105,15 +105,8 @@ func (r *relationshipDB) GetBlocksByIDs(ctx context.Context, ids []string) ([]*g
 	blocks, err := r.state.Caches.DB.Block.LoadIDs("ID",
 		ids,
 		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.
-			blocks := make([]*gtsmodel.Block, 0, count)
+			blocks := make([]*gtsmodel.Block, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) IDs.

internal/db/bundb/relationship_follow.go

@@ -82,15 +82,8 @@ func (r *relationshipDB) GetFollowsByIDs(ctx context.Context, ids []string) ([]*
 	follows, err := r.state.Caches.DB.Follow.LoadIDs("ID",
 		ids,
 		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.
-			follows := make([]*gtsmodel.Follow, 0, count)
+			follows := make([]*gtsmodel.Follow, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) IDs.

internal/db/bundb/relationship_follow_req.go

@@ -81,15 +81,8 @@ func (r *relationshipDB) GetFollowRequestsByIDs(ctx context.Context, ids []strin
 	follows, err := r.state.Caches.DB.FollowRequest.LoadIDs("ID",
 		ids,
 		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.
-			follows := make([]*gtsmodel.FollowRequest, 0, count)
+			follows := make([]*gtsmodel.FollowRequest, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) IDs.

internal/db/bundb/relationship_mute.go

@@ -87,15 +87,8 @@ func (r *relationshipDB) getMutesByIDs(ctx context.Context, ids []string) ([]*gt
 	mutes, err := r.state.Caches.DB.UserMute.LoadIDs("ID",
 		ids,
 		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.
-			mutes := make([]*gtsmodel.UserMute, 0, count)
+			mutes := make([]*gtsmodel.UserMute, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) IDs.

internal/db/bundb/status.go

@@ -54,15 +54,8 @@ func (s *statusDB) GetStatusesByIDs(ctx context.Context, ids []string) ([]*gtsmo
 	statuses, err := s.state.Caches.DB.Status.LoadIDs("ID",
 		ids,
 		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.
-			statuses := make([]*gtsmodel.Status, 0, count)
+			statuses := make([]*gtsmodel.Status, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) status IDs.

internal/db/bundb/statusbookmark.go

@@ -73,15 +73,8 @@ func (s *statusBookmarkDB) GetStatusBookmarksByIDs(ctx context.Context, ids []st
 	bookmarks, err := s.state.Caches.DB.StatusBookmark.LoadIDs("ID",
 		ids,
 		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.
-			bookmarks := make([]*gtsmodel.StatusBookmark, 0, count)
+			bookmarks := make([]*gtsmodel.StatusBookmark, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) bookmarks.

internal/db/bundb/statusfave.go

@@ -133,15 +133,8 @@ func (s *statusFaveDB) GetStatusFaves(ctx context.Context, statusID string) ([]*
 	faves, err := s.state.Caches.DB.StatusFave.LoadIDs("ID",
 		faveIDs,
 		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.
-			faves := make([]*gtsmodel.StatusFave, 0, count)
+			faves := make([]*gtsmodel.StatusFave, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) fave IDs.

internal/db/bundb/tag.go

@@ -80,15 +80,8 @@ func (t *tagDB) GetTags(ctx context.Context, ids []string) ([]*gtsmodel.Tag, err
 	tags, err := t.state.Caches.DB.Tag.LoadIDs("ID",
 		ids,
 		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.
-			tags := make([]*gtsmodel.Tag, 0, count)
+			tags := make([]*gtsmodel.Tag, 0, len(uncached))
 
 			// Perform database query scanning
 			// the remaining (uncached) IDs.