Skip to content

Commit

Permalink
MDEV-22858 Remove unused innodb_mem_validate_usec, innodb_master_purg…
Browse files Browse the repository at this point in the history 
…e_usec

MONITOR_SRV_MEM_VALIDATE_MICROSECOND, MEM_PERIODIC_CHECK,
SRV_MASTER_MEM_VALIDATE_INTERVAL: Remove. These were unused
ever since UNIV_MEM_DEBUG was removed.

MONITOR_SRV_PURGE_MICROSECOND: Remove. This was always unused.
  • Loading branch information
@dr-m
dr-m committed Jun 10, 2020
1 parent 6e2d967 commit 7e79853
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 21 deletions.
2 changes: 0 additions & 2 deletions mysql-test/suite/innodb/r/innodb_skip_innodb_is_tables.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,8 +249,6 @@ innodb_master_active_loops server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NU
innodb_master_idle_loops server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of times master thread performs its tasks when server is idle
innodb_background_drop_table_usec server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Time (in microseconds) spent to process drop table list
innodb_log_flush_usec server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Time (in microseconds) spent to flush log records
innodb_mem_validate_usec server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Time (in microseconds) spent to do memory validation
innodb_master_purge_usec server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Time (in microseconds) spent by master thread to purge records
innodb_dict_lru_usec server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Time (in microseconds) spent to process DICT LRU list
innodb_dict_lru_count_active server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of tables evicted from DICT LRU list in the active loop
innodb_dict_lru_count_idle server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of tables evicted from DICT LRU list in the idle loop
Expand Down
2 changes: 0 additions & 2 deletions mysql-test/suite/innodb/r/monitor.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,6 @@ innodb_master_active_loops disabled
innodb_master_idle_loops disabled
innodb_background_drop_table_usec disabled
innodb_log_flush_usec disabled
innodb_mem_validate_usec disabled
innodb_master_purge_usec disabled
innodb_dict_lru_usec disabled
innodb_dict_lru_count_active disabled
innodb_dict_lru_count_idle disabled
Expand Down
2 changes: 0 additions & 2 deletions storage/innobase/include/srv0mon.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -399,8 +399,6 @@ enum monitor_id_t {
MONITOR_MASTER_IDLE_LOOPS,
MONITOR_SRV_BACKGROUND_DROP_TABLE_MICROSECOND,
MONITOR_SRV_LOG_FLUSH_MICROSECOND,
MONITOR_SRV_MEM_VALIDATE_MICROSECOND,
MONITOR_SRV_PURGE_MICROSECOND,
MONITOR_SRV_DICT_LRU_MICROSECOND,
MONITOR_SRV_DICT_LRU_EVICT_COUNT_ACTIVE,
MONITOR_SRV_DICT_LRU_EVICT_COUNT_IDLE,
Expand Down
10 changes: 0 additions & 10 deletions storage/innobase/srv/srv0mon.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1194,16 +1194,6 @@ static monitor_info_t innodb_counter_info[] =
MONITOR_NONE,
MONITOR_DEFAULT_START, MONITOR_SRV_LOG_FLUSH_MICROSECOND},

{"innodb_mem_validate_usec", "server",
"Time (in microseconds) spent to do memory validation",
MONITOR_NONE,
MONITOR_DEFAULT_START, MONITOR_SRV_MEM_VALIDATE_MICROSECOND},

{"innodb_master_purge_usec", "server",
"Time (in microseconds) spent by master thread to purge records",
MONITOR_NONE,
MONITOR_DEFAULT_START, MONITOR_SRV_PURGE_MICROSECOND},

{"innodb_dict_lru_usec", "server",
"Time (in microseconds) spent to process DICT LRU list",
MONITOR_NONE,
Expand Down
3 changes: 0 additions & 3 deletions storage/innobase/srv/srv0srv.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -459,9 +459,6 @@ current_time % 60 == 0 and no tasks will be performed when
current_time % 5 != 0. */

# define SRV_MASTER_CHECKPOINT_INTERVAL (7)
#ifdef MEM_PERIODIC_CHECK
# define SRV_MASTER_MEM_VALIDATE_INTERVAL (13)
#endif /* MEM_PERIODIC_CHECK */
# define SRV_MASTER_DICT_LRU_INTERVAL (47)

/** Simulate compression failures. */
Expand Down
2 changes: 0 additions & 2 deletions storage/rocksdb/mysql-test/rocksdb/r/innodb_i_s_tables_disabled.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,6 @@ innodb_master_active_loops server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NU
innodb_master_idle_loops server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of times master thread performs its tasks when server is idle
innodb_background_drop_table_usec server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Time (in microseconds) spent to process drop table list
innodb_log_flush_usec server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Time (in microseconds) spent to flush log records
innodb_mem_validate_usec server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Time (in microseconds) spent to do memory validation
innodb_master_purge_usec server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Time (in microseconds) spent by master thread to purge records
innodb_dict_lru_usec server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Time (in microseconds) spent to process DICT LRU list
innodb_dict_lru_count_active server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of tables evicted from DICT LRU list in the active loop
innodb_dict_lru_count_idle server 0 NULL NULL NULL 0 NULL NULL NULL NULL NULL NULL NULL 0 counter Number of tables evicted from DICT LRU list in the idle loop
Expand Down

0 comments on commit 7e79853

Please sign in to comment.