]> granicus.if.org Git - pgbadger/commitdiff
Remove Query type reports when log contains only duration.
authorDarold Gilles <gilles@darold.net>
Fri, 5 Jul 2013 16:39:45 +0000 (18:39 +0200)
committerDarold Gilles <gilles@darold.net>
Fri, 5 Jul 2013 16:39:45 +0000 (18:39 +0200)
pgbadger

index ee8c174546a08e0b24d3cb30fc9849795ebfd0be..f0fa664820b782b45d34ce398eb499682f92b692 100755 (executable)
--- a/pgbadger
+++ b/pgbadger
@@ -2938,6 +2938,7 @@ sub print_hourly_reports
 
                                                        if (!$disable_query) {
                                                                foreach my $action (@SQL_ACTION) {
+                                                                       next if (!$per_minute_info{$tm}{$h}{$m}{$action}{count});
                                                                        $a_dataavg{$action}{count}{"$rd"} += ($per_minute_info{$tm}{$h}{$m}{$action}{count} || 0);
                                                                        $a_dataavg{$action}{duration}{"$rd"} += ($per_minute_info{$tm}{$h}{$m}{$action}{duration} || 0);
                                                                        if ( ($action ne 'SELECT') && exists $per_minute_info{$tm}{$h}{$m}{$action}{count}) {
@@ -2991,7 +2992,6 @@ sub print_hourly_reports
                                                        foreach my $action (@SQL_ACTION) {
                                                                next if ($select_only && ($action ne 'SELECT'));
                                                                # Average per minute
-                                                               #$graph_data{"$action"} .= "[$t, " . int(($a_dataavg{$action}{count}{"$rd"} || 0) / (60 * $avg_minutes)) . "],";
                                                                $graph_data{"$action"} .= "[$t, " . ($a_dataavg{$action}{count}{"$rd"} || 0) . "],";
                                                                if ($action eq 'SELECT') {
                                                                        $graph_data{"$action-2"} .= "[$t, " . sprintf("%.2f", (($a_dataavg{$action}{duration}{"$rd"} || 0) / ($a_dataavg{$action}{count}{"$rd"} || 1)) / 1000) . "]," if ($action eq 'SELECT');
@@ -3022,7 +3022,7 @@ sub print_hourly_reports
                                &flotr2_graph(
                                        4, 'selectqueries_graph', $graph_data{"SELECT"}, '', '', 'SELECT queries (' . $avg_minutes . ' minutes period)',
                                        'Queries', 'Number of queries', '', '', 'Duration', $graph_data{"SELECT-2"}, 'Average duration (s)'
-                               );
+                               ) if ($graph_data{"SELECT"});
                                # Write queries
                                if (!$select_only && $graph_data{"write"}) {
                                        &flotr2_graph(