Skip to content

Commit

Permalink
MDEV-19629 post-merge fixes
Browse files Browse the repository at this point in the history 
* it isn't "pfs" function, don't call it Item_func_pfs,
  don't use item_pfsfunc.*
* tests don't depend on performance schema, put in the main suite
* inherit from Item_str_ascii_func
* use connection collation, not utf8mb3_general_ci
* set result length in fix_length_and_dec
* do not set maybe_null
* use my_snprintf() where possible
* don't set m_value.ptr on every invocation
* update sys schema to use the format_pico_time()
* len must be size_t (compilation error on Windows)
* the correct function name for double->double is fabs()
* drop volatile hack
  • Loading branch information
@vuvova
vuvova committed Mar 27, 2023
1 parent d9808f7 commit c2b6916
Show file tree
Hide file tree
Showing 86 changed files with 347 additions and 430 deletions.
2 changes: 1 addition & 1 deletion libmysqld/CMakeLists.txt
View file
Expand Up @@ -64,7 +64,7 @@ SET(SQL_EMBEDDED_SOURCES emb_qcache.cc libmysqld.c lib_sql.cc
../sql/item.cc ../sql/item_create.cc ../sql/item_func.cc
../sql/item_geofunc.cc ../sql/item_row.cc ../sql/item_strfunc.cc
../sql/item_subselect.cc ../sql/item_sum.cc ../sql/item_timefunc.cc
../sql/item_xmlfunc.cc ../sql/item_jsonfunc.cc ../sql/item_pfsfunc.cc
../sql/item_xmlfunc.cc ../sql/item_jsonfunc.cc
../sql/key.cc ../sql/lock.cc ../sql/log.cc
../sql/log_event.cc ../sql/log_event_server.cc
../sql/mf_iocache.cc ../sql/my_decimal.cc
Expand Down
0 ...t/suite/perfschema/r/pfs_functions.result → mysql-test/main/func_format.result
View file
File renamed without changes.
0 ...est/suite/perfschema/t/pfs_functions.test → mysql-test/main/func_format.test
View file
File renamed without changes.
6 changes: 3 additions & 3 deletions mysql-test/suite/sysschema/r/v_host_summary.result
View file
Expand Up @@ -2,11 +2,11 @@ DESC sys.host_summary;
Field Type Null Key Default Extra
host varchar(255) YES NULL
statements decimal(64,0) YES NULL
statement_latency text YES NULL
statement_avg_latency text YES NULL
statement_latency varchar(12) YES NULL
statement_avg_latency varchar(12) YES NULL
table_scans decimal(65,0) YES NULL
file_ios decimal(64,0) YES NULL
file_io_latency text YES NULL
file_io_latency varchar(12) YES NULL
current_connections decimal(41,0) YES NULL
total_connections decimal(41,0) YES NULL
unique_users bigint(21) NO 0
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/sysschema/r/v_host_summary_by_file_io.result
View file
Expand Up @@ -2,7 +2,7 @@ DESC sys.host_summary_by_file_io;
Field Type Null Key Default Extra
host varchar(255) YES NULL
ios decimal(42,0) YES NULL
io_latency text YES NULL
io_latency varchar(12) YES NULL
SELECT * FROM sys.host_summary_by_file_io;
DESC sys.x$host_summary_by_file_io;
Field Type Null Key Default Extra
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/suite/sysschema/r/v_host_summary_by_file_io_type.result
View file
Expand Up @@ -3,8 +3,8 @@ Field Type Null Key Default Extra
host varchar(255) YES NULL
event_name varchar(128) NO NULL
total bigint(20) unsigned NO NULL
total_latency text YES NULL
max_latency text YES NULL
total_latency varchar(12) YES NULL
max_latency varchar(12) YES NULL
SELECT * FROM sys.host_summary_by_file_io_type;
DESC sys.x$host_summary_by_file_io_type;
Field Type Null Key Default Extra
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/suite/sysschema/r/v_host_summary_by_stages.result
View file
Expand Up @@ -3,8 +3,8 @@ Field Type Null Key Default Extra
host varchar(255) YES NULL
event_name varchar(128) NO NULL
total bigint(20) unsigned NO NULL
total_latency text YES NULL
avg_latency text YES NULL
total_latency varchar(12) YES NULL
avg_latency varchar(12) YES NULL
SELECT * FROM sys.host_summary_by_stages;
DESC sys.x$host_summary_by_stages;
Field Type Null Key Default Extra
Expand Down
6 changes: 3 additions & 3 deletions mysql-test/suite/sysschema/r/v_host_summary_by_statement_latency.result
View file
Expand Up @@ -2,9 +2,9 @@ DESC sys.host_summary_by_statement_latency;
Field Type Null Key Default Extra
host varchar(255) YES NULL
total decimal(42,0) YES NULL
total_latency text YES NULL
max_latency text YES NULL
lock_latency text YES NULL
total_latency varchar(12) YES NULL
max_latency varchar(12) YES NULL
lock_latency varchar(12) YES NULL
rows_sent decimal(42,0) YES NULL
rows_examined decimal(42,0) YES NULL
rows_affected decimal(42,0) YES NULL
Expand Down
6 changes: 3 additions & 3 deletions mysql-test/suite/sysschema/r/v_host_summary_by_statement_type.result
View file
Expand Up @@ -3,9 +3,9 @@ Field Type Null Key Default Extra
host varchar(255) YES NULL
statement varchar(128) YES NULL
total bigint(20) unsigned NO NULL
total_latency text YES NULL
max_latency text YES NULL
lock_latency text YES NULL
total_latency varchar(12) YES NULL
max_latency varchar(12) YES NULL
lock_latency varchar(12) YES NULL
rows_sent bigint(20) unsigned NO NULL
rows_examined bigint(20) unsigned NO NULL
rows_affected bigint(20) unsigned NO NULL
Expand Down
8 changes: 4 additions & 4 deletions mysql-test/suite/sysschema/r/v_io_by_thread_by_latency.result
View file
Expand Up @@ -2,10 +2,10 @@ DESC sys.io_by_thread_by_latency;
Field Type Null Key Default Extra
user varchar(384) YES NULL
total decimal(42,0) YES NULL
total_latency text YES NULL
min_latency text YES NULL
avg_latency text YES NULL
max_latency text YES NULL
total_latency varchar(12) YES NULL
min_latency varchar(12) YES NULL
avg_latency varchar(12) YES NULL
max_latency varchar(12) YES NULL
thread_id bigint(20) unsigned NO NULL
processlist_id bigint(20) unsigned YES NULL
SELECT * FROM sys.io_by_thread_by_latency;
Expand Down
8 changes: 4 additions & 4 deletions mysql-test/suite/sysschema/r/v_io_global_by_file_by_latency.result
View file
Expand Up @@ -2,13 +2,13 @@ DESC sys.io_global_by_file_by_latency;
Field Type Null Key Default Extra
file varchar(512) YES NULL
total bigint(20) unsigned NO NULL
total_latency text YES NULL
total_latency varchar(12) YES NULL
count_read bigint(20) unsigned NO NULL
read_latency text YES NULL
read_latency varchar(12) YES NULL
count_write bigint(20) unsigned NO NULL
write_latency text YES NULL
write_latency varchar(12) YES NULL
count_misc bigint(20) unsigned NO NULL
misc_latency text YES NULL
misc_latency varchar(12) YES NULL
SELECT * FROM sys.io_global_by_file_by_latency;
DESC sys.x$io_global_by_file_by_latency;
Field Type Null Key Default Extra
Expand Down
8 changes: 4 additions & 4 deletions mysql-test/suite/sysschema/r/v_io_global_by_wait_by_bytes.result
View file
Expand Up @@ -2,10 +2,10 @@ DESC sys.io_global_by_wait_by_bytes;
Field Type Null Key Default Extra
event_name varchar(128) YES NULL
total bigint(20) unsigned NO NULL
total_latency text YES NULL
min_latency text YES NULL
avg_latency text YES NULL
max_latency text YES NULL
total_latency varchar(12) YES NULL
min_latency varchar(12) YES NULL
avg_latency varchar(12) YES NULL
max_latency varchar(12) YES NULL
count_read bigint(20) unsigned NO NULL
total_read text YES NULL
avg_read text YES NULL
Expand Down
12 changes: 6 additions & 6 deletions mysql-test/suite/sysschema/r/v_io_global_by_wait_by_latency.result
View file
Expand Up @@ -2,12 +2,12 @@ DESC sys.io_global_by_wait_by_latency;
Field Type Null Key Default Extra
event_name varchar(128) YES NULL
total bigint(20) unsigned NO NULL
total_latency text YES NULL
avg_latency text YES NULL
max_latency text YES NULL
read_latency text YES NULL
write_latency text YES NULL
misc_latency text YES NULL
total_latency varchar(12) YES NULL
avg_latency varchar(12) YES NULL
max_latency varchar(12) YES NULL
read_latency varchar(12) YES NULL
write_latency varchar(12) YES NULL
misc_latency varchar(12) YES NULL
count_read bigint(20) unsigned NO NULL
total_read text YES NULL
avg_read text YES NULL
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/sysschema/r/v_latest_file_io.result
View file
Expand Up @@ -2,7 +2,7 @@ DESC sys.latest_file_io;
Field Type Null Key Default Extra
thread varchar(214) YES NULL
file varchar(512) YES NULL
latency text YES NULL
latency varchar(12) YES NULL
operation varchar(32) NO NULL
requested text YES NULL
SELECT * FROM sys.latest_file_io;
Expand Down
10 changes: 5 additions & 5 deletions mysql-test/suite/sysschema/r/v_processlist.result
View file
Expand Up @@ -8,22 +8,22 @@ command varchar(16) YES NULL
state varchar(64) YES NULL
time bigint(20) YES NULL
current_statement longtext YES NULL
statement_latency mediumtext YES NULL
statement_latency varchar(12) YES NULL
progress decimal(26,2) YES NULL
lock_latency text YES NULL
lock_latency varchar(12) YES NULL
rows_examined bigint(20) unsigned YES NULL
rows_sent bigint(20) unsigned YES NULL
rows_affected bigint(20) unsigned YES NULL
tmp_tables bigint(20) unsigned YES NULL
tmp_disk_tables bigint(20) unsigned YES NULL
full_scan varchar(3) YES NULL
last_statement longtext YES NULL
last_statement_latency mediumtext YES NULL
last_statement_latency varchar(12) YES NULL
current_memory text YES NULL
last_wait varchar(128) YES NULL
last_wait_latency mediumtext YES NULL
last_wait_latency varchar(13) YES NULL
source varchar(64) YES NULL
trx_latency text YES NULL
trx_latency varchar(12) YES NULL
trx_state enum('ACTIVE','COMMITTED','ROLLED BACK') YES NULL
trx_autocommit enum('YES','NO') YES NULL
pid varchar(1024) YES NULL
Expand Down
8 changes: 4 additions & 4 deletions mysql-test/suite/sysschema/r/v_schema_index_statistics.result
View file
Expand Up @@ -4,13 +4,13 @@ table_schema varchar(64) YES NULL
table_name varchar(64) YES NULL
index_name varchar(64) YES NULL
rows_selected bigint(20) unsigned NO NULL
select_latency text YES NULL
select_latency varchar(12) YES NULL
rows_inserted bigint(20) unsigned NO NULL
insert_latency text YES NULL
insert_latency varchar(12) YES NULL
rows_updated bigint(20) unsigned NO NULL
update_latency text YES NULL
update_latency varchar(12) YES NULL
rows_deleted bigint(20) unsigned NO NULL
delete_latency text YES NULL
delete_latency varchar(12) YES NULL
SELECT * FROM sys.schema_index_statistics;
DESC sys.x$schema_index_statistics;
Field Type Null Key Default Extra
Expand Down
16 changes: 8 additions & 8 deletions mysql-test/suite/sysschema/r/v_schema_table_statistics.result
View file
Expand Up @@ -2,23 +2,23 @@ DESC sys.schema_table_statistics;
Field Type Null Key Default Extra
table_schema varchar(64) YES NULL
table_name varchar(64) YES NULL
total_latency text YES NULL
total_latency varchar(12) YES NULL
rows_fetched bigint(20) unsigned NO NULL
fetch_latency text YES NULL
fetch_latency varchar(12) YES NULL
rows_inserted bigint(20) unsigned NO NULL
insert_latency text YES NULL
insert_latency varchar(12) YES NULL
rows_updated bigint(20) unsigned NO NULL
update_latency text YES NULL
update_latency varchar(12) YES NULL
rows_deleted bigint(20) unsigned NO NULL
delete_latency text YES NULL
delete_latency varchar(12) YES NULL
io_read_requests decimal(42,0) YES NULL
io_read text YES NULL
io_read_latency text YES NULL
io_read_latency varchar(12) YES NULL
io_write_requests decimal(42,0) YES NULL
io_write text YES NULL
io_write_latency text YES NULL
io_write_latency varchar(12) YES NULL
io_misc_requests decimal(42,0) YES NULL
io_misc_latency text YES NULL
io_misc_latency varchar(12) YES NULL
SELECT * FROM sys.schema_table_statistics;
DESC sys.x$schema_table_statistics;
Field Type Null Key Default Extra
Expand Down
14 changes: 7 additions & 7 deletions mysql-test/suite/sysschema/r/v_schema_table_statistics_with_buffer.result
View file
Expand Up @@ -3,21 +3,21 @@ Field Type Null Key Default Extra
table_schema varchar(64) YES NULL
table_name varchar(64) YES NULL
rows_fetched bigint(20) unsigned NO NULL
fetch_latency text YES NULL
fetch_latency varchar(12) YES NULL
rows_inserted bigint(20) unsigned NO NULL
insert_latency text YES NULL
insert_latency varchar(12) YES NULL
rows_updated bigint(20) unsigned NO NULL
update_latency text YES NULL
update_latency varchar(12) YES NULL
rows_deleted bigint(20) unsigned NO NULL
delete_latency text YES NULL
delete_latency varchar(12) YES NULL
io_read_requests decimal(42,0) YES NULL
io_read text YES NULL
io_read_latency text YES NULL
io_read_latency varchar(12) YES NULL
io_write_requests decimal(42,0) YES NULL
io_write text YES NULL
io_write_latency text YES NULL
io_write_latency varchar(12) YES NULL
io_misc_requests decimal(42,0) YES NULL
io_misc_latency text YES NULL
io_misc_latency varchar(12) YES NULL
innodb_buffer_allocated text YES NULL
innodb_buffer_data text YES NULL
innodb_buffer_free text YES NULL
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/sysschema/r/v_schema_tables_with_full_table_scans.result
View file
Expand Up @@ -3,7 +3,7 @@ Field Type Null Key Default Extra
object_schema varchar(64) YES NULL
object_name varchar(64) YES NULL
rows_full_scanned bigint(20) unsigned NO NULL
latency text YES NULL
latency varchar(12) YES NULL
SELECT * FROM sys.schema_tables_with_full_table_scans;
DESC sys.x$schema_tables_with_full_table_scans;
Field Type Null Key Default Extra
Expand Down
10 changes: 5 additions & 5 deletions mysql-test/suite/sysschema/r/v_session.result
View file
Expand Up @@ -8,22 +8,22 @@ command varchar(16) YES NULL
state varchar(64) YES NULL
time bigint(20) YES NULL
current_statement longtext YES NULL
statement_latency mediumtext YES NULL
statement_latency varchar(12) YES NULL
progress decimal(26,2) YES NULL
lock_latency text YES NULL
lock_latency varchar(12) YES NULL
rows_examined bigint(20) unsigned YES NULL
rows_sent bigint(20) unsigned YES NULL
rows_affected bigint(20) unsigned YES NULL
tmp_tables bigint(20) unsigned YES NULL
tmp_disk_tables bigint(20) unsigned YES NULL
full_scan varchar(3) YES NULL
last_statement longtext YES NULL
last_statement_latency mediumtext YES NULL
last_statement_latency varchar(12) YES NULL
current_memory text YES NULL
last_wait varchar(128) YES NULL
last_wait_latency mediumtext YES NULL
last_wait_latency varchar(13) YES NULL
source varchar(64) YES NULL
trx_latency text YES NULL
trx_latency varchar(12) YES NULL
trx_state enum('ACTIVE','COMMITTED','ROLLED BACK') YES NULL
trx_autocommit enum('YES','NO') YES NULL
pid varchar(1024) YES NULL
Expand Down
8 changes: 4 additions & 4 deletions mysql-test/suite/sysschema/r/v_statement_analysis.result
View file
Expand Up @@ -6,10 +6,10 @@ full_scan varchar(1) NO
exec_count bigint(20) unsigned NO NULL
err_count bigint(20) unsigned NO NULL
warn_count bigint(20) unsigned NO NULL
total_latency text YES NULL
max_latency text YES NULL
avg_latency text YES NULL
lock_latency text YES NULL
total_latency varchar(12) YES NULL
max_latency varchar(12) YES NULL
avg_latency varchar(12) YES NULL
lock_latency varchar(12) YES NULL
rows_sent bigint(20) unsigned NO NULL
rows_sent_avg decimal(21,0) NO 0
rows_examined bigint(20) unsigned NO NULL
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/sysschema/r/v_statements_with_full_table_scans.result
View file
Expand Up @@ -3,7 +3,7 @@ Field Type Null Key Default Extra
query longtext YES NULL
db varchar(64) YES NULL
exec_count bigint(20) unsigned NO NULL
total_latency text YES NULL
total_latency varchar(12) YES NULL
no_index_used_count bigint(20) unsigned NO NULL
no_good_index_used_count bigint(20) unsigned NO NULL
no_index_used_pct decimal(24,0) NO 0
Expand Down
6 changes: 3 additions & 3 deletions mysql-test/suite/sysschema/r/v_statements_with_runtimes_in_95th_percentile.result
View file
Expand Up @@ -6,9 +6,9 @@ full_scan varchar(1) NO
exec_count bigint(20) unsigned NO NULL
err_count bigint(20) unsigned NO NULL
warn_count bigint(20) unsigned NO NULL
total_latency text YES NULL
max_latency text YES NULL
avg_latency text YES NULL
total_latency varchar(12) YES NULL
max_latency varchar(12) YES NULL
avg_latency varchar(12) YES NULL
rows_sent bigint(20) unsigned NO NULL
rows_sent_avg decimal(21,0) NO 0
rows_examined bigint(20) unsigned NO NULL
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/sysschema/r/v_statements_with_sorting.result
View file
Expand Up @@ -3,7 +3,7 @@ Field Type Null Key Default Extra
query longtext YES NULL
db varchar(64) YES NULL
exec_count bigint(20) unsigned NO NULL
total_latency text YES NULL
total_latency varchar(12) YES NULL
sort_merge_passes bigint(20) unsigned NO NULL
avg_sort_merges decimal(21,0) NO 0
sorts_using_scans bigint(20) unsigned NO NULL
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/sysschema/r/v_statements_with_temp_tables.result
View file
Expand Up @@ -3,7 +3,7 @@ Field Type Null Key Default Extra
query longtext YES NULL
db varchar(64) YES NULL
exec_count bigint(20) unsigned NO NULL
total_latency text YES NULL
total_latency varchar(12) YES NULL
memory_tmp_tables bigint(20) unsigned NO NULL
disk_tmp_tables bigint(20) unsigned NO NULL
avg_tmp_tables_per_query decimal(21,0) NO 0
Expand Down
6 changes: 3 additions & 3 deletions mysql-test/suite/sysschema/r/v_user_summary.result
View file
Expand Up @@ -2,11 +2,11 @@ DESC sys.user_summary;
Field Type Null Key Default Extra
user varchar(128) YES NULL
statements decimal(64,0) YES NULL
statement_latency text YES NULL
statement_avg_latency text YES NULL
statement_latency varchar(12) YES NULL
statement_avg_latency varchar(12) YES NULL
table_scans decimal(65,0) YES NULL
file_ios decimal(64,0) YES NULL
file_io_latency text YES NULL
file_io_latency varchar(12) YES NULL
current_connections decimal(41,0) YES NULL
total_connections decimal(41,0) YES NULL
unique_hosts bigint(21) NO 0
Expand Down
2 changes: 1 addition & 1 deletion mysql-test/suite/sysschema/r/v_user_summary_by_file_io.result
View file
Expand Up @@ -2,7 +2,7 @@ DESC sys.user_summary_by_file_io;
Field Type Null Key Default Extra
user varchar(128) YES NULL
ios decimal(42,0) YES NULL
io_latency text YES NULL
io_latency varchar(12) YES NULL
SELECT * FROM sys.user_summary_by_file_io;
DESC sys.x$user_summary_by_file_io;
Field Type Null Key Default Extra
Expand Down
4 changes: 2 additions & 2 deletions mysql-test/suite/sysschema/r/v_user_summary_by_file_io_type.result
View file
Expand Up @@ -3,8 +3,8 @@ Field Type Null Key Default Extra
user varchar(128) YES NULL
event_name varchar(128) NO NULL
total bigint(20) unsigned NO NULL
latency text YES NULL
max_latency text YES NULL
latency varchar(12) YES NULL
max_latency varchar(12) YES NULL
SELECT * FROM sys.user_summary_by_file_io_type;
DESC sys.x$user_summary_by_file_io_type;
Field Type Null Key Default Extra
Expand Down

0 comments on commit c2b6916

Please sign in to comment.