A platform for community discussion. Free, open, simple.
PERF: Avoid loading every bookmark when listing bookmarks
Régis Hanol2e77e819624f
diff --git a/app/models/user_bookmark_list.rb b/app/models/user_bookmark_list.rbindex 377b0cc8c33..1eebd3dff45 100644--- a/app/models/user_bookmark_list.rb+++ b/app/models/user_bookmark_list.rb@@ -5,7 +5,7 @@ class UserBookmarkListPER_PAGE = 20- attr_reader :bookmarks, :per_page, :has_more+ attr_reader :bookmarks, :per_pageattr_accessor :more_bookmarks_urldef initialize(user:, guardian:, search_term: nil, per_page: nil, page: 0)@@ -22,7 +22,7 @@ class UserBookmarkListenddef load(&blk)- query =+ @query =BookmarkQuery.new(user: @user,guardian: @guardian,@@ -31,9 +31,11 @@ class UserBookmarkListper_page: @per_page,)- @bookmarks = query.list_all(&blk)- @has_more = (@page.to_i + 1) * @per_page < query.count- @bookmarks+ @bookmarks = @query.list_all(&blk)+ end++ def has_more+ (@page + 1) * @per_page < @query.count_allenddef categoriesdiff --git a/lib/bookmark_query.rb b/lib/bookmark_query.rbindex 18adb25ec4f..1e35bdf76f2 100644--- a/lib/bookmark_query.rb+++ b/lib/bookmark_query.rb@@ -24,7 +24,7 @@ class BookmarkQueryendend- attr_reader :guardian, :count+ attr_reader :guardiandef initialize(user:, guardian: nil, search_term: nil, page: nil, per_page: nil)@user = user@@ -32,17 +32,16 @@ class BookmarkQuery@guardian = guardian || Guardian.new(@user)@page = page ? page.to_i : 0@per_page = per_page ? per_page.to_i : 20- @count = 0enddef count_all- queries = build_list_queries+ queries = list_queriesreturn 0 if queries.empty?Bookmark.from("(#{queries.join(" UNION ")}) AS bookmarks").countenddef list_all(&blk)- queries = build_list_queries+ queries = list_queriesreturn [] if queries.empty?results =@@ -52,8 +51,6 @@ class BookmarkQuery),)- @count = results.count-results = results.offset(@page * @per_page) if @page.positive?results = blk&.call(results) || resultsresults = results.limit(@per_page).to_a@@ -80,10 +77,14 @@ class BookmarkQueryprivate+ def list_queries+ @list_queries ||= build_list_queries+ end+def build_list_queriesBookmark.registered_bookmarkables.filter_map do |bookmarkable|query = bookmarkable.perform_list_query(@user, @guardian)- next if query.blank?+ next if query.nil?query = apply_search_filter(bookmarkable, query) if @search_term.present?query.to_sqlenddiff --git a/spec/models/user_bookmark_list_spec.rb b/spec/models/user_bookmark_list_spec.rbindex 237f48aacfa..5419c21fbc9 100644--- a/spec/models/user_bookmark_list_spec.rb+++ b/spec/models/user_bookmark_list_spec.rb@@ -19,7 +19,9 @@ RSpec.describe UserBookmarkList dolet(:user_bookmark) { Fabricate(:bookmark, user: user, bookmarkable: Fabricate(:user)) }it "returns all types of bookmarks" do- list.load+ queries = track_sql_queries { list.load }+ expect(queries.grep(/SELECT COUNT/)).to be_empty+ expect(queries.grep(/\ASELECT "bookmarks"\.\* FROM "bookmarks"/)).to be_emptyexpect(list.bookmarks.map(&:id)).to match_array([post_bookmark.id, topic_bookmark.id, user_bookmark.id],@@ -42,6 +44,7 @@ RSpec.describe UserBookmarkList dolist = UserBookmarkList.new(user: user, guardian: Guardian.new(user), per_page: 1000)expect(list.load.count).to eq(20)+ expect(list.has_more).to eq(true)endendend