Rewrites search engine to properly paginate results (#18631).

Instead of counting and retrieving results based on their timestamps, we now load all result ids then load the appropriate results by their ids. This also brings a 2x performance improvement as we search tokens in one of the 2 queries only.

git-svn-id: http://svn.redmine.org/redmine/trunk@13739 e93f8b46-1217-0410-a6f0-8f06a7374b81

6 files changed, 10 insertions, 10 deletions

diff --git a/app/models/changeset.rb b/app/models/changeset.rb
index 4eedae145..78a69422f 100644
--- a/app/models/changeset.rb
+++ b/app/models/changeset.rb
@@ -35,9 +35,9 @@ class Changeset < ActiveRecord::Base
                 :url => Proc.new {|o| {:controller => 'repositories', :action => 'revision', :id => o.repository.project, :repository_id => o.repository.identifier_param, :rev => o.identifier}}
 
   acts_as_searchable :columns => 'comments',
-                     :scope => preload(:repository => :project),
+                     :preload => {:repository => :project},
                      :project_key => "#{Repository.table_name}.project_id",
-                     :date_column => "#{Changeset.table_name}.committed_on"
+                     :date_column => :committed_on
 
   acts_as_activity_provider :timestamp => "#{table_name}.committed_on",
                             :author_key => :user_id,
diff --git a/app/models/document.rb b/app/models/document.rb
index 70e3c9b01..810b15dfa 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -22,7 +22,7 @@ class Document < ActiveRecord::Base
   acts_as_attachable :delete_permission => :delete_documents
 
   acts_as_searchable :columns => ['title', "#{table_name}.description"],
-                     :scope => preload(:project)
+                     :preload => :project
   acts_as_event :title => Proc.new {|o| "#{l(:label_document)}: #{o.title}"},
                 :author => Proc.new {|o| o.attachments.reorder("#{Attachment.table_name}.created_on ASC").first.try(:author) },
                 :url => Proc.new {|o| {:controller => 'documents', :action => 'show', :id => o.id}}
diff --git a/app/models/issue.rb b/app/models/issue.rb
index a23d4bd9f..84a5d7b6c 100644
--- a/app/models/issue.rb
+++ b/app/models/issue.rb
@@ -46,8 +46,7 @@ class Issue < ActiveRecord::Base
   acts_as_customizable
   acts_as_watchable
   acts_as_searchable :columns => ['subject', "#{table_name}.description", "#{Journal.table_name}.notes"],
-                     # sort by id so that limited eager loading doesn't break with postgresql
-                     :order_column => "#{table_name}.id",
+                     :preload => [:project, :status, :tracker],
                      :scope => lambda { joins(:project).
                                         joins("LEFT OUTER JOIN #{Journal.table_name} ON #{Journal.table_name}.journalized_type='Issue'" + 
                                               " AND #{Journal.table_name}.journalized_id = #{Issue.table_name}.id" +
diff --git a/app/models/message.rb b/app/models/message.rb
index dee5a5b62..5f21e88d4 100644
--- a/app/models/message.rb
+++ b/app/models/message.rb
@@ -25,9 +25,9 @@ class Message < ActiveRecord::Base
   attr_protected :id
 
   acts_as_searchable :columns => ['subject', 'content'],
-                     :scope => preload(:board => :project),
-                     :project_key => "#{Board.table_name}.project_id",
-                     :date_column => "#{table_name}.created_on"
+                     :preload => {:board => :project},
+                     :project_key => "#{Board.table_name}.project_id"
+
   acts_as_event :title => Proc.new {|o| "#{o.board.name}: #{o.subject}"},
                 :description => :content,
                 :group => :parent,
diff --git a/app/models/news.rb b/app/models/news.rb
index 6ade4f4f1..046bb8137 100644
--- a/app/models/news.rb
+++ b/app/models/news.rb
@@ -29,7 +29,7 @@ class News < ActiveRecord::Base
   acts_as_attachable :edit_permission => :manage_news,
                      :delete_permission => :manage_news
   acts_as_searchable :columns => ['title', 'summary', "#{table_name}.description"],
-                     :scope => preload(:project)
+                     :preload => :project
   acts_as_event :url => Proc.new {|o| {:controller => 'news', :action => 'show', :id => o.id}}
   acts_as_activity_provider :scope => preload(:project, :author),
                             :author_key => :author_id
diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb
index 61e78873d..8d81bce7e 100644
--- a/app/models/wiki_page.rb
+++ b/app/models/wiki_page.rb
@@ -33,7 +33,8 @@ class WikiPage < ActiveRecord::Base
                 :url => Proc.new {|o| {:controller => 'wiki', :action => 'show', :project_id => o.wiki.project, :id => o.title}}
 
   acts_as_searchable :columns => ['title', "#{WikiContent.table_name}.text"],
-                     :scope => preload(:wiki => :project).joins(:content, {:wiki => :project}),
+                     :scope => joins(:content, {:wiki => :project}),
+                     :preload => {:wiki => :project},
                      :permission => :view_wiki_pages,
                      :project_key => "#{Wiki.table_name}.project_id"