Extend trx_sys library

romz-pl · Sep 6, 2019 · b0a32ab · b0a32ab
1 parent d52d993
commit b0a32ab
Show file tree

Hide file tree

Showing 15 changed files with 31 additions and 27 deletions.
diff --git a/storage/innobase/include/que0que.ic b/storage/innobase/include/que0que.ic
@@ -32,6 +32,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <innodb/data_types/dtype_t.h>
 #include <innodb/data_types/dfield_get_type.h>
+#include <innodb/trx_trx/trx_t.h>
 
 #include "usr0sess.h"
 

diff --git a/storage/innobase/include/row0upd.ic b/storage/innobase/include/row0upd.ic
@@ -32,6 +32,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <innodb/page/page_zip_write_trx_id_and_roll_ptr.h>
 #include <innodb/memory/mem_heap_zalloc.h>
+#include <innodb/trx_sys/trx_write_trx_id.h>
 
 #include "mtr0log.h"
 #ifndef UNIV_HOTBACKUP

diff --git a/storage/innobase/include/trx0purge.h b/storage/innobase/include/trx0purge.h
@@ -50,6 +50,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #endif /* UNIV_HOTBACKUP */
 
 struct trx_purge_t;
+struct trx_undo_ptr_t;
 
 /** The global data structure coordinating a purge */
 extern trx_purge_t *purge_sys;

diff --git a/storage/innobase/include/trx0roll.h b/storage/innobase/include/trx0roll.h
@@ -36,6 +36,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <innodb/univ/univ.h>
 
 #include <innodb/trx_types/trx_undo_rec_t.h>
+#include <innodb/trx_types/trx_savept_t.h>
+#include <innodb/trx_trx/trx_named_savept_t.h>
 
 #include "trx0sys.h"
 

diff --git a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h
@@ -75,32 +75,5 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <innodb/trx_sys/trx_sys_print_mysql_binlog_offset_from_page.h>
 #include <innodb/trx_sys/trx_sys_rw_trx_add.h>
 #include <innodb/trx_sys/trx_sys_t.h>
-#include <innodb/trx_sys/trx_sys_undo_spaces_deinit.h>
-#include <innodb/trx_sys/trx_sys_undo_spaces_init.h>
-#include <innodb/trx_sys/trx_sys_update_mysql_binlog_offset.h>
-#include <innodb/trx_sys/trx_sys_validate_trx_list.h>
-#include <innodb/trx_sys/trx_sysf_get.h>
-#include <innodb/trx_sys/trx_sysf_rseg_find_free.h>
-#include <innodb/trx_sys/trx_sysf_rseg_find_page_no.h>
-#include <innodb/trx_sys/trx_sysf_rseg_get_page_no.h>
-#include <innodb/trx_sys/trx_sysf_rseg_get_space.h>
-#include <innodb/trx_sys/trx_sysf_rseg_set_page_no.h>
-#include <innodb/trx_sys/trx_sysf_rseg_set_space.h>
-#include <innodb/trx_sys/trx_sysf_rseg_t.h>
-#include <innodb/trx_sys/trx_ut_list_t.h>
-#include <innodb/trx_sys/trx_write_trx_id.h>
-#include <innodb/trx_trx/assert_trx_in_rw_list.h>
-#include <innodb/trx_trx/trx_reference.h>
-#include <innodb/trx_types/Rsegs.h>
-#include <innodb/trx_types/TrxIdSet.h>
-#include <innodb/trx_types/TrxIdSet.h>
-#include <innodb/trx_types/TrxSysMutex.h>
-#include <innodb/trx_types/TrxTrack.h>
-#include <innodb/trx_types/purge_pq_t.h>
-#include <innodb/trx_types/trx_sysf_t.h>
 
-// Forward declaration
-class MVCC;
-class ReadView;
-struct trx_sys_t;
 
diff --git a/storage/innobase/include/trx0undo.h b/storage/innobase/include/trx0undo.h
@@ -41,6 +41,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "trx0sys.h"
 #include "trx0xa.h"
 
+struct trx_undo_ptr_t;
+
 #ifndef UNIV_HOTBACKUP
 /** Returns TRUE if the roll pointer is of the insert type.
  @return true if insert undo log */

diff --git a/storage/innobase/lob/lob0impl.cc b/storage/innobase/lob/lob0impl.cc
@@ -26,6 +26,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <innodb/page/page_zip_level.h>
 #include <innodb/mtr/mtr_start.h>
+#include <innodb/trx_trx/trx_t.h>
 
 #include "lob0impl.h"
 #include "lob0del.h"

diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
@@ -32,6 +32,9 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #define LOCK_MODULE_IMPLEMENTATION
 
+#include <innodb/trx_trx/trx_reference.h>
+#include <innodb/trx_trx/assert_trx_in_rw_list.h>
+#include <innodb/trx_trx/check_trx_state.h>
 #include <innodb/trx_trx/trx_weight_ge.h>
 #include <innodb/trx_trx/trx_immutable_id.h>
 #include <innodb/trx_trx/trx_state_eq.h>

diff --git a/storage/innobase/row/row0ftsort.cc b/storage/innobase/row/row0ftsort.cc
@@ -32,6 +32,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <sys/types.h>
 
+#include <innodb/trx_sys/trx_write_trx_id.h>
 #include <innodb/trx_trx/trx_start_if_not_started.h>
 #include <innodb/trx_trx/trx_free_for_background.h>
 #include <innodb/trx_trx/trx_allocate_for_background.h>

diff --git a/storage/innobase/srv/srv0start.cc b/storage/innobase/srv/srv0start.cc
@@ -50,6 +50,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <stdlib.h>
 #include <sys/types.h>
 
+#include <innodb/trx_sys/trx_sys_undo_spaces_deinit.h>
+#include <innodb/trx_sys/trx_sys_undo_spaces_init.h>
 #include <innodb/trx_trx/trx_pool_close.h>
 #include <innodb/io/srv_read_only_mode.h>
 #include <innodb/trx_trx/trx_resurrect_locks.h>

diff --git a/storage/innobase/trx/trx0i_s.cc b/storage/innobase/trx/trx0i_s.cc
@@ -42,6 +42,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
    From the symptoms, this is related to bug#46587 in the MySQL bug DB.
 */
 
+#include <innodb/trx_trx/trx_is_autocommit_non_locking.h>
 #include <innodb/trx_trx/assert_trx_nonlocking_or_in_list.h>
 #include <innodb/trx_trx/trx_is_started.h>
 #include <innodb/trx_trx/trx_mutex_enter.h>

diff --git a/storage/innobase/trx/trx0roll.cc b/storage/innobase/trx/trx0roll.cc
@@ -32,6 +32,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <sys/types.h>
 
+#include <innodb/trx_trx/assert_trx_in_rw_list.h>
+#include <innodb/trx_trx/check_trx_state.h>
 #include <innodb/trx_trx/TrxInInnoDB.h>
 #include <innodb/io/srv_read_only_mode.h>
 #include <innodb/trx_trx/assert_trx_nonlocking_or_in_list.h>

diff --git a/storage/innobase/trx/trx0rseg.cc b/storage/innobase/trx/trx0rseg.cc
@@ -30,6 +30,14 @@ this program; if not, write to the Free Software Foundation, Inc.,
  Created 3/26/1996 Heikki Tuuri
  *******************************************************/
 
+#include <innodb/trx_sys/trx_sysf_rseg_get_space.h>
+#include <innodb/trx_sys/trx_sysf_rseg_get_page_no.h>
+#include <innodb/trx_sys/trx_sysf_rseg_get_space.h>
+#include <innodb/trx_sys/trx_sysf_rseg_get_page_no.h>
+#include <innodb/trx_sys/trx_sysf_rseg_set_page_no.h>
+#include <innodb/trx_sys/trx_sysf_rseg_set_space.h>
+#include <innodb/trx_sys/trx_sysf_get.h>
+#include <innodb/trx_types/trx_sysf_t.h>
 #include <innodb/io/srv_read_only_mode.h>
 #include <innodb/sync_mutex/mutex_free.h>
 #include <innodb/mtr/mtr_x_lock.h>

diff --git a/storage/innobase/trx/trx0sys.cc b/storage/innobase/trx/trx0sys.cc
@@ -33,6 +33,10 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <sys/types.h>
 #include <new>
 
+#include <innodb/trx_trx/trx_reference.h>
+#include <innodb/trx_trx/trx_t.h>
+#include <innodb/trx_trx/assert_trx_in_rw_list.h>
+#include <innodb/trx_types/trx_sysf_t.h>
 #include <innodb/trx_trx/trx_state_eq.h>
 #include <innodb/io/srv_read_only_mode.h>
 #include <innodb/read/MVCC.h>

diff --git a/storage/innobase/trx/trx0trx.cc b/storage/innobase/trx/trx0trx.cc
@@ -30,6 +30,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
  Created 3/26/1996 Heikki Tuuri
  *******************************************************/
 
+#include <innodb/trx_trx/assert_trx_in_rw_list.h>
+#include <innodb/trx_sys/trx_sys_update_mysql_binlog_offset.h>
 #include <innodb/trx_trx/commit_node_t.h>
 #include <innodb/trx_trx/trx_set_rw_mode.h>
 #include <innodb/trx_trx/trx_state_eq.h>