Update the user summary views to support the new 5.7 ONLY_FULL_GROUP_BY mode with functional dependencies

MarkLeith · MarkLeith · commit bcb0e93c4e25 · 2014-10-22T16:03:09.000+01:00
diff --git a/views/p_s/user_summary_57.sql b/views/p_s/user_summary_57.sql
@@ -58,13 +58,14 @@ SELECT IF(accounts.user IS NULL, 'background', accounts.user) AS user,
        SUM(accounts.current_connections) AS current_connections,
        SUM(accounts.total_connections) AS total_connections,
        COUNT(DISTINCT host) AS unique_hosts,
-       sys.format_bytes(mem.current_allocated) AS current_memory,
-       sys.format_bytes(mem.total_allocated) AS total_memory_allocated
+       sys.format_bytes(SUM(mem.current_allocated)) AS current_memory,
+       sys.format_bytes(SUM(mem.total_allocated)) AS total_memory_allocated
   FROM performance_schema.accounts
   LEFT JOIN sys.x$user_summary_by_statement_latency AS stmt ON IF(accounts.user IS NULL, 'background', accounts.user) = stmt.user
   LEFT JOIN sys.x$user_summary_by_file_io AS io ON IF(accounts.user IS NULL, 'background', accounts.user) = io.user
   LEFT JOIN sys.x$memory_by_user_by_current_bytes mem ON IF(accounts.user IS NULL, 'background', accounts.user) = mem.user
- GROUP BY IF(accounts.user IS NULL, 'background', accounts.user);
+ GROUP BY IF(accounts.user IS NULL, 'background', accounts.user)
+ ORDER BY SUM(stmt.total_latency) DESC;
 
 /*
  * View: x$user_summary
@@ -111,10 +112,12 @@ SELECT IF(accounts.user IS NULL, 'background', accounts.user) AS user,
        SUM(accounts.current_connections) AS current_connections,
        SUM(accounts.total_connections) AS total_connections,
        COUNT(DISTINCT host) AS unique_hosts,
-       mem.current_allocated AS current_memory,
-       mem.total_allocated AS total_memory_allocated
+       SUM(mem.current_allocated) AS current_memory,
+       SUM(mem.total_allocated) AS total_memory_allocated
   FROM performance_schema.accounts
   LEFT JOIN sys.x$user_summary_by_statement_latency AS stmt ON IF(accounts.user IS NULL, 'background', accounts.user) = stmt.user
   LEFT JOIN sys.x$user_summary_by_file_io AS io ON IF(accounts.user IS NULL, 'background', accounts.user) = io.user
   LEFT JOIN sys.x$memory_by_user_by_current_bytes mem ON IF(accounts.user IS NULL, 'background', accounts.user) = mem.user
- GROUP BY IF(accounts.user IS NULL, 'background', accounts.user);
+ GROUP BY IF(accounts.user IS NULL, 'background', accounts.user)
+ ORDER BY SUM(stmt.total_latency) DESC;
+
diff --git a/views/p_s/user_summary_by_file_io.sql b/views/p_s/user_summary_by_file_io.sql
@@ -39,12 +39,12 @@ VIEW user_summary_by_file_io (
   ios,
   io_latency
 ) AS
-SELECT user, 
-       SUM(total) AS ios,
-       sys.format_time(SUM(latency)) AS io_latency 
-  FROM x$user_summary_by_file_io_type
- GROUP BY user
- ORDER BY SUM(latency) DESC;
+SELECT IF(user IS NULL, 'background', user) AS user,
+       SUM(count_star) AS ios,
+       sys.format_time(SUM(sum_timer_wait)) AS io_latency 
+  FROM performance_schema.events_waits_summary_by_user_by_event_name
+ GROUP BY IF(user IS NULL, 'background', user)
+ ORDER BY SUM(sum_timer_wait) DESC;
 
 /*
  * View: x$user_summary_by_file_io
@@ -72,9 +72,9 @@ VIEW x$user_summary_by_file_io (
   ios,
   io_latency
 ) AS
-SELECT user, 
-       SUM(total) AS ios,
-       SUM(latency) AS io_latency 
-  FROM x$user_summary_by_file_io_type
- GROUP BY user
- ORDER BY SUM(latency) DESC;
+SELECT IF(user IS NULL, 'background', user) AS user,
+       SUM(count_star) AS ios,
+       SUM(sum_timer_wait) AS io_latency 
+  FROM performance_schema.events_waits_summary_by_user_by_event_name
+ GROUP BY IF(user IS NULL, 'background', user)
+ ORDER BY SUM(sum_timer_wait) DESC;
diff --git a/views/p_s/user_summary_by_stages.sql b/views/p_s/user_summary_by_stages.sql
@@ -21,26 +21,26 @@
  * When the user found is NULL, it is assumed to be a "background" thread.  
  * 
  * mysql> select * from user_summary_by_stages;
- * +------+--------------------------------+-------+-----------+-----------+
- * | user | event_name                     | total | wait_sum  | wait_avg  |
- * +------+--------------------------------+-------+-----------+-----------+
- * | root | stage/sql/Opening tables       |   889 | 1.97 ms   | 2.22 us   |
- * | root | stage/sql/Creating sort index  |     4 | 1.79 ms   | 446.30 us |
- * | root | stage/sql/init                 |    10 | 312.27 us | 31.23 us  |
- * | root | stage/sql/checking permissions |    10 | 300.62 us | 30.06 us  |
- * | root | stage/sql/freeing items        |     5 | 85.89 us  | 17.18 us  |
- * | root | stage/sql/statistics           |     5 | 79.15 us  | 15.83 us  |
- * | root | stage/sql/preparing            |     5 | 69.12 us  | 13.82 us  |
- * | root | stage/sql/optimizing           |     5 | 53.11 us  | 10.62 us  |
- * | root | stage/sql/Sending data         |     5 | 44.66 us  | 8.93 us   |
- * | root | stage/sql/closing tables       |     5 | 37.54 us  | 7.51 us   |
- * | root | stage/sql/System lock          |     5 | 34.28 us  | 6.86 us   |
- * | root | stage/sql/query end            |     5 | 24.37 us  | 4.87 us   |
- * | root | stage/sql/end                  |     5 | 8.60 us   | 1.72 us   |
- * | root | stage/sql/Sorting result       |     5 | 8.33 us   | 1.67 us   |
- * | root | stage/sql/executing            |     5 | 5.37 us   | 1.07 us   |
- * | root | stage/sql/cleaning up          |     5 | 4.60 us   | 919.00 ns |
- * +------+--------------------------------+-------+-----------+-----------+
+ * +------+--------------------------------+-------+---------------+-------------+
+ * | user | event_name                     | total | total_latency | avg_latency |
+ * +------+--------------------------------+-------+---------------+-------------+
+ * | root | stage/sql/Opening tables       |   889 | 1.97 ms       | 2.22 us     |
+ * | root | stage/sql/Creating sort index  |     4 | 1.79 ms       | 446.30 us   |
+ * | root | stage/sql/init                 |    10 | 312.27 us     | 31.23 us    |
+ * | root | stage/sql/checking permissions |    10 | 300.62 us     | 30.06 us    |
+ * | root | stage/sql/freeing items        |     5 | 85.89 us      | 17.18 us    |
+ * | root | stage/sql/statistics           |     5 | 79.15 us      | 15.83 us    |
+ * | root | stage/sql/preparing            |     5 | 69.12 us      | 13.82 us    |
+ * | root | stage/sql/optimizing           |     5 | 53.11 us      | 10.62 us    |
+ * | root | stage/sql/Sending data         |     5 | 44.66 us      | 8.93 us     |
+ * | root | stage/sql/closing tables       |     5 | 37.54 us      | 7.51 us     |
+ * | root | stage/sql/System lock          |     5 | 34.28 us      | 6.86 us     |
+ * | root | stage/sql/query end            |     5 | 24.37 us      | 4.87 us     |
+ * | root | stage/sql/end                  |     5 | 8.60 us       | 1.72 us     |
+ * | root | stage/sql/Sorting result       |     5 | 8.33 us       | 1.67 us     |
+ * | root | stage/sql/executing            |     5 | 5.37 us       | 1.07 us     |
+ * | root | stage/sql/cleaning up          |     5 | 4.60 us       | 919.00 ns   |
+ * +------+--------------------------------+-------+---------------+-------------+
  *
  */
 
@@ -52,14 +52,14 @@ VIEW user_summary_by_stages (
   user,
   event_name,
   total,
-  wait_sum,
-  wait_avg
+  total_latency,
+  avg_latency
 ) AS
 SELECT IF(user IS NULL, 'background', user) AS user,
        event_name,
        count_star AS total,
-       sys.format_time(sum_timer_wait) AS wait_sum, 
-       sys.format_time(avg_timer_wait) AS wait_avg 
+       sys.format_time(sum_timer_wait) AS total_latency, 
+       sys.format_time(avg_timer_wait) AS avg_latency 
   FROM performance_schema.events_stages_summary_by_user_by_event_name
  WHERE sum_timer_wait != 0 
  ORDER BY user, sum_timer_wait DESC;
@@ -72,26 +72,26 @@ SELECT IF(user IS NULL, 'background', user) AS user,
  * When the user found is NULL, it is assumed to be a "background" thread.  
  * 
  * mysql> select * from x$user_summary_by_stages;
- * +------+--------------------------------+-------+-------------+-----------+
- * | user | event_name                     | total | wait_sum    | wait_avg  |
- * +------+--------------------------------+-------+-------------+-----------+
- * | root | stage/sql/Opening tables       |  1114 | 71919037000 |  64559000 |
- * | root | stage/sql/Creating sort index  |     5 |  2245762000 | 449152000 |
- * | root | stage/sql/init                 |    13 |   428798000 |  32984000 |
- * | root | stage/sql/checking permissions |    13 |   363231000 |  27940000 |
- * | root | stage/sql/freeing items        |     7 |   137728000 |  19675000 |
- * | root | stage/sql/statistics           |     6 |    93955000 |  15659000 |
- * | root | stage/sql/preparing            |     6 |    82571000 |  13761000 |
- * | root | stage/sql/optimizing           |     6 |    63338000 |  10556000 |
- * | root | stage/sql/Sending data         |     6 |    53400000 |   8900000 |
- * | root | stage/sql/closing tables       |     7 |    46922000 |   6703000 |
- * | root | stage/sql/System lock          |     6 |    40175000 |   6695000 |
- * | root | stage/sql/query end            |     7 |    31723000 |   4531000 |
- * | root | stage/sql/Sorting result       |     6 |     9855000 |   1642000 |
- * | root | stage/sql/end                  |     6 |     9556000 |   1592000 |
- * | root | stage/sql/cleaning up          |     7 |     7312000 |   1044000 |
- * | root | stage/sql/executing            |     6 |     6487000 |   1081000 |
- * +------+--------------------------------+-------+-------------+-----------+ *
+ * +------+--------------------------------+-------+---------------+-------------+
+ * | user | event_name                     | total | total_latency | avg_latency |
+ * +------+--------------------------------+-------+---------------+-------------+
+ * | root | stage/sql/Opening tables       |  1114 |   71919037000 |    64559000 |
+ * | root | stage/sql/Creating sort index  |     5 |    2245762000 |   449152000 |
+ * | root | stage/sql/init                 |    13 |     428798000 |    32984000 |
+ * | root | stage/sql/checking permissions |    13 |     363231000 |    27940000 |
+ * | root | stage/sql/freeing items        |     7 |     137728000 |    19675000 |
+ * | root | stage/sql/statistics           |     6 |      93955000 |    15659000 |
+ * | root | stage/sql/preparing            |     6 |      82571000 |    13761000 |
+ * | root | stage/sql/optimizing           |     6 |      63338000 |    10556000 |
+ * | root | stage/sql/Sending data         |     6 |      53400000 |     8900000 |
+ * | root | stage/sql/closing tables       |     7 |      46922000 |     6703000 |
+ * | root | stage/sql/System lock          |     6 |      40175000 |     6695000 |
+ * | root | stage/sql/query end            |     7 |      31723000 |     4531000 |
+ * | root | stage/sql/Sorting result       |     6 |       9855000 |     1642000 |
+ * | root | stage/sql/end                  |     6 |       9556000 |     1592000 |
+ * | root | stage/sql/cleaning up          |     7 |       7312000 |     1044000 |
+ * | root | stage/sql/executing            |     6 |       6487000 |     1081000 |
+ * +------+--------------------------------+-------+---------------+------------+
  */
 
 CREATE OR REPLACE
@@ -102,14 +102,14 @@ VIEW x$user_summary_by_stages (
   user,
   event_name,
   total,
-  wait_sum,
-  wait_avg
+  total_latency,
+  avg_latency
 ) AS
 SELECT IF(user IS NULL, 'background', user) AS user,
        event_name,
        count_star AS total,
-       sum_timer_wait AS wait_sum, 
-       avg_timer_wait AS wait_avg 
+       sum_timer_wait AS total_latency, 
+       avg_timer_wait AS avg_latency 
   FROM performance_schema.events_stages_summary_by_user_by_event_name
  WHERE sum_timer_wait != 0 
  ORDER BY user, sum_timer_wait DESC;
diff --git a/views/p_s/user_summary_by_statement_latency.sql b/views/p_s/user_summary_by_statement_latency.sql
@@ -44,18 +44,18 @@ VIEW user_summary_by_statement_latency (
   rows_affected,
   full_scans
 ) AS
-SELECT user,
-       SUM(total) AS total,
-       sys.format_time(SUM(total_latency)) AS total_latency,
-       sys.format_time(SUM(max_latency)) AS max_latency,
-       sys.format_time(SUM(lock_latency)) AS lock_latency,
-       SUM(rows_sent) AS rows_sent,
-       SUM(rows_examined) AS rows_examined,
-       SUM(rows_affected) AS rows_affected,
-       SUM(full_scans) AS full_scans
-  FROM sys.x$user_summary_by_statement_type
- GROUP BY user
- ORDER BY SUM(total_latency) DESC;
+SELECT IF(user IS NULL, 'background', user) AS user,
+       SUM(count_star) AS total,
+       sys.format_time(SUM(sum_timer_wait)) AS total_latency,
+       sys.format_time(SUM(max_timer_wait)) AS max_latency,
+       sys.format_time(SUM(sum_lock_time)) AS lock_latency,
+       SUM(sum_rows_sent) AS rows_sent,
+       SUM(sum_rows_examined) AS rows_examined,
+       SUM(sum_rows_affected) AS rows_affected,
+       SUM(sum_no_index_used) + SUM(sum_no_good_index_used) AS full_scans
+  FROM performance_schema.events_statements_summary_by_user_by_event_name
+ GROUP BY IF(user IS NULL, 'background', user)
+ ORDER BY SUM(sum_timer_wait) DESC;
 
 /*
  * View: x$user_summary_by_statement_latency
@@ -88,15 +88,15 @@ VIEW x$user_summary_by_statement_latency (
   rows_affected,
   full_scans
 ) AS
-SELECT user,
-       SUM(total) AS total,
-       SUM(total_latency) AS total_latency,
-       SUM(max_latency) AS max_latency,
-       SUM(lock_latency) AS lock_latency,
-       SUM(rows_sent) AS rows_sent,
-       SUM(rows_examined) AS rows_examined,
-       SUM(rows_affected) AS rows_affected,
-       SUM(full_scans) AS full_scans
-  FROM sys.x$user_summary_by_statement_type
- GROUP BY user
- ORDER BY SUM(total_latency) DESC;
+SELECT IF(user IS NULL, 'background', user) AS user,
+       SUM(count_star) AS total,
+       SUM(sum_timer_wait) AS total_latency,
+       SUM(max_timer_wait) AS max_latency,
+       SUM(sum_lock_time) AS lock_latency,
+       SUM(sum_rows_sent) AS rows_sent,
+       SUM(sum_rows_examined) AS rows_examined,
+       SUM(sum_rows_affected) AS rows_affected,
+       SUM(sum_no_index_used) + SUM(sum_no_good_index_used) AS full_scans
+  FROM performance_schema.events_statements_summary_by_user_by_event_name
+ GROUP BY IF(user IS NULL, 'background', user)
+ ORDER BY SUM(sum_timer_wait) DESC;
