jro_apps/redmine Commit - r10905:8ee0b52d590d

Gantt perf: fixed that Project#start_date and #due_date run way too much queries....

Jean-Philippe Lang -

r10905:8ee0b52d590d

parent child

Context file:

r10905:8ee0b52d590d

app/models/issue.rb +4 0

               scope :on_active_project, lambda {
                 includes(:status, :project, :tracker).where("#{Project.table_name}.status = ?", Project::STATUS_ACTIVE)
               }
+              scope :fixed_version, lambda {|versions|
+                ids = [versions].flatten.compact.map {|v| v.is_a?(Version) ? v.id : v}
+                ids.any? ? where(:fixed_version_id => ids) : where('1=0')
+              }
               before_create :default_assign
               before_save :close_duplicates, :update_done_ratio_from_issue_status, :force_updated_on_change

app/models/project.rb +10 -8

                 @allowed_parents = nil
                 @allowed_permissions = nil
                 @actions_allowed = nil
+                @start_date = nil
+                @due_date = nil
                 super
               end
               # The earliest start date of a project, based on it's issues and versions
               def start_date
+                @start_date ||= [
                  issues.minimum('start_date'),
-                 shared_versions.collect(&:effective_date),
+                 shared_versions.minimum('effective_date'),
-                 shared_versions.collect(&:start_date)
+                 Issue.fixed_version(shared_versions).minimum('start_date')
-                ].flatten.compact.min
+                ].compact.min
               end
               # The latest due date of an issue or version
               def due_date
+                @due_date ||= [
                  issues.maximum('due_date'),
-                 shared_versions.collect(&:effective_date),
+                 shared_versions.maximum('effective_date'),
-                 shared_versions.collect {|v| v.fixed_issues.maximum('due_date')}
+                 Issue.fixed_version(shared_versions).maximum('due_date')
-                ].flatten.compact.max
+                ].compact.max
               end
               def overdue?

test/unit/issue_test.rb +10 0

@@ -309,6 +309,16 class IssueTest < ActiveSupport::TestCase
309	assert_equal issues, issues.select(&:closed?)	309	assert_equal issues, issues.select(&:closed?)
310	end	310	end
311		311
		312	def test_fixed_version_scope_with_a_version_should_return_its_fixed_issues
		313	version = Version.find(2)
		314	assert version.fixed_issues.any?
		315	assert_equal version.fixed_issues.to_a.sort, Issue.fixed_version(version).to_a.sort
		316	end
		317
		318	def test_fixed_version_scope_with_empty_array_should_return_no_result
		319	assert_equal 0, Issue.fixed_version([]).count
		320	end
		321
312	def test_errors_full_messages_should_include_custom_fields_errors	322	def test_errors_full_messages_should_include_custom_fields_errors
313	field = IssueCustomField.find_by_name('Database')	323	field = IssueCustomField.find_by_name('Database')
314		324

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages