YUKI Hiroshi
null+****@clear*****
Thu Oct 10 15:07:15 JST 2013
YUKI Hiroshi 2013-10-10 15:07:15 +0900 (Thu, 10 Oct 2013) New Revision: 2359b0778aaed87b0ce95c102f071c9157e13a00 https://github.com/droonga/drnbench/commit/2359b0778aaed87b0ce95c102f071c9157e13a00 Message: Use more generic name for attributes Modified files: lib/droonga/benchmark/gradual-runner.rb lib/droonga/benchmark/runner.rb Modified: lib/droonga/benchmark/gradual-runner.rb (+12 -12) =================================================================== --- lib/droonga/benchmark/gradual-runner.rb 2013-10-10 15:02:36 +0900 (3cc7e88) +++ lib/droonga/benchmark/gradual-runner.rb 2013-10-10 15:07:15 +0900 (8e48417) @@ -48,12 +48,12 @@ module Droonga end def <<(result) - @response_statuses = nil + @statuses = nil @results[result.n_clients] = result end - def response_statuses - @response_statuses ||= prepare_response_statuses + def statuses + @statuses ||= prepare_statuses end def to_csv @@ -63,25 +63,25 @@ module Droonga end private - def prepare_response_statuses - response_statuses = [] + def prepare_statuses + statuses = [] @results.each do |n_clients, result| - response_statuses += result.response_statuses.keys + statuses += result.statuses.keys end - response_statuses.uniq! - response_statuses.sort! - response_statuses + statuses.uniq! + statuses.sort! + statuses end def csv_header - Runner::Result.keys + response_statuses + Runner::Result.keys + statuses end def csv_body @results.values.collect do |result| result.values + - response_statuses.collect do |status| - result.response_status_percentages[status] || 0 + statuses.collect do |status| + result.status_percentages[status] || 0 end end end Modified: lib/droonga/benchmark/runner.rb (+18 -18) =================================================================== --- lib/droonga/benchmark/runner.rb 2013-10-10 15:02:36 +0900 (32af846) +++ lib/droonga/benchmark/runner.rb 2013-10-10 15:07:15 +0900 (3caa7bc) @@ -164,7 +164,7 @@ module Droonga end class Result - attr_reader :n_clients, :duration, :response_statuses + attr_reader :n_clients, :duration, :statuses class << self def keys @@ -186,7 +186,7 @@ module Droonga @results = [] @total_elapsed_time = 0.0 @elapsed_times = [] - @response_statuses = {} + @statuses = {} end def <<(result) @@ -194,8 +194,8 @@ module Droonga @results << result - @response_statuses[result[:status]] ||= 0 - @response_statuses[result[:status]] += 1 + @statuses[result[:status]] ||= 0 + @statuses[result[:status]] += 1 @elapsed_times << result[:elapsed_time] @total_elapsed_time += result[:elapsed_time] @@ -209,8 +209,8 @@ module Droonga @queries_per_second ||= total_n_requests.to_f / @duration end - def response_status_percentages - @response_status_percentages ||= prepare_response_status_percentages + def status_percentages + @status_percentages ||= prepare_status_percentages end def min_elapsed_time @@ -229,7 +229,7 @@ module Droonga "Total requests: #{total_n_requests} " + "(#{queries_per_second} queries per second)\n" + "Status:\n" + - response_status_percentages.collect do |status, percentage| + status_percentages.collect do |status, percentage| " #{status}: #{percentage} %" end.join("\n") + "\n" + "Elapsed time:\n" + @@ -248,27 +248,27 @@ module Droonga def clear_cached_statistics @total_n_requests = nil @queries_per_second = nil - @response_status_percentages = nil + @status_percentages = nil @min_elapsed_time = nil @max_elapsed_time = nil @average_elapsed_time = nil end - def prepare_response_status_percentages - http_status_percentages = [] - @response_statuses.each do |status, n_results| + def prepare_status_percentages + status_percentages = [] + @statuses.each do |status, n_results| percentage = n_results.to_f / total_n_requests * 100 - http_status_percentages << {:percentage => percentage, - :status => status} + status_percentages << {:percentage => percentage, + :status => status} end - http_status_percentages.sort! do |a, b| + status_percentages.sort! do |a, b| (-1) * (a[:percentage] <=> b[:percentage]) end - response_status_percentages = {} - http_status_percentages.each do |status| - response_status_percentages[status[:status]] = status[:percentage] + status_percentages = {} + status_percentages.each do |status| + status_percentages[status[:status]] = status[:percentage] end - response_status_percentages + status_percentages end end end -------------- next part -------------- HTML����������������������������...Descargar
