meineerde/redmine
1
0
Fork 0
mirror of https://github.com/meineerde/redmine.git synced 2025-12-19 15:01:14 +00:00
Code Issues Releases Wiki Activity

Sort messages by ids to avoid the left join.

Browse Source 
The query was really slow with PostgreSQL and a few thousands messages, and last_message_id column was storing the highest id anyway.

git-svn-id: http://svn.redmine.org/redmine/trunk@15582 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Jean-Philippe Lang 2016-06-20 19:03:53 +00:00
parent 3f20ab690d
commit 1b10649783
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/boards_controller.rb
View File

@ -37,15 +37,14 @@ class BoardsController < ApplicationController
respond_to do |format| respond_to do |format|
format.html { format.html {
sort_init 'updated_on', 'desc' sort_init 'updated_on', 'desc'
sort_update 'created_on' => "#{Message.table_name}.created_on", sort_update 'created_on' => "#{Message.table_name}.id",
'replies' => "#{Message.table_name}.replies_count", 'replies' => "#{Message.table_name}.replies_count",
'updated_on' => "COALESCE(last_replies_messages.created_on, #{Message.table_name}.created_on)" 'updated_on' => "COALESCE(#{Message.table_name}.last_reply_id, #{Message.table_name}.id)"
@topic_count = @board.topics.count @topic_count = @board.topics.count
@topic_pages = Paginator.new @topic_count, per_page_option, params['page'] @topic_pages = Paginator.new @topic_count, per_page_option, params['page']
@topics = @board.topics. @topics = @board.topics.
reorder("#{Message.table_name}.sticky DESC"). reorder(:sticky => :desc).
joins("LEFT OUTER JOIN #{Message.table_name} last_replies_messages ON last_replies_messages.id = #{Message.table_name}.last_reply_id").
limit(@topic_pages.per_page). limit(@topic_pages.per_page).
offset(@topic_pages.offset). offset(@topic_pages.offset).
order(sort_clause). order(sort_clause).
@ -56,7 +55,7 @@ class BoardsController < ApplicationController
} }
format.atom { format.atom {
@messages = @board.messages. @messages = @board.messages.
reorder('created_on DESC'). reorder(:id => :desc).
includes(:author, :board). includes(:author, :board).
limit(Setting.feeds_limit.to_i). limit(Setting.feeds_limit.to_i).
to_a to_a