summaryrefslogtreecommitdiff
path: root/storage/innobase
diff options
context:
space:
mode:
Diffstat (limited to 'storage/innobase')
-rw-r--r--storage/innobase/handler/ha_innodb.cc6
-rw-r--r--storage/innobase/include/srv0mon.h4
-rw-r--r--storage/innobase/include/srv0srv.h12
-rw-r--r--storage/innobase/srv/srv0mon.cc22
-rw-r--r--storage/innobase/srv/srv0srv.cc4
5 files changed, 1 insertions, 47 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
index f36ef0e107f..572496d2eb7 100644
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@@ -1033,10 +1033,6 @@ static SHOW_VAR innodb_status_variables[]= {
/* Status variables for page compression */
{"page_compression_saved",
&export_vars.innodb_page_compression_saved, SHOW_LONGLONG},
- {"num_index_pages_written",
- &export_vars.innodb_index_pages_written, SHOW_LONGLONG},
- {"num_non_index_pages_written",
- &export_vars.innodb_non_index_pages_written, SHOW_LONGLONG},
{"num_pages_page_compressed",
&export_vars.innodb_pages_page_compressed, SHOW_LONGLONG},
{"num_page_compressed_trim_op",
@@ -1091,8 +1087,6 @@ static SHOW_VAR innodb_status_variables[]= {
&export_vars.innodb_encryption_rotation_pages_flushed, SHOW_SIZE_T},
{"encryption_rotation_estimated_iops",
&export_vars.innodb_encryption_rotation_estimated_iops, SHOW_SIZE_T},
- {"encryption_key_rotation_list_length",
- &export_vars.innodb_key_rotation_list_length, SHOW_LONGLONG},
{"encryption_n_merge_blocks_encrypted",
&export_vars.innodb_n_merge_blocks_encrypted, SHOW_LONGLONG},
{"encryption_n_merge_blocks_decrypted",
diff --git a/storage/innobase/include/srv0mon.h b/storage/innobase/include/srv0mon.h
index fe6c83c458c..971f6363bdb 100644
--- a/storage/innobase/include/srv0mon.h
+++ b/storage/innobase/include/srv0mon.h
@@ -2,7 +2,7 @@
Copyright (c) 2010, 2015, Oracle and/or its affiliates. All Rights Reserved.
Copyright (c) 2012, Facebook Inc.
-Copyright (c) 2013, 2021, MariaDB Corporation.
+Copyright (c) 2013, 2022, MariaDB Corporation.
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
@@ -174,8 +174,6 @@ enum monitor_id_t {
MONITOR_OVLD_BUF_POOL_PAGES_FREE,
MONITOR_OVLD_PAGE_CREATED,
MONITOR_OVLD_PAGES_WRITTEN,
- MONITOR_OVLD_INDEX_PAGES_WRITTEN,
- MONITOR_OVLD_NON_INDEX_PAGES_WRITTEN,
MONITOR_OVLD_PAGES_READ,
MONITOR_OVLD_INDEX_SEC_REC_CLUSTER_READS,
MONITOR_OVLD_INDEX_SEC_REC_CLUSTER_READS_AVOIDED,
diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h
index cd58c162aaf..ad892ac9ae9 100644
--- a/storage/innobase/include/srv0srv.h
+++ b/storage/innobase/include/srv0srv.h
@@ -114,10 +114,6 @@ struct srv_stats_t
/** Number of bytes saved by page compression */
ulint_ctr_n_t page_compression_saved;
- /* Number of index pages written */
- ulint_ctr_n_t index_pages_written;
- /* Number of non index pages written */
- ulint_ctr_n_t non_index_pages_written;
/* Number of pages compressed with page compression */
ulint_ctr_n_t pages_page_compressed;
/* Number of TRIM operations induced by page compression */
@@ -175,9 +171,6 @@ struct srv_stats_t
/** Number of encryption_get_latest_key_version calls */
ulint_ctr_n_t n_key_requests;
- /** Number of spaces in keyrotation list */
- ulint_ctr_n_t key_rotation_list_length;
-
/** Number of temporary tablespace blocks encrypted */
ulint_ctr_n_t n_temp_blocks_encrypted;
@@ -768,10 +761,6 @@ struct export_var_t{
int64_t innodb_page_compression_saved;/*!< Number of bytes saved
by page compression */
- int64_t innodb_index_pages_written; /*!< Number of index pages
- written */
- int64_t innodb_non_index_pages_written; /*!< Number of non index pages
- written */
int64_t innodb_pages_page_compressed;/*!< Number of pages
compressed by page compression */
int64_t innodb_page_compressed_trim_op;/*!< Number of TRIM operations
@@ -810,7 +799,6 @@ struct export_var_t{
ulint innodb_encryption_rotation_pages_flushed;
ulint innodb_encryption_rotation_estimated_iops;
int64_t innodb_encryption_key_requests;
- int64_t innodb_key_rotation_list_length;
};
extern tpool::thread_pool *srv_thread_pool;
diff --git a/storage/innobase/srv/srv0mon.cc b/storage/innobase/srv/srv0mon.cc
index 132962dd5bd..8f6c40c2412 100644
--- a/storage/innobase/srv/srv0mon.cc
+++ b/storage/innobase/srv/srv0mon.cc
@@ -272,18 +272,6 @@ static monitor_info_t innodb_counter_info[] =
MONITOR_EXISTING | MONITOR_DEFAULT_ON),
MONITOR_DEFAULT_START, MONITOR_OVLD_PAGES_WRITTEN},
- {"buffer_index_pages_written", "buffer",
- "Number of index pages written (innodb_index_pages_written)",
- static_cast<monitor_type_t>(
- MONITOR_EXISTING | MONITOR_DEFAULT_ON),
- MONITOR_DEFAULT_START, MONITOR_OVLD_INDEX_PAGES_WRITTEN},
-
- {"buffer_non_index_pages_written", "buffer",
- "Number of non index pages written (innodb_non_index_pages_written)",
- static_cast<monitor_type_t>(
- MONITOR_EXISTING | MONITOR_DEFAULT_ON),
- MONITOR_DEFAULT_START, MONITOR_OVLD_NON_INDEX_PAGES_WRITTEN},
-
{"buffer_pages_read", "buffer",
"Number of pages read (innodb_pages_read)",
static_cast<monitor_type_t>(
@@ -1505,16 +1493,6 @@ srv_mon_process_existing_counter(
value = buf_pool.stat.n_pages_written;
break;
- /* innodb_index_pages_written, the number of index pages written */
- case MONITOR_OVLD_INDEX_PAGES_WRITTEN:
- value = srv_stats.index_pages_written;
- break;
-
- /* innodb_non_index_pages_written, the number of non index pages written */
- case MONITOR_OVLD_NON_INDEX_PAGES_WRITTEN:
- value = srv_stats.non_index_pages_written;
- break;
-
case MONITOR_LRU_BATCH_FLUSH_TOTAL_PAGE:
value = buf_lru_flush_page_count;
break;
diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
index bd29fefb807..68156043f35 100644
--- a/storage/innobase/srv/srv0srv.cc
+++ b/storage/innobase/srv/srv0srv.cc
@@ -1142,8 +1142,6 @@ srv_export_innodb_status(void)
srv_truncated_status_writes;
export_vars.innodb_page_compression_saved = srv_stats.page_compression_saved;
- export_vars.innodb_index_pages_written = srv_stats.index_pages_written;
- export_vars.innodb_non_index_pages_written = srv_stats.non_index_pages_written;
export_vars.innodb_pages_page_compressed = srv_stats.pages_page_compressed;
export_vars.innodb_page_compressed_trim_op = srv_stats.page_compressed_trim_op;
export_vars.innodb_pages_page_decompressed = srv_stats.pages_page_decompressed;
@@ -1188,8 +1186,6 @@ srv_export_innodb_status(void)
crypt_stat.estimated_iops;
export_vars.innodb_encryption_key_requests =
srv_stats.n_key_requests;
- export_vars.innodb_key_rotation_list_length =
- srv_stats.key_rotation_list_length;
}
mysql_mutex_unlock(&srv_innodb_monitor_mutex);
View Lorry Controller Status