jro_apps/redmine Files · app/controllers/activities_controller.rb

scm: git: performance improvements in fetching revisions (#8857, #9472)...

scm: git: performance improvements in fetching revisions (#8857, #9472) Parse a revision for a given branch, just if we haven't parsed it for any branches before. Moved the db check to for existing revisions into a grouped search. Search for many revisions at once: this reduces db load. Revisions are grouped into sets of 100. This is to improve memory consumption. There will be just one query instead of each 100. The above two methods significantly increase parsing speed. Test case was a git repo with 6000+ commits on a master branch, and several other branches originating for master. Speed improved from 1.4h to 18min. Contributed by Gergely Fábián. git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@9144 e93f8b46-1217-0410-a6f0-8f06a7374b81

Jean-Philippe Lang - - Load All Authors

File last commit:

r6077:93c2b92a4b5b


                r9024:999a4ba30d7b

Download file

             activities_controller.rb
        
                    75 lines
            
             | 2.7 KiB
            
                | text/x-ruby
            
             |
                RubyLexer
            
             / app / controllers / activities_controller.rb
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # Redmine - project management software

      # Copyright (C) 2006-2011  Jean-Philippe Lang

      #

      # This program is free software; you can redistribute it and/or

      # modify it under the terms of the GNU General Public License

      # as published by the Free Software Foundation; either version 2

      # of the License, or (at your option) any later version.

      #

      # This program is distributed in the hope that it will be useful,

      # but WITHOUT ANY WARRANTY; without even the implied warranty of

      # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

      # GNU General Public License for more details.

      #

      # You should have received a copy of the GNU General Public License

      # along with this program; if not, write to the Free Software

      # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.

      class ActivitiesController < ApplicationController

        menu_item :activity

        before_filter :find_optional_project

        accept_rss_auth :index

        def index

          @days = Setting.activity_days_default.to_i

          if params[:from]

            begin; @date_to = params[:from].to_date + 1; rescue; end

          end

          @date_to ||= Date.today + 1

          @date_from = @date_to - @days

          @with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')

          @author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))

          @activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,

                                                                   :with_subprojects => @with_subprojects,

                                                                   :author => @author)

          @activity.scope_select {|t| !params["show_#{t}"].nil?}

          @activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?

          events = @activity.events(@date_from, @date_to)

          if events.empty? || stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, User.current, current_language])

            respond_to do |format|

              format.html {

                @events_by_day = events.group_by(&:event_date)

                render :layout => false if request.xhr?

              }

              format.atom {

                title = l(:label_activity)

                if @author

                  title = @author.name

                elsif @activity.scope.size == 1

                  title = l("label_#{@activity.scope.first.singularize}_plural")

                end

                render_feed(events, :title => "#{@project || Setting.app_title}: #{title}")

              }

            end

          end

        rescue ActiveRecord::RecordNotFound

          render_404

        end

        private

        # TODO: refactor, duplicated in projects_controller

        def find_optional_project

          return true unless params[:id]

          @project = Project.find(params[:id])

          authorize

        rescue ActiveRecord::RecordNotFound

          render_404

        end

      end

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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

				# Redmine - project management software
				# Copyright (C) 2006-2011 Jean-Philippe Lang
				#
				# This program is free software; you can redistribute it and/or
				# modify it under the terms of the GNU General Public License
				# as published by the Free Software Foundation; either version 2
				# of the License, or (at your option) any later version.
				#
				# This program is distributed in the hope that it will be useful,
				# but WITHOUT ANY WARRANTY; without even the implied warranty of
				# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
				# GNU General Public License for more details.
				#
				# You should have received a copy of the GNU General Public License
				# along with this program; if not, write to the Free Software
				# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.

				class ActivitiesController < ApplicationController
				menu_item :activity
				before_filter :find_optional_project
				accept_rss_auth :index

				def index
				@days = Setting.activity_days_default.to_i

				if params[:from]
				begin; @date_to = params[:from].to_date + 1; rescue; end
				end

				@date_to \|\|= Date.today + 1
				@date_from = @date_to - @days
				@with_subprojects = params[:with_subprojects].nil? ? Setting.display_subprojects_issues? : (params[:with_subprojects] == '1')
				@author = (params[:user_id].blank? ? nil : User.active.find(params[:user_id]))

				@activity = Redmine::Activity::Fetcher.new(User.current, :project => @project,
				:with_subprojects => @with_subprojects,
				:author => @author)
				@activity.scope_select {\|t\| !params["show_#{t}"].nil?}
				@activity.scope = (@author.nil? ? :default : :all) if @activity.scope.empty?

				events = @activity.events(@date_from, @date_to)

				if events.empty? \|\| stale?(:etag => [@activity.scope, @date_to, @date_from, @with_subprojects, @author, events.first, User.current, current_language])
				respond_to do \|format\|
				format.html {
				@events_by_day = events.group_by(&:event_date)
				render :layout => false if request.xhr?
				}
				format.atom {
				title = l(:label_activity)
				if @author
				title = @author.name
				elsif @activity.scope.size == 1
				title = l("label_#{@activity.scope.first.singularize}_plural")
				end
				render_feed(events, :title => "#{@project \|\| Setting.app_title}: #{title}")
				}
				end
				end

				rescue ActiveRecord::RecordNotFound
				render_404
				end

				private

				# TODO: refactor, duplicated in projects_controller
				def find_optional_project
				return true unless params[:id]
				@project = Project.find(params[:id])
				authorize
				rescue ActiveRecord::RecordNotFound
				render_404
				end
				end