Merge pull request #9 from joegrasse/master

Merge fixes for Issue #1 and Issue #6, contribution from Joe Grasse (Thanks!)

Author: MarkLeith

sys_56.sql

@@ -1,17 +1,17 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-
-   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; version 2 of the License.
-
-   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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+-- Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+--
+-- 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; version 2 of the License.
+--
+-- 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 St, Fifth Floor, Boston, MA 02110-1301 USA
 
 SOURCE ./before_setup.sql
 

sys_57.sql

@@ -1,17 +1,17 @@
-/* Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
-
-   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; version 2 of the License.
-
-   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 St, Fifth Floor, Boston, MA 02110-1301 USA */
+-- Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved.
+--
+-- 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; version 2 of the License.
+--
+-- 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 St, Fifth Floor, Boston, MA 02110-1301 USA
 
 SOURCE ./before_setup.sql
 

views/i_s/innodb_buffer_stats_by_schema.sql

@@ -92,7 +92,7 @@ SELECT IF(LOCATE('.', ibp.table_name) = 0, 'InnoDB System', REPLACE(SUBSTRING_IN
        COUNT(ibp.page_number) AS pages,
        COUNT(IF(ibp.is_hashed = 'YES', 1, 0)) AS pages_hashed,
        COUNT(IF(ibp.is_old = 'YES', 1, 0)) AS pages_old,
-       ROUND(SUM(ibp.number_records)/COUNT(DISTINCT ibp.index_name)) AS rows_cached 
+       ROUND(IFNULL(SUM(ibp.number_records)/NULLIF(COUNT(DISTINCT ibp.index_name), 0), 0)) AS rows_cached 
   FROM information_schema.innodb_buffer_page ibp 
  WHERE table_name IS NOT NULL
  GROUP BY object_schema

views/i_s/innodb_buffer_stats_by_table.sql

@@ -104,7 +104,7 @@ SELECT IF(LOCATE('.', ibp.table_name) = 0, 'InnoDB System', REPLACE(SUBSTRING_IN
        COUNT(ibp.page_number) AS pages,
        COUNT(IF(ibp.is_hashed = 'YES', 1, 0)) AS pages_hashed,
        COUNT(IF(ibp.is_old = 'YES', 1, 0)) AS pages_old,
-       ROUND(SUM(ibp.number_records)/COUNT(DISTINCT ibp.index_name)) AS rows_cached 
+       ROUND(IFNULL(SUM(ibp.number_records)/NULLIF(COUNT(DISTINCT ibp.index_name), 0), 0)) AS rows_cached 
   FROM information_schema.innodb_buffer_page ibp 
  WHERE table_name IS NOT NULL
  GROUP BY object_schema, object_name

views/p_s/io_global_by_file_by_bytes.sql

@@ -49,12 +49,12 @@ VIEW io_global_by_file_by_bytes (
 SELECT sys.format_path(file_name) AS file, 
        count_read, 
        sys.format_bytes(sum_number_of_bytes_read) AS total_read,
-       sys.format_bytes(IFNULL(sum_number_of_bytes_read / count_read, 0)) AS avg_read,
+       sys.format_bytes(IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0)) AS avg_read,
        count_write, 
        sys.format_bytes(sum_number_of_bytes_write) AS total_written,
-       sys.format_bytes(IFNULL(sum_number_of_bytes_write / count_write, 0.00)) AS avg_write,
+       sys.format_bytes(IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0.00)) AS avg_write,
        sys.format_bytes(sum_number_of_bytes_read + sum_number_of_bytes_write) AS total, 
-       IFNULL(ROUND(100-((sum_number_of_bytes_read/(sum_number_of_bytes_read+sum_number_of_bytes_write))*100), 2), 0.00) AS write_pct 
+       IFNULL(ROUND(100-((sum_number_of_bytes_read/ NULLIF((sum_number_of_bytes_read+sum_number_of_bytes_write), 0))*100), 2), 0.00) AS write_pct 
   FROM performance_schema.file_summary_by_instance
  ORDER BY sum_number_of_bytes_read + sum_number_of_bytes_write DESC;
 
@@ -94,11 +94,11 @@ VIEW x$io_global_by_file_by_bytes (
 SELECT file_name AS file, 
        count_read, 
        sum_number_of_bytes_read AS total_read,
-       IFNULL(sum_number_of_bytes_read / count_read, 0) AS avg_read,
+       IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0) AS avg_read,
        count_write, 
        sum_number_of_bytes_write AS total_written,
-       IFNULL(sum_number_of_bytes_write / count_write, 0.00) AS avg_write,
+       IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0.00) AS avg_write,
        sum_number_of_bytes_read + sum_number_of_bytes_write AS total, 
-       IFNULL(ROUND(100-((sum_number_of_bytes_read/(sum_number_of_bytes_read+sum_number_of_bytes_write))*100), 2), 0.00) AS write_pct 
+       IFNULL(ROUND(100-((sum_number_of_bytes_read/ NULLIF((sum_number_of_bytes_read+sum_number_of_bytes_write), 0))*100), 2), 0.00) AS write_pct 
   FROM performance_schema.file_summary_by_instance
  ORDER BY sum_number_of_bytes_read + sum_number_of_bytes_write DESC;

views/p_s/io_global_by_wait_by_bytes.sql

@@ -69,10 +69,10 @@ SELECT SUBSTRING_INDEX(event_name, '/', -2) event_name,
        sys.format_time(max_timer_wait) AS max_latency,
        count_read,
        sys.format_bytes(sum_number_of_bytes_read) AS total_read,
-       sys.format_bytes(IFNULL(sum_number_of_bytes_read / count_read, 0)) AS avg_read,
+       sys.format_bytes(IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0)) AS avg_read,
        count_write,
        sys.format_bytes(sum_number_of_bytes_write) AS total_written,
-       sys.format_bytes(IFNULL(sum_number_of_bytes_write / count_write, 0)) AS avg_written,
+       sys.format_bytes(IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0)) AS avg_written,
        sys.format_bytes(sum_number_of_bytes_write + sum_number_of_bytes_read) AS total_requested
   FROM performance_schema.file_summary_by_event_name
  WHERE event_name LIKE 'wait/io/file/%' 
@@ -130,10 +130,10 @@ SELECT SUBSTRING_INDEX(event_name, '/', -2) AS event_name,
        max_timer_wait AS max_latency,
        count_read,
        sum_number_of_bytes_read AS total_read,
-       IFNULL(sum_number_of_bytes_read / count_read, 0) AS avg_read,
+       IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0) AS avg_read,
        count_write,
        sum_number_of_bytes_write AS total_written,
-       IFNULL(sum_number_of_bytes_write / count_write, 0) AS avg_written,
+       IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0) AS avg_written,
        sum_number_of_bytes_write + sum_number_of_bytes_read AS total_requested
   FROM performance_schema.file_summary_by_event_name
  WHERE event_name LIKE 'wait/io/file/%' 

views/p_s/io_global_by_wait_by_latency.sql

@@ -72,10 +72,10 @@ SELECT SUBSTRING_INDEX(event_name, '/', -2) AS event_name,
        sys.format_time(sum_timer_misc) AS misc_latency,
        count_read,
        sys.format_bytes(sum_number_of_bytes_read) AS total_read,
-       sys.format_bytes(IFNULL(sum_number_of_bytes_read / count_read, 0)) AS avg_read,
+       sys.format_bytes(IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0)) AS avg_read,
        count_write,
        sys.format_bytes(sum_number_of_bytes_write) AS total_written,
-       sys.format_bytes(IFNULL(sum_number_of_bytes_write / count_write, 0)) AS avg_written
+       sys.format_bytes(IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0)) AS avg_written
   FROM performance_schema.file_summary_by_event_name 
  WHERE event_name LIKE 'wait/io/file/%'
    AND count_star > 0
@@ -141,10 +141,10 @@ SELECT SUBSTRING_INDEX(event_name, '/', -2) AS event_name,
        sum_timer_misc AS misc_latency,
        count_read,
        sum_number_of_bytes_read AS total_read,
-       IFNULL(sum_number_of_bytes_read / count_read, 0) AS avg_read,
+       IFNULL(sum_number_of_bytes_read / NULLIF(count_read, 0), 0) AS avg_read,
        count_write,
        sum_number_of_bytes_write AS total_written,
-       IFNULL(sum_number_of_bytes_write / count_write, 0) AS avg_written
+       IFNULL(sum_number_of_bytes_write / NULLIF(count_write, 0), 0) AS avg_written
   FROM performance_schema.file_summary_by_event_name 
  WHERE event_name LIKE 'wait/io/file/%'
    AND count_star > 0

views/p_s/memory_by_user.sql

@@ -43,7 +43,7 @@ VIEW memory_by_user_by_current_bytes (
 SELECT user,
        SUM(current_count_used) AS current_count_used,
        sys.format_bytes(SUM(current_number_of_bytes_used)) AS current_allocated,
-       sys.format_bytes(SUM(current_number_of_bytes_used) / SUM(current_count_used)) AS current_avg_alloc,
+       sys.format_bytes(IFNULL(SUM(current_number_of_bytes_used) / NULLIF(SUM(current_count_used), 0), 0)) AS current_avg_alloc,
        sys.format_bytes(MAX(current_number_of_bytes_used)) AS current_max_alloc,
        sys.format_bytes(SUM(sum_number_of_bytes_alloc)) AS total_allocated
   FROM performance_schema.memory_summary_by_user_by_event_name
@@ -80,7 +80,7 @@ VIEW x$memory_by_user_by_current_bytes (
 SELECT user,
        SUM(current_count_used) AS current_count_used,
        SUM(current_number_of_bytes_used) AS current_allocated,
-       SUM(current_number_of_bytes_used) / SUM(current_count_used) AS current_avg_alloc,
+       IFNULL(SUM(current_number_of_bytes_used) / NULLIF(SUM(current_count_used), 0), 0) AS current_avg_alloc,
        MAX(current_number_of_bytes_used) AS current_max_alloc,
        SUM(sum_number_of_bytes_alloc) AS total_allocated
   FROM performance_schema.memory_summary_by_user_by_event_name

views/p_s/memory_global_by_current_allocated.sql

@@ -48,10 +48,10 @@ VIEW memory_global_by_current_allocated (
 SELECT event_name,
        current_count_used AS current_count,
        sys.format_bytes(current_number_of_bytes_used) AS current_alloc,
-       sys.format_bytes(current_number_of_bytes_used / current_count_used) AS current_avg_alloc,
+       sys.format_bytes(IFNULL(current_number_of_bytes_used / NULLIF(current_count_used, 0), 0)) AS current_avg_alloc,
        high_count_used AS high_count,
        sys.format_bytes(high_number_of_bytes_used) AS high_alloc,
-       sys.format_bytes(high_number_of_bytes_used / high_count_used) AS high_avg_alloc
+       sys.format_bytes(IFNULL(high_number_of_bytes_used / NULLIF(high_count_used, 0), 0)) AS high_avg_alloc
   FROM performance_schema.memory_summary_global_by_event_name
  WHERE current_number_of_bytes_used > 0
  ORDER BY current_number_of_bytes_used DESC;
@@ -91,10 +91,10 @@ VIEW x$memory_global_by_current_allocated (
 SELECT event_name,
        current_count_used AS current_count,
        current_number_of_bytes_used AS current_alloc,
-       current_number_of_bytes_used / current_count_used AS current_avg_alloc,
+       IFNULL(current_number_of_bytes_used / NULLIF(current_count_used, 0), 0) AS current_avg_alloc,
        high_count_used AS high_count,
        high_number_of_bytes_used AS high_alloc,
-       high_number_of_bytes_used / high_count_used AS high_avg_alloc
+       IFNULL(high_number_of_bytes_used / NULLIF(high_count_used, 0), 0) AS high_avg_alloc
   FROM performance_schema.memory_summary_global_by_event_name
  WHERE current_number_of_bytes_used > 0
  ORDER BY current_number_of_bytes_used DESC;

views/p_s/statement_analysis.sql

@@ -84,9 +84,9 @@ SELECT sys.format_statement(DIGEST_TEXT) AS query,
        sys.format_time(AVG_TIMER_WAIT) AS avg_latency,
        sys.format_time(SUM_LOCK_TIME) AS lock_latency,
        SUM_ROWS_SENT AS rows_sent,
-       ROUND(SUM_ROWS_SENT / COUNT_STAR) AS rows_sent_avg,
+       ROUND(IFNULL(SUM_ROWS_SENT / NULLIF(COUNT_STAR, 0), 0)) AS rows_sent_avg,
        SUM_ROWS_EXAMINED AS rows_examined,
-       ROUND(SUM_ROWS_EXAMINED / COUNT_STAR)  AS rows_examined_avg,
+       ROUND(IFNULL(SUM_ROWS_EXAMINED / NULLIF(COUNT_STAR, 0), 0))  AS rows_examined_avg,
        SUM_CREATED_TMP_TABLES AS tmp_tables,
        SUM_CREATED_TMP_DISK_TABLES AS tmp_disk_tables,
        SUM_SORT_ROWS AS rows_sorted,
@@ -168,9 +168,9 @@ SELECT DIGEST_TEXT AS query,
        AVG_TIMER_WAIT AS avg_latency,
        SUM_LOCK_TIME AS lock_latency,
        SUM_ROWS_SENT AS rows_sent,
-       ROUND(SUM_ROWS_SENT / COUNT_STAR) AS rows_sent_avg,
+       ROUND(IFNULL(SUM_ROWS_SENT / NULLIF(COUNT_STAR, 0), 0)) AS rows_sent_avg,
        SUM_ROWS_EXAMINED AS rows_examined,
-       ROUND(SUM_ROWS_EXAMINED / COUNT_STAR)  AS rows_examined_avg,
+       ROUND(IFNULL(SUM_ROWS_EXAMINED / NULLIF(COUNT_STAR, 0), 0))  AS rows_examined_avg,
        SUM_CREATED_TMP_TABLES AS tmp_tables,
        SUM_CREATED_TMP_DISK_TABLES AS tmp_disk_tables,
        SUM_SORT_ROWS AS rows_sorted,