Setup explicit separate list for system table metrics

The `is_system_table` flag is also used for logical checks and not only
for metrics anymore.

This is causing corruption to show right now on the `_vt` tables, since
they are now also treated special.

On upgrades, the table layout can change and I suspect the `_vt` tables
are not updated immediately as they are not actual system tables. But
then the logic expects them later to be system tables.

With this change I don't see the corruption anymore on the `_vt` tables.

Author: dbussink

storage/innobase/api/api0api.cc

@@ -1070,7 +1070,7 @@ static ib_err_t ib_execute_insert_query_graph(
 
     dict_table_n_rows_inc(table);
 
-    if (table->is_system_table) {
+    if (table->is_system_table_metrics) {
       srv_stats.n_system_rows_inserted.inc();
     } else {
       srv_stats.n_rows_inserted.inc();
@@ -1395,13 +1395,13 @@ static inline ib_err_t ib_execute_update_query_graph(
     if (node->is_delete) {
       dict_table_n_rows_dec(table);
 
-      if (table->is_system_table) {
+      if (table->is_system_table_metrics) {
         srv_stats.n_system_rows_deleted.inc();
       } else {
         srv_stats.n_rows_deleted.inc();
       }
     } else {
-      if (table->is_system_table) {
+      if (table->is_system_table_metrics) {
         srv_stats.n_system_rows_updated.inc();
       } else {
         srv_stats.n_rows_updated.inc();

storage/innobase/dict/mem.cc

@@ -35,7 +35,6 @@ this program; if not, write to the Free Software Foundation, Inc.,
 other files in library. The code in this file is used to make a library for
 external tools. */
 
-#include <algorithm>
 #include <new>
 
 #include "dict0dict.h"
@@ -148,14 +147,45 @@ void dict_mem_table_free(dict_table_t *table) /*!< in: table */
 }
 
 /** System databases */
-static std::vector<std::string> innobase_system_databases({
+static std::string innobase_system_databases[] = {
+    "mysql/", "information_schema/", "performance_schema/", ""};
+
+/** Determines if a table is a system table
+@param[in]  name  table_name
+@return true if table is system table */
+static bool dict_mem_table_is_system(const std::string name) {
+  /* Table has the following format: database/table and some system table are
+  of the form SYS_* */
+  if (name.find('/') != std::string::npos) {
+    size_t table_len = name.length();
+
+    std::string system_db = std::string(innobase_system_databases[0]);
+    int i = 0;
+
+    while (system_db.compare("") != 0) {
+      size_t len = system_db.length();
+
+      if (table_len > len && name.compare(0, len, system_db) == 0) {
+        return true;
+      }
+
+      system_db = std::string(innobase_system_databases[++i]);
+    }
+
+    return false;
+  } else {
+    return true;
+  }
+}
+
+static std::vector<std::string> innobase_system_databases_metrics({
     "mysql/", "information_schema/", "performance_schema/"
 });
 
-/** Determines if a table is a system table
+/** Determines if a table is a system table for metrics purposes
 @param[in]  name  table_name
 @return true if table is system table */
-static bool dict_mem_table_is_system(const std::string &name) {
+static bool dict_mem_table_is_system_metrics(const std::string &name) {
   /* Table has the following format: database/table and some system table are
   of the form SYS_* */
   if (name.find('/') == std::string::npos)
@@ -169,15 +199,15 @@ static bool dict_mem_table_is_system(const std::string &name) {
   return false;
 }
 
-void dict_add_system_prefix(const char *pfx) {
+void dict_add_system_metrics_prefix(const char *pfx) {
   if (!pfx || !pfx[0])
     return;
 
   std::string pfx_s = pfx;
   if (pfx_s[pfx_s.size()-1] != '/')
     pfx_s += '/';
-  if (std::find(innobase_system_databases.begin(), innobase_system_databases.end(), pfx_s) == innobase_system_databases.end())
-    innobase_system_databases.push_back(pfx_s);
+  if (std::find(innobase_system_databases_metrics.begin(), innobase_system_databases_metrics.end(), pfx_s) == innobase_system_databases_metrics.end())
+    innobase_system_databases_metrics.push_back(pfx_s);
 }
 
 dict_table_t *dict_mem_table_create(const char *name, space_id_t space,
@@ -213,6 +243,7 @@ dict_table_t *dict_mem_table_create(const char *name, space_id_t space,
   table->flags2 = (unsigned int)flags2;
   table->name.m_name = mem_strdup(name);
   table->is_system_table = dict_mem_table_is_system(table->name.m_name);
+  table->is_system_table_metrics = dict_mem_table_is_system_metrics(table->name.m_name);
   table->space = (unsigned int)space;
   table->dd_space_id = dd::INVALID_OBJECT_ID;
   table->n_t_cols = (unsigned int)(n_cols + table->get_n_sys_cols());

storage/innobase/dict/mem.h

@@ -109,5 +109,5 @@ const char *dict_add_col_name(const char *col_names, /*!< in: existing column
 /** Add the prefix 'pfx' to the list of database names that count as
  * system tables, rather than user tables, for the purposes of rows
  * {read,inserted,updated,deleted} counters. */
-void dict_add_system_prefix(const char *pfx);
+void dict_add_system_metrics_prefix(const char *pfx);
 #endif

storage/innobase/handler/ha_innodb.cc

@@ -5606,7 +5606,7 @@ static int innobase_init_files(dict_init_mode_t dict_init_mode,
     char *copy = strdup(extra_system_table_prefixes);
     char *saveptr, *tok;
     for (tok=my_strtok_r(copy, ",", &saveptr); tok; tok=my_strtok_r(NULL, ",", &saveptr)) {
-      dict_add_system_prefix(tok);
+      dict_add_system_metrics_prefix(tok);
     }
     free(copy);
   }
@@ -10299,7 +10299,7 @@ int ha_innobase::index_read(
   switch (ret) {
     case DB_SUCCESS:
       error = 0;
-      if (m_prebuilt->table->is_system_table) {
+      if (m_prebuilt->table->is_system_table_metrics) {
         srv_stats.n_system_rows_read.add(
             thd_get_thread_id(m_prebuilt->trx->mysql_thd), 1);
       } else if (!m_user_thd->security_context()->exclude_user_from_rows_read()) {
@@ -10547,7 +10547,7 @@ int ha_innobase::general_fetch(
   switch (ret) {
     case DB_SUCCESS:
       error = 0;
-      if (m_prebuilt->table->is_system_table) {
+      if (m_prebuilt->table->is_system_table_metrics) {
         srv_stats.n_system_rows_read.add(
             thd_get_thread_id(m_prebuilt->trx->mysql_thd), 1);
       } else if (!m_user_thd->security_context()->exclude_user_from_rows_read()) {

storage/innobase/include/dict0mem.h

@@ -2059,6 +2059,10 @@ struct dict_table_t {
   or performance_schema) */
   bool is_system_table;
 
+  /** True if the table stats should be seen as a system table (mysql, information_schema
+  or performance_schema) */
+  bool is_system_table_metrics;
+
   /** Hash chain node. */
   hash_node_t name_hash;
 

storage/innobase/mtr/mtr0log.cc

@@ -1282,6 +1282,7 @@ byte *mlog_parse_index(byte *ptr, const byte *end_ptr, dict_index_t **index) {
   ind->n_fields = n - n_dropped;
   ind->n_total_fields = n;
   table->is_system_table = false;
+  table->is_system_table_metrics = false;
 
   if (is_instant || is_versioned) {
     if (is_versioned) {
@@ -1548,6 +1549,7 @@ static byte *mlog_parse_index_8029(byte *ptr, const byte *end_ptr,
   ind->n_fields = n - n_dropped;
   ind->n_total_fields = n;
   table->is_system_table = false;
+  table->is_system_table_metrics = false;
 
   if (is_instant || is_versioned) {
     if (is_versioned) {

storage/innobase/row/row0mysql.cc

@@ -1485,7 +1485,7 @@ static dberr_t row_insert_for_mysql_using_cursor(const byte *mysql_rec,
     , with a latch. */
     dict_table_n_rows_inc(node->table);
 
-    if (node->table->is_system_table) {
+    if (node->table->is_system_table_metrics) {
       srv_stats.n_system_rows_inserted.inc();
     } else {
       srv_stats.n_rows_inserted.inc();
@@ -1679,7 +1679,7 @@ static dberr_t row_insert_for_mysql_using_ins_graph(const byte *mysql_rec,
 
   que_thr_stop_for_mysql_no_error(thr, trx);
 
-  if (table->is_system_table) {
+  if (table->is_system_table_metrics) {
     srv_stats.n_system_rows_inserted.inc();
   } else {
     srv_stats.n_rows_inserted.inc();
@@ -2225,7 +2225,7 @@ static dberr_t row_del_upd_for_mysql_using_cursor(row_prebuilt_t *prebuilt) {
   if (node->is_delete) {
     if (err == DB_SUCCESS) {
       dict_table_n_rows_dec(prebuilt->table);
-      if (node->table->is_system_table) {
+      if (node->table->is_system_table_metrics) {
         srv_stats.n_system_rows_deleted.inc();
       } else {
         srv_stats.n_rows_deleted.inc();
@@ -2239,7 +2239,7 @@ static dberr_t row_del_upd_for_mysql_using_cursor(row_prebuilt_t *prebuilt) {
     err = row_update_for_mysql_using_cursor(node, delete_entries, thr);
 
     if (err == DB_SUCCESS) {
-      if (node->table->is_system_table) {
+      if (node->table->is_system_table_metrics) {
         srv_stats.n_system_rows_updated.inc();
       } else {
         srv_stats.n_rows_updated.inc();
@@ -2408,13 +2408,13 @@ static dberr_t row_update_for_mysql_using_upd_graph(const byte *mysql_rec,
     with a latch. */
     dict_table_n_rows_dec(prebuilt->table);
 
-    if (table->is_system_table) {
+    if (table->is_system_table_metrics) {
       srv_stats.n_system_rows_deleted.inc();
     } else {
       srv_stats.n_rows_deleted.inc();
     }
   } else {
-    if (table->is_system_table) {
+    if (table->is_system_table_metrics) {
       srv_stats.n_system_rows_updated.inc();
     } else {
       srv_stats.n_rows_updated.inc();
@@ -2639,13 +2639,13 @@ dberr_t row_update_cascade_for_mysql(
     with a latch. */
     dict_table_n_rows_dec(table);
 
-    if (table->is_system_table) {
+    if (table->is_system_table_metrics) {
       srv_stats.n_system_rows_deleted.add((size_t)trx->id, 1);
     } else {
       srv_stats.n_rows_deleted.add((size_t)trx->id, 1);
     }
   } else {
-    if (table->is_system_table) {
+    if (table->is_system_table_metrics) {
       srv_stats.n_system_rows_updated.add((size_t)trx->id, 1);
     } else {
       srv_stats.n_rows_updated.add((size_t)trx->id, 1);