diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-08-29 12:14:55 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-09-07 22:06:20 +0300 |
commit | 59950df533ab7231c77a59ec3e27cef855318939 (patch) | |
tree | 5f5b14124e22e217fe1cb608ce8aa4de971e07d3 | |
parent | 092733296134988038fb419f14a45c352ad7dd72 (diff) | |
download | mariadb-git-59950df533ab7231c77a59ec3e27cef855318939.tar.gz |
Remove some debug-only global status variables
-rw-r--r-- | storage/innobase/btr/btr0sea.cc | 2 | ||||
-rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 8 | ||||
-rw-r--r-- | storage/innobase/include/srv0srv.h | 9 | ||||
-rw-r--r-- | storage/innobase/srv/srv0srv.cc | 26 |
4 files changed, 0 insertions, 45 deletions
diff --git a/storage/innobase/btr/btr0sea.cc b/storage/innobase/btr/btr0sea.cc index 829e0c47e39..fae929fc8e5 100644 --- a/storage/innobase/btr/btr0sea.cc +++ b/storage/innobase/btr/btr0sea.cc @@ -1310,8 +1310,6 @@ void btr_search_drop_page_hash_when_freed(const page_id_t& page_id) mtr_t mtr; dberr_t err = DB_SUCCESS; - ut_d(export_vars.innodb_ahi_drop_lookups++); - mtr_start(&mtr); /* If the caller has a latch on the page, then the caller must diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 86e39352912..b363b4ff52e 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -1100,14 +1100,6 @@ static SHOW_VAR innodb_status_variables[]= { (char*) &export_vars.innodb_truncated_status_writes, SHOW_LONG}, {"available_undo_logs", (char*) &export_vars.innodb_available_undo_logs, SHOW_LONG}, -#ifdef UNIV_DEBUG - {"purge_trx_id_age", - (char*) &export_vars.innodb_purge_trx_id_age, SHOW_LONG}, - {"purge_view_trx_id_age", - (char*) &export_vars.innodb_purge_view_trx_id_age, SHOW_LONG}, - {"ahi_drop_lookups", - (char*) &export_vars.innodb_ahi_drop_lookups, SHOW_LONG}, -#endif /* UNIV_DEBUG */ /* Status variables for page compression */ {"page_compression_saved", diff --git a/storage/innobase/include/srv0srv.h b/storage/innobase/include/srv0srv.h index 18abcbb49f8..7adfe295710 100644 --- a/storage/innobase/include/srv0srv.h +++ b/storage/innobase/include/srv0srv.h @@ -1036,15 +1036,6 @@ struct export_var_t{ of used row log buffer */ ulint innodb_onlineddl_pct_progress; /*!< Online alter progress */ -#ifdef UNIV_DEBUG - ulint innodb_purge_trx_id_age; /*!< rw_max_trx_id - purged trx_id */ - ulint innodb_purge_view_trx_id_age; /*!< rw_max_trx_id - - purged view's min trx_id */ - ulint innodb_ahi_drop_lookups; /*!< number of adaptive hash - index lookups when freeing - file pages */ -#endif /* UNIV_DEBUG */ - int64_t innodb_page_compression_saved;/*!< Number of bytes saved by page compression */ int64_t innodb_index_pages_written; /*!< Number of index pages diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc index fbc7f6276f8..7ebe0015ffe 100644 --- a/storage/innobase/srv/srv0srv.cc +++ b/storage/innobase/srv/srv0srv.cc @@ -1655,32 +1655,6 @@ srv_export_innodb_status(void) export_vars.innodb_onlineddl_rowlog_pct_used = onlineddl_rowlog_pct_used; export_vars.innodb_onlineddl_pct_progress = onlineddl_pct_progress; -#ifdef UNIV_DEBUG - rw_lock_s_lock(&purge_sys->latch); - trx_id_t up_limit_id = purge_sys->view.up_limit_id();; - trx_id_t done_trx_no = purge_sys->done.trx_no; - rw_lock_s_unlock(&purge_sys->latch); - - mutex_enter(&trx_sys->mutex); - trx_id_t max_trx_id = trx_sys->rw_max_trx_id; - mutex_exit(&trx_sys->mutex); - - if (!done_trx_no || max_trx_id < done_trx_no - 1) { - export_vars.innodb_purge_trx_id_age = 0; - } else { - export_vars.innodb_purge_trx_id_age = - (ulint) (max_trx_id - done_trx_no + 1); - } - - if (!up_limit_id - || max_trx_id < up_limit_id) { - export_vars.innodb_purge_view_trx_id_age = 0; - } else { - export_vars.innodb_purge_view_trx_id_age = - (ulint) (max_trx_id - up_limit_id); - } -#endif /* UNIV_DEBUG */ - export_vars.innodb_sec_rec_cluster_reads = srv_stats.n_sec_rec_cluster_reads; export_vars.innodb_sec_rec_cluster_reads_avoided = |