Extend trx_trx library

romz-pl · Sep 6, 2019 · 45db0d4 · 45db0d4
1 parent efd02dc
commit 45db0d4
Show file tree

Hide file tree

Showing 56 changed files with 63 additions and 117 deletions.
diff --git a/storage/innobase/btr/btr0btr.cc b/storage/innobase/btr/btr0btr.cc
@@ -87,7 +87,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 
 #include "srv0mon.h"
-#include "trx0trx.h"
+
 #endif /* !UNIV_HOTBACKUP */
 
 #ifndef UNIV_HOTBACKUP

diff --git a/storage/innobase/btr/btr0pcur.cc b/storage/innobase/btr/btr0pcur.cc
@@ -41,7 +41,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <stddef.h>
 
 
-#include "trx0trx.h"
+
 
 
 void btr_pcur_t::store_position(mtr_t *mtr) {

diff --git a/storage/innobase/buf/buf0lru.cc b/storage/innobase/buf/buf0lru.cc
@@ -97,7 +97,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "srv0mon.h"
 #include "srv0srv.h"
 
-#include "trx0trx.h"
+
 
 #include <innodb/formatting/formatting.h>
 #include <innodb/random/random.h>

diff --git a/storage/innobase/dict/dict0boot.cc b/storage/innobase/dict/dict0boot.cc
@@ -49,7 +49,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "dict0dd.h"
 #include "srv0srv.h"
-#include "trx0trx.h"
+
 
 /** Gets a pointer to the dictionary header and x-latches its page.
  @return pointer to the dictionary header, page x-latched */

diff --git a/storage/innobase/dict/dict0mem.cc b/storage/innobase/dict/dict0mem.cc
@@ -41,7 +41,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <innodb/dict_mem/dict_index_is_online_ddl.h>
 #include <innodb/read/ReadView.h>
 
-#include "trx0trx.h"
+
 
 
 

diff --git a/storage/innobase/dict/dict0sdi.cc b/storage/innobase/dict/dict0sdi.cc
@@ -43,7 +43,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "dict0sdi.h"
 #include "fsp0fsp.h"
 #include "ha_innodb.h"
-#include "trx0trx.h"
+
 
 /** Check if SDI Index exists in a tablespace
 @param[in]	tablespace	tablespace object

diff --git a/storage/innobase/dict/dict0stats.cc b/storage/innobase/dict/dict0stats.cc
@@ -73,7 +73,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "lob0lob.h"
 #include "pars0pars.h"
 #include "row0sel.h"
-#include "trx0trx.h"
+
 #include <innodb/univ/univ.h>
 #include <innodb/random/random.h>
 

diff --git a/storage/innobase/gis/gis0rtree.cc b/storage/innobase/gis/gis0rtree.cc
@@ -71,7 +71,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "lock0lock.h"
 
 #include "srv0mon.h"
-#include "trx0trx.h"
+
 
 /** Initial split nodes info for R-tree split.
  @return initialized split nodes array */

diff --git a/storage/innobase/gis/gis0sea.cc b/storage/innobase/gis/gis0sea.cc
@@ -72,7 +72,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "srv0mon.h"
 
-#include "trx0trx.h"
+
 
 /** Restore the stored position of a persistent cursor bufferfixing the page */
 static bool rtr_cur_restore_position(

diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc
@@ -290,7 +290,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "trx0roll.h"
 #include "trx0rseg.h"
 #include "trx0sys.h"
-#include "trx0trx.h"
+
 #include "trx0xa.h"
 #else
 #include <typelib.h>

diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h
@@ -35,7 +35,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "handler.h"
 #include "my_dbug.h"
 #include "row0pread-adapter.h"
-#include "trx0trx.h"
+
 
 /** "GEN_CLUST_INDEX" is the name reserved for InnoDB default
 system clustered index when there is no primary key. */

diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc
@@ -134,7 +134,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "sql/create_field.h"
 #include "srv0mon.h"
 #include "trx0roll.h"
-#include "trx0trx.h"
+
 #include "ut0stage.h"
 
 /* For supporting Native InnoDB Partitioning. */

diff --git a/storage/innobase/handler/i_s.cc b/storage/innobase/handler/i_s.cc
@@ -89,7 +89,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "srv0start.h"
 #include "srv0tmp.h"
 #include "trx0i_s.h"
-#include "trx0trx.h"
+
 #include "ut0ut.h"
 
 #include "my_dbug.h"

diff --git a/storage/innobase/include/api0misc.h b/storage/innobase/include/api0misc.h
@@ -41,7 +41,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "handler.h"
 #include "que0que.h"
-#include "trx0trx.h"
+
 
 /** Whether binlog is enabled for applications using InnoDB APIs */
 extern bool ib_binlog_enabled;

diff --git a/storage/innobase/include/lob0index.h b/storage/innobase/include/lob0index.h
@@ -30,7 +30,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include "fut0lst.h"
 #include "lob0util.h"
-#include "trx0trx.h"
+
 
 namespace lob {
 

diff --git a/storage/innobase/include/lob0inf.h b/storage/innobase/include/lob0inf.h
@@ -35,7 +35,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "lob0lob.h"
 
 #include "table.h"
-#include "trx0trx.h"
+
 
 struct lob_diff_t;
 

diff --git a/storage/innobase/include/lock0lock.h b/storage/innobase/include/lock0lock.h
@@ -89,7 +89,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "row0vers.h"
 #include "srv0srv.h"
 #include "trx0sys.h"
-#include "trx0trx.h"
+
 #include "que0types.h"
 #include "srv0srv.h"
 #include "lock0prdt.h"

diff --git a/storage/innobase/include/pars0pars.h b/storage/innobase/include/pars0pars.h
@@ -35,6 +35,8 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 #include <innodb/univ/univ.h>
 
+#include <innodb/trx_trx/commit_node_t.h>
+
 #include "pars0types.h"
 #include "que0types.h"
 #include "row0mysql.h"

diff --git a/storage/innobase/include/que0que.h b/storage/innobase/include/que0que.h
@@ -44,7 +44,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "row0types.h"
 #include "srv0srv.h"
 #include "trx0roll.h"
-#include "trx0trx.h"
+
 #include "usr0types.h"
 
 /** Mutex protecting the query threads. */

diff --git a/storage/innobase/include/row0upd.ic b/storage/innobase/include/row0upd.ic
@@ -37,7 +37,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #ifndef UNIV_HOTBACKUP
 #include "lock0lock.h"
 #include "row0row.h"
-#include "trx0trx.h"
+
 #include "trx0undo.h"
 #endif /* !UNIV_HOTBACKUP */
 

diff --git a/storage/innobase/include/sess0sess.h b/storage/innobase/include/sess0sess.h
@@ -40,7 +40,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <sql_thd_internal_api.h>
 
 #include "srv0tmp.h"
-#include "trx0trx.h"
+
 
 #include <map>
 

diff --git a/storage/innobase/include/trx0roll.h b/storage/innobase/include/trx0roll.h
@@ -38,7 +38,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <innodb/trx_types/trx_undo_rec_t.h>
 
 #include "trx0sys.h"
-#include "trx0trx.h"
+
 #ifdef UNIV_HOTBACKUP
 #include "que0que.h"
 #endif /* UNIV_HOTBACKUP */

diff --git a/storage/innobase/include/trx0sys.h b/storage/innobase/include/trx0sys.h
@@ -61,7 +61,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <innodb/lst/lst.h>
 #endif /* !UNIV_HOTBACKUP */
 #include <atomic>
-#include "trx0trx.h"
+
 
 #ifndef UNIV_HOTBACKUP
 #include <innodb/trx_sys/trx_ut_list_t.h>

diff --git a/storage/innobase/include/trx0sys.ic b/storage/innobase/include/trx0sys.ic
@@ -41,7 +41,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 
 
 #include "srv0srv.h"
-#include "trx0trx.h"
+
 #ifndef UNIV_HOTBACKUP
 #include "mtr0log.h"
 

diff --git a/storage/innobase/include/trx0trx.h b/storage/innobase/include/trx0trx.h
diff --git a/storage/innobase/libs/trx_trx/include/innodb/trx_trx/commit_node_t.h b/storage/innobase/libs/trx_trx/include/innodb/trx_trx/commit_node_t.h
@@ -2,5 +2,11 @@
 
 #include <innodb/univ/univ.h>
 
-struct trx_t;
+#include <innodb/trx_trx/commit_node_state.h>
+#include <innodb/que_types/que_common_t.h>
 
+/** Commit command node in a query graph */
+struct commit_node_t {
+  que_common_t common;          /*!< node type: QUE_NODE_COMMIT */
+  enum commit_node_state state; /*!< node execution state */
+};
diff --git a/storage/innobase/lob/lob0first.cc b/storage/innobase/lob/lob0first.cc
@@ -30,7 +30,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "lob0impl.h"
 #include "lob0index.h"
 #include "lob0pages.h"
-#include "trx0trx.h"
+
 
 namespace lob {
 

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

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

diff --git a/storage/innobase/lob/lob0update.cc b/storage/innobase/lob/lob0update.cc
@@ -32,7 +32,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "my_dbug.h"
 #include "row0upd.h"
 #include "table.h"
-#include "trx0trx.h"
+
 
 namespace lob {
 

diff --git a/storage/innobase/lob/lob0util.cc b/storage/innobase/lob/lob0util.cc
@@ -32,7 +32,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "lob0index.h"
 #include "lob0lob.h"
 #include "table.h"
-#include "trx0trx.h"
+
 
 namespace lob {
 

diff --git a/storage/innobase/lob/zlob0first.cc b/storage/innobase/lob/zlob0first.cc
@@ -27,7 +27,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include <innodb/trx_trx/trx_t.h>
 
 #include "zlob0first.h"
-#include "trx0trx.h"
+
 #include "zlob0index.h"
 #include "zlob0read.h"
 

diff --git a/storage/innobase/lob/zlob0read.cc b/storage/innobase/lob/zlob0read.cc
@@ -29,7 +29,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "lob0lob.h"
 #include "lob0zip.h"
 #include "my_dbug.h"
-#include "trx0trx.h"
+
 #include <innodb/univ/univ.h>
 #include "zlob0first.h"
 

diff --git a/storage/innobase/lob/zlob0update.cc b/storage/innobase/lob/zlob0update.cc
@@ -33,7 +33,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "lob0impl.h"
 #include "lob0lob.h"
 #include "row0upd.h"
-#include "trx0trx.h"
+
 #include "zlob0first.h"
 #include "zlob0read.h"
 

diff --git a/storage/innobase/log/log0chkp.cc b/storage/innobase/log/log0chkp.cc
@@ -87,7 +87,7 @@ the file COPYING.Google.
 #include "trx0roll.h"
 #include "trx0sys.h"
 #include <innodb/enum/to_int.h>
-#include "trx0trx.h"
+
 
 #ifndef UNIV_HOTBACKUP
 

diff --git a/storage/innobase/log/log0ddl.cc b/storage/innobase/log/log0ddl.cc
@@ -68,7 +68,7 @@ this program; if not, write to the Free Software Foundation, Inc.,
 #include "row0ins.h"
 #include "row0row.h"
 #include "row0sel.h"
-#include "trx0trx.h"
+
 
 /** Object to handle Log_DDL */
 Log_DDL *log_ddl = nullptr;

diff --git a/storage/innobase/log/log0write.cc b/storage/innobase/log/log0write.cc
@@ -117,7 +117,7 @@ the file COPYING.Google.
 
 #include "trx0roll.h"
 #include "trx0sys.h"
-#include "trx0trx.h"
+