Extend trx_purge library

romz-pl · Sep 7, 2019 · b24fa04 · b24fa04
1 parent 09dfe03
commit b24fa04
Show file tree

Hide file tree

Showing 37 changed files with 77 additions and 109 deletions.
diff --git a/storage/innobase/buf/buf0buf.cc b/storage/innobase/buf/buf0buf.cc
@@ -153,7 +153,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "lock0lock.h"
 #include "log0log.h"
 
-#include "trx0purge.h"
+
 
 #include <innodb/formatting/formatting.h>
 

diff --git a/storage/innobase/buf/buf0dblwr.cc b/storage/innobase/buf/buf0dblwr.cc
@@ -32,6 +32,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <sys/types.h>
 
+#include <innodb/trx_purge/is_active.h>
 #include <innodb/memory_check/memory_check.h>
 #include <innodb/logger/fatal.h>
 #include <innodb/sync_mutex/mutex_free.h>
@@ -58,10 +59,10 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "ha_prototypes.h"
 #include "my_compiler.h"
 #include "my_inttypes.h"
-
+#include "page0page.h"
 #include "srv0srv.h"
 #include "srv0start.h"
-#include "trx0purge.h"
+
 #include <innodb/enum/to_int.h>
 
 /** The doublewrite buffer */

diff --git a/storage/innobase/buf/buf0dump.cc b/storage/innobase/buf/buf0dump.cc
@@ -35,6 +35,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <stdio.h>
 #include <algorithm>
 
+#include <innodb/formatting/formatting.h>
 #include <innodb/allocator/ut_malloc_nokey.h>
 #include <innodb/logger/info.h>
 #include <innodb/logger/error.h>

diff --git a/storage/innobase/dict/dict0dd.cc b/storage/innobase/dict/dict0dd.cc
@@ -27,6 +27,9 @@ this program; if not, write to the Free Software Foundation, Inc.,
 /** @file dict/dict0dd.cc
 Data dictionary interface */
 
+#include <innodb/trx_purge/id2num.h>
+#include <innodb/trx_purge/spaces.h>
+#include <innodb/trx_purge/Tablespace.h>
 #include <innodb/trx_sys/trx_sys.h>
 #include <innodb/dict_mem/dict_mem_table_add_col.h>
 #include <innodb/dict_mem/dict_mem_table_create.h>

diff --git a/storage/innobase/fil/fil0fil.cc b/storage/innobase/fil/fil0fil.cc
@@ -33,6 +33,10 @@ The tablespace memory cache */
 #include <fcntl.h>
 #include <sys/types.h>
 
+#include <innodb/trx_purge/is_active.h>
+#include <innodb/trx_purge/spaces.h>
+#include <innodb/trx_purge/id2num.h>
+#include <innodb/trx_purge/is_active_truncate_log_present.h>
 #include <innodb/trx_trx/TrxInInnoDB.h>
 #include <innodb/io/srv_read_only_mode.h>
 #include <innodb/trx_trx/trx_start_if_not_started_xa.h>
@@ -127,7 +131,7 @@ The tablespace memory cache */
 #include "sql_backup_lock.h"
 #include "sql_class.h"
 
-#include "trx0purge.h"
+
 #else /* !UNIV_HOTBACKUP */
 #include <cstring>
 #include "srv0srv.h"

diff --git a/storage/innobase/fsp/fsp0file.cc b/storage/innobase/fsp/fsp0file.cc
@@ -30,6 +30,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
  Created 2013-7-26 by Kevin Lewis
  *******************************************************/
 
+#include <innodb/formatting/formatting.h>
+#include <innodb/trx_purge/make_space_name.h>
 #include <innodb/io/srv_read_only_mode.h>
 #include <innodb/buf_calc/BlockReporter.h>
 #include <innodb/allocator/ut_malloc_nokey.h>
@@ -55,7 +57,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "page0page.h"
 #include "srv0start.h"
-#include "trx0purge.h"
+
 
 #ifdef UNIV_HOTBACKUP
 #include "my_sys.h"

diff --git a/storage/innobase/fsp/fsp0fsp.cc b/storage/innobase/fsp/fsp0fsp.cc
@@ -73,7 +73,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 
 #include "srv0start.h"
-#include "trx0purge.h"
+
 
 #ifndef UNIV_HOTBACKUP
 

diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -46,6 +46,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "my_config.h"
 #endif /* !UNIV_HOTBACKUP */
 
+#include <innodb/trx_purge/get_next_available_space_num.h>
+#include <innodb/trx_purge/ddl_mutex.h>
 #include <innodb/trx_undo/flags.h>
 #include <innodb/trx_purge/set_active.h>
 #include <innodb/trx_purge/purge_sys.h>
@@ -288,7 +290,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "srv0start.h"
 
 #ifdef UNIV_DEBUG
-#include "trx0purge.h"
+
 #endif /* UNIV_DEBUG */
 #include "dict0priv.h"
 #include "dict0sdi.h"

diff --git a/storage/innobase/include/srv0start.h b/storage/innobase/include/srv0start.h
@@ -41,7 +41,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef UNIV_HOTBACKUP
 
 #endif /* !UNIV_HOTBACKUP */
-#include "trx0purge.h"
+
 
 
 // Forward declaration

diff --git a/storage/innobase/include/trx0purge.h b/storage/innobase/include/trx0purge.h
diff --git a/storage/innobase/lob/lob0index.cc b/storage/innobase/lob/lob0index.cc
@@ -27,7 +27,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "lob0index.h"
 #include "lob0first.h"
 #include "lob0pages.h"
-#include "trx0purge.h"
+
 
 
 namespace lob {

diff --git a/storage/innobase/lob/lob0purge.cc b/storage/innobase/lob/lob0purge.cc
@@ -32,7 +32,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "lob0inf.h"
 #include "lob0lob.h"
 #include "row0upd.h"
-#include "trx0purge.h"
+
 
 #include "zlob0first.h"
 #include "zlob0index.h"

diff --git a/storage/innobase/lob/zlob0index.cc b/storage/innobase/lob/zlob0index.cc
@@ -26,7 +26,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "zlob0index.h"
 #include "lob0util.h"
-#include "trx0purge.h"
+
 #include "zlob0first.h"
 
 namespace lob {

diff --git a/storage/innobase/lock/lock0lock.cc b/storage/innobase/lock/lock0lock.cc
@@ -105,7 +105,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "row0mysql.h"
 #include "row0sel.h"
 #include "srv0mon.h"
-#include "trx0purge.h"
+
 
 #include "usr0sess.h"
 #include "ut0ut.h"

diff --git a/storage/innobase/lock/lock0prdt.cc b/storage/innobase/lock/lock0prdt.cc
@@ -46,7 +46,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "lock0prdt.h"
 #include "lock0priv.h"
 #include "srv0mon.h"
-#include "trx0purge.h"
+
 
 #include "usr0sess.h"
 #include <innodb/vector/vector.h>

diff --git a/storage/innobase/log/log0ddl.cc b/storage/innobase/log/log0ddl.cc
@@ -36,6 +36,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
  Created 12/1/2016 Shaohua Wang
  *******************************************************/
 
+#include <innodb/trx_purge/id2num.h>
+#include <innodb/trx_purge/spaces.h>
 #include <innodb/trx_purge/unuse_space_id.h>
 #include <innodb/io/srv_read_only_mode.h>
 #include <innodb/trx_trx/trx_commit_for_mysql.h>
@@ -69,7 +71,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "row0ins.h"
 #include "row0row.h"
 #include "row0sel.h"
-#include "trx0purge.h"
+
 
 /** Object to handle Log_DDL */
 Log_DDL *log_ddl = nullptr;

diff --git a/storage/innobase/log/log0recv.cc b/storage/innobase/log/log0recv.cc
@@ -31,6 +31,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
  Created 9/20/1997 Heikki Tuuri
  *******************************************************/
 
+#include <innodb/trx_purge/is_active.h>
 #include <innodb/trx_rec/trx_undo_parse_erase_page_end.h>
 #include <innodb/trx_rec/trx_undo_parse_add_undo_rec.h>
 #include <innodb/trx_undo/trx_undo_parse_page_header.h>
@@ -140,7 +141,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "row0merge.h"
 #include "srv0srv.h"
 #include "srv0start.h"
-#include "trx0purge.h"
+
 #else /* !UNIV_HOTBACKUP */
 /** This is set to false if the backup was originally taken with the
 mysqlbackup --include regexp option: then we do not want to create tables in

diff --git a/storage/innobase/os/os0file.cc b/storage/innobase/os/os0file.cc
@@ -69,6 +69,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 #include "my_io.h"
 #include "sql_const.h"
 #include "srv0start.h"
+#include "page0page.h"
 
 #include <lz4.h>
 #include <zlib.h>

diff --git a/storage/innobase/row/row0merge.cc b/storage/innobase/row/row0merge.cc
@@ -105,7 +105,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "row0log.h"
 #include "row0merge.h"
 #include "row0sel.h"
-#include "trx0purge.h"
+
 #include "ut0sort.h"
 #include "ut0stage.h"
 

diff --git a/storage/innobase/row/row0mysql.cc b/storage/innobase/row/row0mysql.cc
@@ -124,7 +124,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "row0row.h"
 #include "row0sel.h"
 #include "row0upd.h"
-#include "trx0purge.h"
+
 
 
 

diff --git a/storage/innobase/row/row0pread.cc b/storage/innobase/row/row0pread.cc
@@ -31,6 +31,7 @@ Created 2018-01-27 by Sunny Bains */
 
 #include <vector>
 
+#include <innodb/read/ReadView.h>
 #include <innodb/trx_trx/trx_isolation_level.h>
 #include <innodb/cmp/cmp_dtuple_rec.h>
 #include <innodb/data_types/dtuple_set_n_fields_cmp.h>
@@ -44,7 +45,7 @@ Created 2018-01-27 by Sunny Bains */
 #include <innodb/sync_rw/rw_lock_get_waiters.h>
 #include <innodb/record/rec_offs_init.h>
 
-#include "trx0purge.h"
+
 #include "btr0pcur.h"
 #include "dict0dict.h"
 #include "row0pread.h"

diff --git a/storage/innobase/row/row0purge.cc b/storage/innobase/row/row0purge.cc
@@ -77,7 +77,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "srv0mon.h"
 #include "srv0start.h"
 #include "table.h"
-#include "trx0purge.h"
+
 
 
 

diff --git a/storage/innobase/row/row0quiesce.cc b/storage/innobase/row/row0quiesce.cc
@@ -52,7 +52,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "row0mysql.h"
 #include "row0quiesce.h"
 #include "srv0start.h"
-#include "trx0purge.h"
+
 
 #include "my_dbug.h"
 

diff --git a/storage/innobase/row/row0row.cc b/storage/innobase/row/row0row.cc
@@ -30,6 +30,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
  Created 4/20/1996 Heikki Tuuri
  *******************************************************/
 
+#include <innodb/formatting/formatting.h>
 #include <innodb/data_types/dtype_get_charset_coll.h>
 #include <innodb/data_types/dfield_get_data.h>
 #include <innodb/data_types/dfield_get_len.h>
@@ -76,7 +77,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "row0ext.h"
 #include "row0mysql.h"
 #include "row0upd.h"
-#include "trx0purge.h"
+
 
 
 

diff --git a/storage/innobase/row/row0undo.cc b/storage/innobase/row/row0undo.cc
@@ -54,7 +54,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "row0undo.h"
 #include "row0upd.h"
 #include "srv0srv.h"
-#include "trx0purge.h"
+
 
 
 

diff --git a/storage/innobase/row/row0vers.cc b/storage/innobase/row/row0vers.cc
@@ -75,7 +75,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "row0row.h"
 #include "row0upd.h"
 #include "row0vers.h"
-#include "trx0purge.h"
+
 
 
 

diff --git a/storage/innobase/srv/srv0mon.cc b/storage/innobase/srv/srv0mon.cc
@@ -33,6 +33,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <time.h>
 
+#include <innodb/trx_purge/spaces.h>
 #include <innodb/trx_sys/trx_sys.h>
 #include <innodb/log_arch/arch_log_sys.h>
 #include <innodb/logger/info.h>
@@ -52,7 +53,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <innodb/machine/data.h>
 #include "srv0mon.h"
 #include "srv0srv.h"
-#include "trx0purge.h"
+
 
 
 

diff --git a/storage/innobase/srv/srv0srv.cc b/storage/innobase/srv/srv0srv.cc
@@ -128,7 +128,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #ifndef UNIV_HOTBACKUP
 #include "trx0i_s.h"
-#include "trx0purge.h"
+
 #include "usr0sess.h"
 #include <innodb/crc32/crc32.h>
 #endif /* !UNIV_HOTBACKUP */