Perfomance updating Project activity sort

Andrey Kumanyaev
1 parent 41bbbb6d
Showing 5 changed files with 32 additions and 7 deletions Show diff stats
app/models/project.rb
app/observers/project_activity_cache_observer.rb
config/application.rb
db/migrate/20130403003950_add_last_activity_column_into_project.rb
db/schema.rb
@@ -29,7 +29,7 @@ class Project &lt; ActiveRecord::Base
   attr_accessible :name, :path, :description, :default_branch, :issues_tracker,
     :issues_enabled, :wall_enabled, :merge_requests_enabled, :snippets_enabled, :issues_tracker_id,
-    :wiki_enabled, :public, :import_url, as: [:default, :admin]
+    :wiki_enabled, :public, :import_url, :last_activity_at, as: [:default, :admin]
   attr_accessible :namespace_id, :creator_id, as: :admin
@@ -92,12 +92,12 @@ class Project &lt; ActiveRecord::Base
   scope :in_team, ->(team) { where("id IN (:ids)", ids: team.projects.map(&:id)) }
   scope :in_namespace, ->(namespace) { where(namespace_id: namespace.id) }
   scope :in_group_namespace, -> { joins(:group) }
-  scope :sorted_by_activity, -> { order("(SELECT max(events.created_at) FROM events WHERE events.project_id = projects.id) DESC") }
+  scope :sorted_by_activity, -> { order("last_activity_at DESC") }
   scope :personal, ->(user) { where(namespace_id: user.namespace_id) }
   scope :joined, ->(user) { where("namespace_id != ?", user.namespace_id) }
   scope :public_only, -> { where(public: true) }
-  enumerize :issues_tracker, :in => (Gitlab.config.issues_tracker.keys).append(:gitlab), :default => :gitlab
+  enumerize :issues_tracker, in: (Gitlab.config.issues_tracker.keys).append(:gitlab), default: :gitlab
   class << self
     def abandoned
@@ -157,8 +157,7 @@ class Project &lt; ActiveRecord::Base
     unless creator.can_create_project?
       errors[:limit_reached] << ("Your own projects limit is #{creator.projects_limit}! Please contact administrator to increase it")
     end
-  rescue => ex
-    errors[:base] << ex.message
+  rescue
     errors[:base] << ("Can't check your ability to create project")
   end
@@ -191,7 +190,7 @@ class Project &lt; ActiveRecord::Base
   end
   def last_activity_date
-    last_event.try(:created_at) || updated_at
+    last_activity_at
   end
   def project_id
@@ -0,0 +1,8 @@
+class ProjectActivityCacheObserver < BaseObserver
+  observe :event
+
+  def after_create(event)
+    event.project.update_attribute(:last_activity_at, event.created_at) if event.project
+  end
+end
+
@@ -24,6 +24,7 @@ module Gitlab
     # Activate observers that should always be running.
     config.active_record.observers = :activity_observer,
+                                     :project_activity_cache_observer,
                                      :issue_observer,
                                      :key_observer,
                                      :merge_request_observer,
@@ -0,0 +1,15 @@
+class AddLastActivityColumnIntoProject < ActiveRecord::Migration
+  def up
+    add_column :projects, :last_activity_at, :datetime
+    add_index :projects, :last_activity_at
+
+    Project.find_each do |project|
+      project.update_attribute(:last_activity_at, project.last_activity_date)
+    end
+  end
+
+  def down
+    remove_index :projects, :last_activity_at
+    remove_column :projects, :last_activity_at
+  end
+end
@@ -11,7 +11,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20130325173941) do
+ActiveRecord::Schema.define(:version => 20130403003950) do
   create_table "events", :force => true do |t|
     t.string   "target_type"
@@ -156,9 +156,11 @@ ActiveRecord::Schema.define(:version =&gt; 20130325173941) do
     t.string   "issues_tracker",         :default => "gitlab", :null => false
     t.string   "issues_tracker_id"
     t.boolean  "snippets_enabled",       :default => true,     :null => false
+    t.datetime "last_activity_at"
   end
   add_index "projects", ["creator_id"], :name => "index_projects_on_owner_id"
+  add_index "projects", ["last_activity_at"], :name => "index_projects_on_last_activity_at"
   add_index "projects", ["namespace_id"], :name => "index_projects_on_namespace_id"
   create_table "protected_branches", :force => true do |t|
@@ -0,0 +1,8 @@		@@ -0,0 +1,8 @@
	1	+class ProjectActivityCacheObserver < BaseObserver
	2	+ observe :event
	3	+
	4	+ def after_create(event)
	5	+ event.project.update_attribute(:last_activity_at, event.created_at) if event.project
	6	+ end
	7	+end
	8	+
	@@ -24,6 +24,7 @@ module Gitlab		@@ -24,6 +24,7 @@ module Gitlab
24		24
25	# Activate observers that should always be running.	25	# Activate observers that should always be running.
26	config.active_record.observers = :activity_observer,	26	config.active_record.observers = :activity_observer,
		27	+ :project_activity_cache_observer,
27	:issue_observer,	28	:issue_observer,
28	:key_observer,	29	:key_observer,
29	:merge_request_observer,	30	:merge_request_observer,
@@ -0,0 +1,15 @@		@@ -0,0 +1,15 @@
	1	+class AddLastActivityColumnIntoProject < ActiveRecord::Migration
	2	+ def up
	3	+ add_column :projects, :last_activity_at, :datetime
	4	+ add_index :projects, :last_activity_at
	5	+
	6	+ Project.find_each do \|project\|
	7	+ project.update_attribute(:last_activity_at, project.last_activity_date)
	8	+ end
	9	+ end
	10	+
	11	+ def down
	12	+ remove_index :projects, :last_activity_at
	13	+ remove_column :projects, :last_activity_at
	14	+ end
	15	+end