WL#13439 Sys Schema, Replace Stored Functions With Native Functions - restore SYS functions

For compatibility, keep rather than remove the the original SYS schema functions.

RB: 23175

Author: Christopher Powers

mysql-test/r/mysqldump.result

@@ -5162,7 +5162,7 @@ DROP DATABASE dump_generated;
 #
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.routines WHERE routine_schema = 'sys';
 COUNT(*)
-45
+48
 DROP DATABASE sys;
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.routines WHERE routine_schema = 'sys';
 COUNT(*)
@@ -5172,7 +5172,7 @@ COUNT(*)
 0
 SELECT COUNT(*) FROM INFORMATION_SCHEMA.routines WHERE routine_schema = 'sys';
 COUNT(*)
-45
+48
 #
 # WL#8697: Invisible Indexes
 # Test of mysqldump.

mysql-test/suite/perfschema/r/native_func_format_bytes.result

@@ -122,16 +122,41 @@ SELECT format_bytes((pow(2, 63) - 1) * 2 + 1);
 format_bytes((pow(2, 63) - 1) * 2 + 1)
 16.00 EiB
 
-## Bad input
+## Text input
 SELECT format_bytes("foo");
-ERROR 22003: Input value is out of range in 'format_bytes'
+format_bytes("foo")
+   0 bytes
+Warnings:
+Warning	1292	Truncated incorrect DOUBLE value: 'foo'
+
+SELECT format_bytes("");
+format_bytes("")
+   0 bytes
+
+SELECT format_bytes("118059162071741143500099");
+format_bytes("118059162071741143500099")
+1.02e+05 EiB
 
+SELECT format_bytes("-118059162071741143500099");
+format_bytes("-118059162071741143500099")
+-1.02e+05 EiB
+
+## Recognizes up to first non-numeric
+SELECT format_bytes("40000 * 2000");
+format_bytes("40000 * 2000")
+39.06 KiB
+Warnings:
+Warning	1292	Truncated incorrect DOUBLE value: '40000 * 2000'
+
+SELECT format_bytes("40000 foo 2000");
+format_bytes("40000 foo 2000")
+39.06 KiB
+Warnings:
+Warning	1292	Truncated incorrect DOUBLE value: '40000 foo 2000'
 ## Aggregate functions
 USE test;
 
-CREATE TABLE memory_counts (id VARCHAR(10), bytes BIGINT(20) UNSIGNED DEFAULT NULL) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
+CREATE TABLE memory_counts (id VARCHAR(10), bytes BIGINT UNSIGNED DEFAULT NULL) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
 
 INSERT INTO memory_counts VALUES ('Bytes', 512);
 INSERT INTO memory_counts VALUES ('10 KiB', 10 * 1024);

mysql-test/suite/perfschema/r/native_func_format_time.result

@@ -125,16 +125,41 @@ format_pico_time(8640000000000000000099 * 2)
 2.00e+05 d
 
 
-## Bad input
+## Text input
 SELECT format_pico_time("foo");
-ERROR 22003: Input value is out of range in 'format_pico_time'
+format_pico_time("foo")
+  0 ps
+Warnings:
+Warning	1292	Truncated incorrect DOUBLE value: 'foo'
+
+SELECT format_pico_time("");
+format_pico_time("")
+  0 ps
+
+SELECT format_pico_time("118059162071741143500099");
+format_pico_time("118059162071741143500099")
+1.37e+06 d
 
+SELECT format_pico_time("-118059162071741143500099");
+format_pico_time("-118059162071741143500099")
+-1.37e+06 d
+
+## Recognizes up to first non-numeric
+SELECT format_pico_time("40000 * 2000");
+format_pico_time("40000 * 2000")
+40.00 ns
+Warnings:
+Warning	1292	Truncated incorrect DOUBLE value: '40000 * 2000'
+
+SELECT format_pico_time("40000 foo 2000");
+format_pico_time("40000 foo 2000")
+40.00 ns
+Warnings:
+Warning	1292	Truncated incorrect DOUBLE value: '40000 foo 2000'
 ## Aggregate functions
 USE test;
 
-CREATE TABLE timer_waits (id VARCHAR(10), wait BIGINT(20) UNSIGNED DEFAULT NULL) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
-Warnings:
-Warning	1681	Integer display width is deprecated and will be removed in a future release.
+CREATE TABLE timer_waits (id VARCHAR(10), wait BIGINT UNSIGNED DEFAULT NULL) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
 
 INSERT INTO timer_waits VALUES ('1 sec',          1000000000000);
 INSERT INTO timer_waits VALUES ('1 min',         60000000000000);

mysql-test/suite/perfschema/t/native_func_format_bytes.test

@@ -71,15 +71,24 @@ SELECT format_bytes(pow(2,400));
 SELECT format_bytes((pow(2, 63) - 1) * 2 + 1);
 
 --echo
---echo ## Bad input
---error ER_DATA_OUT_OF_RANGE
+--echo ## Text input
 SELECT format_bytes("foo");
 --echo
+SELECT format_bytes("");
+--echo
+SELECT format_bytes("118059162071741143500099");
+--echo
+SELECT format_bytes("-118059162071741143500099");
+--echo
+--echo ## Recognizes up to first non-numeric
+SELECT format_bytes("40000 * 2000");
+--echo
+SELECT format_bytes("40000 foo 2000");
 
 --echo ## Aggregate functions
 USE test;
 --echo
-CREATE TABLE memory_counts (id VARCHAR(10), bytes BIGINT(20) UNSIGNED DEFAULT NULL) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
+CREATE TABLE memory_counts (id VARCHAR(10), bytes BIGINT UNSIGNED DEFAULT NULL) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
 --echo
 # Max BIGINT unsigned is  18 446 744 073 709 551 615
 INSERT INTO memory_counts VALUES ('Bytes', 512);

mysql-test/suite/perfschema/t/native_func_format_time.test

@@ -69,15 +69,24 @@ SELECT format_pico_time(8640000000000000000099 * 2);
 --echo
 
 --echo
---echo ## Bad input
---error ER_DATA_OUT_OF_RANGE
+--echo ## Text input
 SELECT format_pico_time("foo");
 --echo
+SELECT format_pico_time("");
+--echo
+SELECT format_pico_time("118059162071741143500099");
+--echo
+SELECT format_pico_time("-118059162071741143500099");
+--echo
+--echo ## Recognizes up to first non-numeric
+SELECT format_pico_time("40000 * 2000");
+--echo
+SELECT format_pico_time("40000 foo 2000");
 
 --echo ## Aggregate functions
 USE test;
 --echo
-CREATE TABLE timer_waits (id VARCHAR(10), wait BIGINT(20) UNSIGNED DEFAULT NULL) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
+CREATE TABLE timer_waits (id VARCHAR(10), wait BIGINT UNSIGNED DEFAULT NULL) ENGINE = InnoDB DEFAULT CHARSET = utf8mb4;
 --echo
 # Max BIGINT unsigned is  18 446 744 073 709 551 615
 INSERT INTO timer_waits VALUES ('1 sec',          1000000000000);

mysql-test/suite/sysschema/r/all_sys_objects_exist.result

@@ -106,8 +106,10 @@ SELECT ROUTINE_NAME, ROUTINE_TYPE FROM INFORMATION_SCHEMA.ROUTINES WHERE ROUTINE
 ROUTINE_NAME	ROUTINE_TYPE
 extract_schema_from_file_name	FUNCTION
 extract_table_from_file_name	FUNCTION
+format_bytes_orig	FUNCTION
 format_path	FUNCTION
 format_statement	FUNCTION
+format_time	FUNCTION
 list_add	FUNCTION
 list_drop	FUNCTION
 ps_is_account_enabled	FUNCTION
@@ -116,6 +118,7 @@ ps_is_instrument_default_enabled	FUNCTION
 ps_is_instrument_default_timed	FUNCTION
 ps_is_thread_instrumented	FUNCTION
 ps_thread_account	FUNCTION
+ps_thread_id	FUNCTION
 ps_thread_stack	FUNCTION
 ps_thread_trx_info	FUNCTION
 quote_identifier	FUNCTION

scripts/sys_schema/CMakeLists.txt

@@ -37,15 +37,18 @@ SET(SYS_SCHEMA_SOURCES
 
   functions/extract_schema_from_file_name.sql
   functions/extract_table_from_file_name.sql
+  functions/format_bytes.sql
   functions/format_path.sql
   functions/format_statement.sql
+  functions/format_time.sql
   functions/list_add.sql
   functions/list_drop.sql
   functions/ps_is_account_enabled.sql
   functions/ps_is_consumer_enabled.sql
   functions/ps_is_instrument_default_enabled.sql
   functions/ps_is_instrument_default_timed.sql
   functions/ps_is_thread_instrumented.sql
+  functions/ps_thread_id.sql
   functions/ps_thread_account.sql
   functions/ps_thread_stack.sql
   functions/ps_thread_trx_info.sql

scripts/sys_schema/functions/format_bytes.sql

@@ -0,0 +1,81 @@
+-- Copyright (c) 2014, 2019, 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
+
+DROP FUNCTION IF EXISTS sys.format_bytes;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION sys.format_bytes (
+        -- We feed in and return TEXT here, as aggregates of
+        -- bytes can return numbers larger than BIGINT UNSIGNED
+        bytes TEXT
+    )
+    RETURNS TEXT
+    COMMENT '
+Description
+-----------
+
+Takes a raw bytes value, and converts it to a human readable format.
+
+Parameters
+-----------
+
+bytes (TEXT):
+  A raw bytes value.
+
+Returns
+-----------
+
+TEXT
+
+Example
+-----------
+
+mysql> SELECT sys.format_bytes(2348723492723746) AS size;
++----------+
+| size     |
++----------+
+| 2.09 PiB |
++----------+
+1 row in set (0.00 sec)
+
+mysql> SELECT sys.format_bytes(2348723492723) AS size;
++----------+
+| size     |
++----------+
+| 2.14 TiB |
++----------+
+1 row in set (0.00 sec)
+
+mysql> SELECT sys.format_bytes(23487234) AS size;
++-----------+
+| size      |
++-----------+
+| 22.40 MiB |
++-----------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    NO SQL
+BEGIN
+  IF (bytes IS NULL) THEN
+    RETURN NULL;
+  ELSE
+    RETURN format_bytes(bytes);
+  END IF;
+END$$
+
+DELIMITER ;

scripts/sys_schema/functions/format_time.sql

@@ -0,0 +1,91 @@
+-- Copyright (c) 2014, 2019, 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
+
+DROP FUNCTION IF EXISTS sys.format_time;
+
+DELIMITER $$
+
+CREATE DEFINER='mysql.sys'@'localhost' FUNCTION sys.format_time (
+-- We feed in and return TEXT here, as aggregates of
+-- picoseconds can return numbers larger than BIGINT UNSIGNED
+        picoseconds TEXT
+    )
+    RETURNS TEXT CHARSET UTF8MB4
+    COMMENT '
+Description
+-----------
+
+Takes a raw picoseconds value, and converts it to a human readable form.
+
+Picoseconds are the precision that all latency values are printed in
+within Performance Schema, however are not user friendly when wanting
+to scan output from the command line.
+
+Parameters
+-----------
+
+picoseconds (TEXT):
+  The raw picoseconds value to convert.
+
+Returns
+-----------
+
+TEXT CHARSET UTF8MB4
+
+Example
+-----------
+
+mysql> select format_time(342342342342345);
++------------------------------+
+| format_time(342342342342345) |
++------------------------------+
+| 00:05:42                     |
++------------------------------+
+1 row in set (0.00 sec)
+
+mysql> select format_time(342342342);
++------------------------+
+| format_time(342342342) |
++------------------------+
+| 342.34 us              |
++------------------------+
+1 row in set (0.00 sec)
+
+mysql> select format_time(34234);
++--------------------+
+| format_time(34234) |
++--------------------+
+| 34.23 ns           |
++--------------------+
+1 row in set (0.00 sec)
+'
+    SQL SECURITY INVOKER
+    DETERMINISTIC
+    NO SQL
+BEGIN
+  IF picoseconds IS NULL THEN RETURN NULL;
+  ELSEIF picoseconds >= 604800000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 604800000000000000, 2), ' w');
+  ELSEIF picoseconds >= 86400000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 86400000000000000, 2), ' d');
+  ELSEIF picoseconds >= 3600000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 3600000000000000, 2), ' h');
+  ELSEIF picoseconds >= 60000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 60000000000000, 2), ' m');
+  ELSEIF picoseconds >= 1000000000000 THEN RETURN CONCAT(ROUND(picoseconds / 1000000000000, 2), ' s');
+  ELSEIF picoseconds >= 1000000000 THEN RETURN CONCAT(ROUND(picoseconds / 1000000000, 2), ' ms');
+  ELSEIF picoseconds >= 1000000 THEN RETURN CONCAT(ROUND(picoseconds / 1000000, 2), ' us');
+  ELSEIF picoseconds >= 1000 THEN RETURN CONCAT(ROUND(picoseconds / 1000, 2), ' ns');
+  ELSE RETURN CONCAT(picoseconds, ' ps');
+  END IF;
+END$$
+
+DELIMITER ;