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

comments: minimize sql queries.

Browse Source 
Certain parts of comment rendering triggered sql queries that we didn't
really need to do. Rework things to avoid this.

* Preload comment creators in order to display commenter names with link_to_user.

* Preload comment votes in order to display "undo vote" links. Only preload
  votes for members since anonymous users can't vote and don't have "undo
  vote" links.

* Rework various conditionals to do the filtering in Ruby so that we
  avoid issuing any extra queries in sql.

* Avoid issuing any queries at all when the post doesn't have any
  comments (when last_commented_at is blank).
This commit is contained in:
evazion
2019-08-20 20:53:40 -05:00
parent 2cf929ad6e
commit b283281e5e
9 changed files with 30 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/views/comments/_index_by_post.html.erb
View File

@@ -5,19 +5,17 @@
</div>
<% end %>
<% if @posts.empty? %>
<% if @posts.blank? %>
<%= render "post_sets/blank" %>
<% end %>
<% @posts.select {|x| x.visible?}.each do |post| %>
<% if CurrentUser.is_moderator? || post.comments.undeleted.exists? %>
<% @posts.select(&:visible?).each do |post| %>
<% if post.comments.any? { |c| c.visible_by?(CurrentUser.user, show_thresholded: true) } %>
<%= content_tag(:div, { id: "post_#{post.id}", class: ["post", *PostPresenter.preview_class(post)].join(" ") }.merge(PostPresenter.data_attributes(post))) do %>
<div class="preview">
<% if post.visible? %>
<%= link_to(image_tag(post.preview_file_url), post_path(post)) %>
<% end %>
<%= link_to(image_tag(post.preview_file_url), post_path(post)) %>
</div>
<%= render "comments/partials/index/list", :post => post, :comments => post.comments.visible(CurrentUser.user).recent.reverse, :show_header => true %>
<%= render "comments/partials/index/list", post: post, comments: post.comments.select { |c| c.visible_by?(CurrentUser.user) }.last(6), page: :comments %>
<div class="clearfix"></div>
<% end %>
<% end %>

16
app/views/comments/partials/index/_list.html.erb
View File

@@ -1,10 +1,10 @@
<div class="comments-for-post" data-post-id="<%= post.id %>">
<% if show_header %>
<% if page == :comments %>
<%= render "comments/partials/index/header", :post => post %>
<% end %>
<div class="row notices">
<% if post.comments.hidden(CurrentUser.user).count > 0 || (params[:controller] == "comments" && post.comments.count > 6) %>
<% if (post.last_commented_at.present? && post.comments.any? { |c| !c.visible_by?(CurrentUser.user) }) || (page == :comments && post.comments.size > 6) %>
<span class="info" id="threshold-comments-notice-for-<%= post.id %>">
<%= link_to "Show all comments", comments_path(:post_id => post.id), :remote => true %>
</span>
@@ -12,14 +12,12 @@
</div>
<div class="list-of-comments">
<% if comments.empty? %>
<% if post.last_commented_at.present? %>
<p>There are no visible comments.</p>
<% else %>
<p>There are no comments.</p>
<% end %>
<% if comments.present? %>
<%= render partial: "comments/partials/show/comment", collection: comments %>
<% elsif post.last_commented_at.present? %>
<p>There are no visible comments.</p>
<% else %>
<%= render :partial => "comments/partials/show/comment", :collection => comments %>
<p>There are no comments.</p>
<% end %>
</div>