diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-09 15:50:37 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-09 15:50:37 +0200 |
| commit | d01a034ac604a5f960b5f4d16e24e8951b74419f (patch) | |
| tree | 83e43196394f0cda95bde0c7820bac16e91a767d | |
| parent | c048053c8af5083d35f764c5707c0b4ddb549846 (diff) | |
| download | mariadb-git-d01a034ac604a5f960b5f4d16e24e8951b74419f.tar.gz | |
MDEV-7620: Remove the data structures
The instrumentation that was added in
commit 90635c6fb5e51aa878b81b1285c758afc361c7dc (MDEV-7620)
was effectively reverted in MariaDB Server 10.2.2, in
commit 2e814d4702d71a04388386a9f591d14a35980bfe
(which stopped reporting the statistics) and
commit fec844aca88e1c6b9c36bb0b811e92d9d023ffb9
(which stopped updating the statistics).
Let us remove the orphan data members to reduce the memory footprint.
| -rw-r--r-- | storage/innobase/include/trx0trx.h | 14 | ||||
| -rw-r--r-- | storage/innobase/trx/trx0trx.cc | 4 |
2 files changed, 0 insertions, 18 deletions
diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h index 4161d4d8563..048a050a28d 100644 --- a/storage/innobase/include/trx0trx.h +++ b/storage/innobase/include/trx0trx.h @@ -1113,20 +1113,6 @@ private: during bulk create index */ FlushObserver* flush_observer; public: - /* Lock wait statistics */ - ulint n_rec_lock_waits; - /*!< Number of record lock waits, - might not be exactly correct. */ - ulint n_table_lock_waits; - /*!< Number of table lock waits, - might not be exactly correct. */ - ulint total_rec_lock_wait_time; - /*!< Total rec lock wait time up - to this moment. */ - ulint total_table_lock_wait_time; - /*!< Total table lock wait time - up to this moment. */ - #ifdef WITH_WSREP os_event_t wsrep_event; /* event waited for in srv_conc_slot */ #endif /* WITH_WSREP */ diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc index 13b4efb973b..245758cecd5 100644 --- a/storage/innobase/trx/trx0trx.cc +++ b/storage/innobase/trx/trx0trx.cc @@ -464,10 +464,6 @@ inline void trx_t::free() MEM_NOACCESS(&mod_tables, sizeof mod_tables); MEM_NOACCESS(&detailed_error, sizeof detailed_error); MEM_NOACCESS(&flush_observer, sizeof flush_observer); - MEM_NOACCESS(&n_rec_lock_waits, sizeof n_rec_lock_waits); - MEM_NOACCESS(&n_table_lock_waits, sizeof n_table_lock_waits); - MEM_NOACCESS(&total_rec_lock_wait_time, sizeof total_rec_lock_wait_time); - MEM_NOACCESS(&total_table_lock_wait_time, sizeof total_table_lock_wait_time); #ifdef WITH_WSREP MEM_NOACCESS(&wsrep_event, sizeof wsrep_event); #endif /* WITH_WSREP */ |