Haruka Yoshihara
null+****@clear*****
Thu Dec 13 11:29:57 JST 2012
Haruka Yoshihara 2012-12-13 11:29:57 +0900 (Thu, 13 Dec 2012) New Revision: d8e5a73bfca5429d64bb298caec9edd19243f5db https://github.com/groonga/groonga-query-log/commit/d8e5a73bfca5429d64bb298caec9edd19243f5db Log: Don't indent here documents Modified files: lib/groonga/query-log/analyzer/reporter/html.rb test/fixtures/html.expected Modified: lib/groonga/query-log/analyzer/reporter/html.rb (+183 -183) =================================================================== --- lib/groonga/query-log/analyzer/reporter/html.rb 2012-12-13 11:29:16 +0900 (edb9681) +++ lib/groonga/query-log/analyzer/reporter/html.rb 2012-12-13 11:29:57 +0900 (7efaf93) @@ -43,12 +43,12 @@ module Groonga def report_summary summary_html = erb(<<-EOH, __LINE__ + 1, binding) - <h2>Summary</h2> - <div class="summary"> - <%= analyze_parameters %> - <%= metrics %> - <%= slow_operations %> - </div> + <h2>Summary</h2> + <div class="summary"> +<%= analyze_parameters %> +<%= metrics %> +<%= slow_operations %> + </div> EOH write(summary_html) end @@ -62,42 +62,42 @@ module Groonga def report_statistic(statistic) command = statistic.command statistic_html = erb(<<-EOH, __LINE__ + 1, binding) - <div class="statistic-heading"> - <h3>Command</h3> - <div class="metrics"> - [<%= format_time(statistic.start_time) %> - - - <%= format_time(statistic.last_time) %> - (<%= format_elapsed(statistic.elapsed_in_seconds, - :slow? => statistic.slow?) %>)] - (<%= span({:class => "return-code"}, h(statistic.return_code)) %>) - </div> - <%= div({:class => "raw-command"}, h(statistic.raw_command)) %> - </div> - <div class="statistic-parameters"> - <h3>Parameters</h3> - <dl> - <dt>name</dt> - <dd><%= h(command.name) %></dd> - <% command.arguments.each do |key, value| %> - <dt><%= h(key) %></dt> - <dd><%= h(value) %></dd> - <% end %> - </dl> - </div> - <div class="statistic-operations"> - <h3>Operations</h3> - <ol> - <% statistic.each_operation do |operation| %> - <li> - <%= format_elapsed(operation[:relative_elapsed_in_seconds], - :slow? => operation[:slow?]) %>: - <%= span({:class => "name"}, h(operation[:name])) %>: - <%= span({:class => "context"}, h(operation[:context])) %> - </li> - <% end %> - </ol> - </div> + <div class="statistic-heading"> + <h3>Command</h3> + <div class="metrics"> + [<%= format_time(statistic.start_time) %> + - + <%= format_time(statistic.last_time) %> + (<%= format_elapsed(statistic.elapsed_in_seconds, + :slow? => statistic.slow?) %>)] + (<%= span({:class => "return-code"}, h(statistic.return_code)) %>) + </div> + <%= div({:class => "raw-command"}, h(statistic.raw_command)) %> + </div> + <div class="statistic-parameters"> + <h3>Parameters</h3> + <dl> + <dt>name</dt> + <dd><%= h(command.name) %></dd> +<% command.arguments.each do |key, value| %> + <dt><%= h(key) %></dt> + <dd><%= h(value) %></dd> +<% end %> + </dl> + </div> + <div class="statistic-operations"> + <h3>Operations</h3> + <ol> +<% statistic.each_operation do |operation| %> + <li> + <%= format_elapsed(operation[:relative_elapsed_in_seconds], + :slow? => operation[:slow?]) %>: + <%= span({:class => "name"}, h(operation[:name])) %>: + <%= span({:class => "context"}, h(operation[:context])) %> + </li> +<% end %> + </ol> + </div> EOH write(statistic_html) end @@ -110,180 +110,180 @@ module Groonga def header erb(<<-EOH, __LINE__ + 1) - <html> - <head> - <title>groonga query analyzer</title> - <style> - table, - table tr, - table tr th, - table tr td - { - border: 1px solid black; - } +<html> + <head> + <title>groonga query analyzer</title> + <style> +table, +table tr, +table tr th, +table tr td +{ + border: 1px solid black; +} - span.slow - { - color: red; - } +span.slow +{ + color: red; +} - div.parameters - { - float: left; - padding: 2em; - } +div.parameters +{ + float: left; + padding: 2em; +} - div.parameters h3 - { - text-align: center; - } +div.parameters h3 +{ + text-align: center; +} - div.parameters table - { - margin-right: auto; - margin-left: auto; - } +div.parameters table +{ + margin-right: auto; + margin-left: auto; +} - div.statistics - { - clear: both; - } +div.statistics +{ + clear: both; +} - td.elapsed, - td.ratio, - td.n - { - text-align: right; - } +td.elapsed, +td.ratio, +td.n +{ + text-align: right; +} - td.name - { - text-align: center; - } - </style> - </head> - <body> - <h1>groonga query analyzer</h1> - EOH - end +td.name +{ + text-align: center; +} + </style> + </head> + <body> + <h1>groonga query analyzer</h1> + EOH + end - def footer - erb(<<-EOH, __LINE__ + 1) - </body> - </html> + def footer + erb(<<-EOH, __LINE__ + 1) + </body> +</html> EOH end def statistics_header erb(<<-EOH, __LINE__ + 1) - <h2>Slow Queries</h2> - <div> + <h2>Slow Queries</h2> + <div> EOH end def statistics_footer erb(<<-EOH, __LINE__ + 1) - </div> + </div> EOH end def analyze_parameters erb(<<-EOH, __LINE__ + 1) - <div class="parameters"> - <h3>Analyze Parameters</h3> - <table> - <tr><th>Name</th><th>Value</th></tr> - <tr> - <th>Slow response threshold</th> - <td><%= h(@statistics.slow_response_threshold) %>sec</td> - </tr> - <tr> - <th>Slow operation threshold</th> - <td><%= h(@statistics.slow_operation_threshold) %>sec</td> - </tr> - </table> - </div> + <div class="parameters"> + <h3>Analyze Parameters</h3> + <table> + <tr><th>Name</th><th>Value</th></tr> + <tr> + <th>Slow response threshold</th> + <td><%= h(@statistics.slow_response_threshold) %>sec</td> + </tr> + <tr> + <th>Slow operation threshold</th> + <td><%= h(@statistics.slow_operation_threshold) %>sec</td> + </tr> + </table> + </div> EOH end def metrics erb(<<-EOH, __LINE__ + 1) - <div class="parameters"> - <h3>Metrics</h3> - <table> - <tr><th>Name</th><th>Value</th></tr> - <tr> - <th># of responses</th> - <td><%= h(@statistics.n_responses) %></td> - </tr> - <tr> - <th># of slow responses</th> - <td><%= h(@statistics.n_slow_responses) %></td> - </tr> - <tr> - <th>responses/sec</th> - <td><%= h(@statistics.responses_per_second) %></td> - </tr> - <tr> - <th>start time</th> - <td><%= format_time(@statistics.start_time) %></td> - </tr> - <tr> - <th>last time</th> - <td><%= format_time(@statistics.last_time) %></td> - </tr> - <tr> - <th>period</th> - <td><%= h(@statistics.period) %>sec</td> - </tr> - <tr> - <th>slow response ratio</th> - <td><%= h(@statistics.slow_response_ratio) %>%</td> - </tr> - <tr> - <th>total response time</th> - <td><%= h(@statistics.total_elapsed) %>sec</td> - </tr> - </table> - </div> + <div class="parameters"> + <h3>Metrics</h3> + <table> + <tr><th>Name</th><th>Value</th></tr> + <tr> + <th># of responses</th> + <td><%= h(@statistics.n_responses) %></td> + </tr> + <tr> + <th># of slow responses</th> + <td><%= h(@statistics.n_slow_responses) %></td> + </tr> + <tr> + <th>responses/sec</th> + <td><%= h(@statistics.responses_per_second) %></td> + </tr> + <tr> + <th>start time</th> + <td><%= format_time(@statistics.start_time) %></td> + </tr> + <tr> + <th>last time</th> + <td><%= format_time(@statistics.last_time) %></td> + </tr> + <tr> + <th>period</th> + <td><%= h(@statistics.period) %>sec</td> + </tr> + <tr> + <th>slow response ratio</th> + <td><%= h(@statistics.slow_response_ratio) %>%</td> + </tr> + <tr> + <th>total response time</th> + <td><%= h(@statistics.total_elapsed) %>sec</td> + </tr> + </table> + </div> EOH end def slow_operations erb(<<-EOH, __LINE__ + 1) - <div class="statistics"> - <h3>Slow Operations</h3> - <table class="slow-operations"> - <tr> - <th>total elapsed(sec)</th> - <th>total elapsed(%)</th> - <th># of operations</th> - <th># of operations(%)</th> - <th>operation name</th> - <th>context</th> - </tr> - <% @statistics.each_slow_operation do |grouped_operation| %> - <tr> - <td class="elapsed"> - <%= format_elapsed(grouped_operation[:total_elapsed]) %> - </td> - <td class="ratio"> - <%= format_ratio(grouped_operation[:total_elapsed_ratio]) %> - </td> - <td class="n"> - <%= h(grouped_operation[:n_operations]) %> - </td> - <td class="ratio"> - <%= format_ratio(grouped_operation[:n_operations_ratio]) %> - </td> - <td class="name"><%= h(grouped_operation[:name]) %></td> - <td class="context"> - <%= format_context(grouped_operation[:context]) %> - </td> - </tr> - <% end %> - </table> - </div> + <div class="statistics"> + <h3>Slow Operations</h3> + <table class="slow-operations"> + <tr> + <th>total elapsed(sec)</th> + <th>total elapsed(%)</th> + <th># of operations</th> + <th># of operations(%)</th> + <th>operation name</th> + <th>context</th> + </tr> +<% @statistics.each_slow_operation do |grouped_operation| %> + <tr> + <td class="elapsed"> + <%= format_elapsed(grouped_operation[:total_elapsed]) %> + </td> + <td class="ratio"> + <%= format_ratio(grouped_operation[:total_elapsed_ratio]) %> + </td> + <td class="n"> + <%= h(grouped_operation[:n_operations]) %> + </td> + <td class="ratio"> + <%= format_ratio(grouped_operation[:n_operations_ratio]) %> + </td> + <td class="name"><%= h(grouped_operation[:name]) %></td> + <td class="context"> + <%= format_context(grouped_operation[:context]) %> + </td> + </tr> +<% end %> + </table> + </div> EOH end Modified: test/fixtures/html.expected (+163 -175) =================================================================== --- test/fixtures/html.expected 2012-12-13 11:29:16 +0900 (ad3675f) +++ test/fixtures/html.expected 2012-12-13 11:29:57 +0900 (3e6dfa7) @@ -1,183 +1,171 @@ - <html> - <head> - <title>groonga query analyzer</title> - <style> - table, - table tr, - table tr th, - table tr td - { - border: 1px solid black; - } +<html> + <head> + <title>groonga query analyzer</title> + <style> +table, +table tr, +table tr th, +table tr td +{ + border: 1px solid black; +} - span.slow - { - color: red; - } +span.slow +{ + color: red; +} - div.parameters - { - float: left; - padding: 2em; - } +div.parameters +{ + float: left; + padding: 2em; +} - div.parameters h3 - { - text-align: center; - } +div.parameters h3 +{ + text-align: center; +} - div.parameters table - { - margin-right: auto; - margin-left: auto; - } +div.parameters table +{ + margin-right: auto; + margin-left: auto; +} - div.statistics - { - clear: both; - } +div.statistics +{ + clear: both; +} - td.elapsed, - td.ratio, - td.n - { - text-align: right; - } +td.elapsed, +td.ratio, +td.n +{ + text-align: right; +} - td.name - { - text-align: center; - } - </style> - </head> - <body> - <h1>groonga query analyzer</h1> - <h2>Summary</h2> - <div class="summary"> - <div class="parameters"> - <h3>Analyze Parameters</h3> - <table> - <tr><th>Name</th><th>Value</th></tr> - <tr> - <th>Slow response threshold</th> - <td>0.2sec</td> - </tr> - <tr> - <th>Slow operation threshold</th> - <td>0.1sec</td> - </tr> - </table> - </div> - - <div class="parameters"> - <h3>Metrics</h3> - <table> - <tr><th>Name</th><th>Value</th></tr> - <tr> - <th># of responses</th> - <td>1</td> - </tr> - <tr> - <th># of slow responses</th> - <td>0</td> - </tr> - <tr> - <th>responses/sec</th> - <td>821.5981727656638</td> - </tr> - <tr> - <th>start time</th> - <td><span class="time">2012-12-12 17:39:17.3</span></td> - </tr> - <tr> - <th>last time</th> - <td><span class="time">2012-12-12 17:39:17.3</span></td> - </tr> - <tr> - <th>period</th> - <td>0.00121714sec</td> - </tr> - <tr> - <th>slow response ratio</th> - <td>0.0%</td> - </tr> - <tr> - <th>total response time</th> - <td>0.00121714sec</td> - </tr> - </table> - </div> - - <div class="statistics"> - <h3>Slow Operations</h3> - <table class="slow-operations"> - <tr> - <th>total elapsed(sec)</th> - <th>total elapsed(%)</th> - <th># of operations</th> - <th># of operations(%)</th> - <th>operation name</th> - <th>context</th> - </tr> - - </table> - </div> - - </div> - <h2>Slow Queries</h2> - <div> - <div class="statistic-heading"> - <h3>Command</h3> - <div class="metrics"> - [<span class="time">2012-12-12 17:39:17.3</span> - - - <span class="time">2012-12-12 17:39:17.3</span> - (<span class="elapsed">0.00121714</span>)] - (<span class="return-code">0</span>) - </div> - <div class="raw-command">select --table Users --query follower:@groonga --output_columns _key,name</div> - </div> - <div class="statistic-parameters"> - <h3>Parameters</h3> - <dl> - <dt>name</dt> - <dd>select</dd> - - <dt>table</dt> - <dd>Users</dd> - - <dt>query</dt> - <dd>follower:@groonga</dd> - - <dt>output_columns</dt> - <dd>_key,name</dd> - - </dl> - </div> - <div class="statistic-operations"> - <h3>Operations</h3> - <ol> - - <li> - <span class="elapsed">0.00084295</span>: - <span class="name">filter</span>: - <span class="context">query: follower:@groonga</span> - </li> - - <li> - <span class="elapsed">0.00002795</span>: - <span class="name">select</span>: - <span class="context"></span> - </li> - - <li> - <span class="elapsed">0.00019585</span>: - <span class="name">output</span>: - <span class="context">_key,name</span> - </li> - - </ol> - </div> +td.name +{ + text-align: center; +} + </style> + </head> + <body> + <h1>groonga query analyzer</h1> + <h2>Summary</h2> + <div class="summary"> + <div class="parameters"> + <h3>Analyze Parameters</h3> + <table> + <tr><th>Name</th><th>Value</th></tr> + <tr> + <th>Slow response threshold</th> + <td>0.2sec</td> + </tr> + <tr> + <th>Slow operation threshold</th> + <td>0.1sec</td> + </tr> + </table> + </div> + <div class="parameters"> + <h3>Metrics</h3> + <table> + <tr><th>Name</th><th>Value</th></tr> + <tr> + <th># of responses</th> + <td>1</td> + </tr> + <tr> + <th># of slow responses</th> + <td>0</td> + </tr> + <tr> + <th>responses/sec</th> + <td>821.5981727656638</td> + </tr> + <tr> + <th>start time</th> + <td><span class="time">2012-12-12 17:39:17.3</span></td> + </tr> + <tr> + <th>last time</th> + <td><span class="time">2012-12-12 17:39:17.3</span></td> + </tr> + <tr> + <th>period</th> + <td>0.00121714sec</td> + </tr> + <tr> + <th>slow response ratio</th> + <td>0.0%</td> + </tr> + <tr> + <th>total response time</th> + <td>0.00121714sec</td> + </tr> + </table> + </div> + <div class="statistics"> + <h3>Slow Operations</h3> + <table class="slow-operations"> + <tr> + <th>total elapsed(sec)</th> + <th>total elapsed(%)</th> + <th># of operations</th> + <th># of operations(%)</th> + <th>operation name</th> + <th>context</th> + </tr> + </table> + </div> + </div> + <h2>Slow Queries</h2> + <div> + <div class="statistic-heading"> + <h3>Command</h3> + <div class="metrics"> + [<span class="time">2012-12-12 17:39:17.3</span> + - + <span class="time">2012-12-12 17:39:17.3</span> + (<span class="elapsed">0.00121714</span>)] + (<span class="return-code">0</span>) </div> - </body> - </html> + <div class="raw-command">select --table Users --query follower:@groonga --output_columns _key,name</div> + </div> + <div class="statistic-parameters"> + <h3>Parameters</h3> + <dl> + <dt>name</dt> + <dd>select</dd> + <dt>table</dt> + <dd>Users</dd> + <dt>query</dt> + <dd>follower:@groonga</dd> + <dt>output_columns</dt> + <dd>_key,name</dd> + </dl> + </div> + <div class="statistic-operations"> + <h3>Operations</h3> + <ol> + <li> + <span class="elapsed">0.00084295</span>: + <span class="name">filter</span>: + <span class="context">query: follower:@groonga</span> + </li> + <li> + <span class="elapsed">0.00002795</span>: + <span class="name">select</span>: + <span class="context"></span> + </li> + <li> + <span class="elapsed">0.00019585</span>: + <span class="name">output</span>: + <span class="context">_key,name</span> + </li> + </ol> + </div> + </div> + </body> +</html> -------------- next part -------------- HTML����������������������������...Télécharger
