jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

post archives: fix N+1 problem when fetching previous version.

Browse Source
This commit is contained in:
evazion
2017-03-30 16:22:40 -05:00
committed by r888888888
parent 964197d403
commit 1ae5b7ba2f
3 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/post_versions_controller.rb
View File

@@ -3,7 +3,7 @@ class PostVersionsController < ApplicationController
respond_to :html, :xml, :json respond_to :html, :xml, :json
def index def index
@post_versions = PostArchive.includes(:post, :updater).search(params[:search]).order("updated_at desc, id desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search]) @post_versions = PostArchive.includes(:updater, post: [:versions]).search(params[:search]).order("updated_at desc, id desc").paginate(params[:page], :limit => params[:limit], :search_count => params[:search])
respond_with(@post_versions) do |format| respond_with(@post_versions) do |format|
format.xml do format.xml do
render :xml => @post_versions.to_xml(:root => "post-versions") render :xml => @post_versions.to_xml(:root => "post-versions")

2
app/controllers/reports_controller.rb
View File

@@ -21,6 +21,6 @@ class ReportsController < ApplicationController
def upload_tags def upload_tags
@user = User.find(params[:user_id]) @user = User.find(params[:user_id])
@upload_reports = Reports::UploadTags.includes(versions: [:post]).for_user(params[:user_id]).order("id desc").paginate(params[:page], :limit => params[:limit]) @upload_reports = Reports::UploadTags.includes(versions: { post: :versions }).for_user(params[:user_id]).order("id desc").paginate(params[:page], :limit => params[:limit])
end end
end end

8
app/models/post_archive.rb
View File

@@ -96,7 +96,13 @@ class PostArchive < ActiveRecord::Base
end end
def previous def previous
PostArchive.where("post_id = ? and version < ?", post_id, version).order("version desc").first # HACK: if all the post versions for this post have already been preloaded,
# we can use that to avoid a SQL query.
if association(:post).loaded? && post.association(:versions).loaded?
post.versions.sort_by(&:version).reverse.find { |v| v.version < version }
else
PostArchive.where("post_id = ? and version < ?", post_id, version).order("version desc").first
end
end end
def diff(version = nil) def diff(version = nil)