MDEV-37619 The forced use of THD accessors hurts InnoDB performance

Let us access some data members of THD directly, instead of invoking
non-inline accessor functions. Note: my_thread_id will be used instead
of the potentially narrower ulong data type.

Also, let us remove some functions from sql_class.cc that were only
being used by InnoDB or RocksDB, for no reason. RocksDB always had
access to the internals of THD.

Author: dr-m

sql/sql_class.cc

@@ -5272,16 +5272,6 @@ extern "C" void thd_decrement_pending_ops(void *thd_)
 }
 
 
-unsigned long long thd_get_query_id(const MYSQL_THD thd)
-{
-  return((unsigned long long)thd->query_id);
-}
-
-void thd_clear_error(MYSQL_THD thd)
-{
-  thd->clear_error();
-}
-
 extern "C" const struct charset_info_st *thd_charset(MYSQL_THD thd)
 {
   return(thd->charset());
@@ -5683,12 +5673,6 @@ extern "C" int thd_binlog_format(const MYSQL_THD thd)
   return BINLOG_FORMAT_UNSPEC;
 }
 
-extern "C" void thd_mark_transaction_to_rollback(MYSQL_THD thd, bool all)
-{
-  DBUG_ASSERT(thd);
-  thd->mark_transaction_to_rollback(all);
-}
-
 extern "C" bool thd_binlog_filter_ok(const MYSQL_THD thd)
 {
   return binlog_filter->db_ok(thd->db.str);

storage/innobase/dict/dict0crea.cc

@@ -24,6 +24,7 @@ Database object creation
 Created 1/8/1996 Heikki Tuuri
 *******************************************************/
 
+#define MYSQL_SERVER
 #include "dict0crea.h"
 #include "btr0pcur.h"
 #ifdef BTR_CUR_HASH_ADAPT
@@ -45,7 +46,7 @@ Created 1/8/1996 Heikki Tuuri
 #include "fts0priv.h"
 #include "srv0start.h"
 #include "log.h"
-#include "ha_innodb.h"
+#include "sql_class.h"
 
 /*****************************************************************//**
 Based on a table object, this function builds the entry to be inserted
@@ -1757,7 +1758,7 @@ dict_create_add_foreigns_to_dictionary(
     return DB_ERROR;
   }
 
-  bool strict_mode = thd_is_strict_mode(trx->mysql_thd);
+  bool strict_mode = trx->mysql_thd->is_strict_mode();
   for (auto fk : local_fk_set)
     if (strict_mode && !fk->check_fk_constraint_valid())
       return DB_CANNOT_ADD_CONSTRAINT;

storage/innobase/dict/dict0dict.cc

@@ -25,6 +25,7 @@ Data dictionary system
 Created 1/8/1996 Heikki Tuuri
 ***********************************************************************/
 
+#define MYSQL_SERVER
 #include <my_config.h>
 #include <string>
 
@@ -38,7 +39,6 @@ Created 1/8/1996 Heikki Tuuri
 #include <algorithm>
 #include "sql_class.h"
 #include "sql_table.h"
-#include <mysql/service_thd_mdl.h>
 
 #include "btr0btr.h"
 #include "btr0cur.h"
@@ -524,10 +524,8 @@ dict_index_get_nth_field_pos(
 
 void mdl_release(THD *thd, MDL_ticket *mdl) noexcept
 {
-  if (!thd || !mdl);
-  else if (MDL_context *mdl_context= static_cast<MDL_context*>
-           (thd_mdl_context(thd)))
-    mdl_context->release_lock(mdl);
+  if (thd && mdl)
+    thd->mdl_context.release_lock(mdl);
 }
 
 /** Parse the table file name into table name and database name.
@@ -787,7 +785,6 @@ dict_acquire_mdl_shared(dict_table_t *table,
   if (!table || !mdl)
     return table;
 
-  MDL_context *mdl_context= static_cast<MDL_context*>(thd_mdl_context(thd));
   size_t db_len;
 
   if (trylock)
@@ -805,9 +802,7 @@ dict_acquire_mdl_shared(dict_table_t *table,
   if (db_len == 0)
     return table; /* InnoDB system tables are not covered by MDL */
 
-  return mdl_context
-    ? dict_acquire_mdl_shared<trylock>(table, mdl_context, mdl, table_op)
-    : nullptr;
+  return dict_acquire_mdl_shared<trylock>(table, &thd->mdl_context, mdl, table_op);
 }
 
 template dict_table_t* dict_acquire_mdl_shared<false>
@@ -1100,9 +1095,7 @@ bool dict_stats::open(THD *thd) noexcept
   ut_ad(!index_stats);
   ut_ad(!mdl_context);
 
-  mdl_context= static_cast<MDL_context*>(thd_mdl_context(thd));
-  if (!mdl_context)
-    return true;
+  mdl_context= &thd->mdl_context;
   /* FIXME: use compatible type, and maybe remove this parameter altogether! */
   const double timeout= double(global_system_variables.lock_wait_timeout);
   MDL_request request;
@@ -3442,7 +3435,7 @@ dict_foreign_parse_drop_constraints(
 
 	ut_a(trx->mysql_thd);
 
-	cs = thd_charset(trx->mysql_thd);
+	cs = trx->mysql_thd->charset();
 
 	*n = 0;
 

storage/innobase/eval/eval0eval.cc

@@ -26,6 +26,7 @@ Created 12/29/1997 Heikki Tuuri
 *******************************************************/
 
 #include "eval0eval.h"
+#include "pars0grm.h"
 #include "data0data.h"
 #include "row0sel.h"
 #include "rem0cmp.h"