@@ -31,11 +31,11 @@ module RequestLogAnalyzer::FileFormat RU = Proc.new { |request| "#{request[:user]}" } report do |analyze| - analyze.frequency :user, :title => "Top 20 of users with most queries", :amount => 20 - analyze.duration :query_time, :category => RU, :title => 'Total query duration per user' - analyze.duration :query_time, :category => RQ, :title => 'Top 50 queries by duration', :amount => 50 - analyze.count :query, :category => RQ, :title => "Top queries by total rows examined", :amount => 20 - analyze.count :rows_sent, :category => RQ, :title => "Top queries by rows sent", :amount => 20 + analyze.frequency :user, :title => "Users with most queries", :amount => 20 + analyze.duration :query_time, :category => RU, :title => 'Query time per user' + analyze.duration :query_time, :category => RQ, :title => 'Query time', :amount => 50 + analyze.count :category => RQ, :title => "Rows examined", :amount => 20, :field => :rows_examined + analyze.count :category => RQ, :title => "Rows sent", :amount => 20, :field => :rows_sent end class Request < RequestLogAnalyzer::Request lib/request_log_analyzer/file_format/mysql.rb @@ -7,9 +7,9 @@ module RequestLogAnalyzer::Tracker def prepare raise "No categorizer set up for category tracker #{self.inspect}" unless options[:category] + raise "No field to count has been set up #{self.inspect}" unless options[:field] @categorizer = create_lambda(options[:category]) @categories = {} - end # Return the methods sorted by count @@ -20,34 +20,39 @@ module RequestLogAnalyzer::Tracker # Get the duration information fron the request and store it in the different categories. # <tt>request</tt> The request. def update(request) - return if request[options[:category]] == 0 || request[options[:category]].nil? + return if request[options[:field]] == 0 || request[options[:field]].nil? cat = @categorizer.call(request) if cat @categories[cat] ||= 0 - @categories[cat] += request[options[:category]].to_i + @categories[cat] += request[options[:field]].to_i end end def report(output) - output.title(options[:title]) if options[:title] - if @categories.empty? output << "None found.\n" else + output.title('') sorted_categories = output.slice_results(sorted_by_count) - output.table({:title => "Category", :align => :right}, {:align => :right, :title => "Rows"}) do |rows| + output.table( {:title => title, :align => :left, :width => :rest }, + {:title => "Count", :align => :right, :width => 15 }) do |rows| sorted_categories.each do |(cat, count)| - rows << [cat, count] + rows << [cat, format_number(count)] end end end end + + # Format an int to a nice string with decimal seperation. + def format_number(number) + number.to_s.gsub(/(\d)(?=(\d\d\d)+(?!\d))/, "\\1,") + end # Returns the title of this tracker for reports def title - options[:title] || 'Count' + options[:title] || 'Category' end # Returns all the categories and the tracked duration as a hash than can be exported to YAML lib/request_log_analyzer/tracker/count.rb aa1e2686d6f969453ed99a4420e62f8263bbca47 Bart ten Brinke info@retrosync.com http://github.com/wvanbergen/request-log-analyzer/commit/59a3ddfc3a44cfd534e5f0d26f99c5d5ace85517 59a3ddfc3a44cfd534e5f0d26f99c5d5ace85517 2009-11-12T14:13:00-08:00 2009-11-12T14:13:00-08:00 Fixed categorization of mysql queries 9f360f9037e7d0a72bb773a1718b5fa81def9fcf Bart ten Brinke info@retrosync.com