Support new Vitess internal table name format (mysql#105) (mysql#129)

* Support new Vitess internal table name format

* Update sql/table.cc



* Update sql/table.cc



* Update sql/table.cc



* optimize regexp search



* match start of name



---------

Signed-off-by: Shlomi Noach <[email protected]>
Co-authored-by: Patrick Reynolds <[email protected]>

Author: 2 people

mysql-test/r/foreign_key_ignored_tables.result

@@ -1,6 +1,7 @@
 drop table if exists t0,t1,t2,t3,t4;
 drop table if exists t0,t5,t6,t7,t8,t9,t1_1,t1_2,t9_1,t9_2;
 drop table if exists _84371a37_6153_11eb_9917_f875a4d24e90_20210128122816_vrepl, _vt_HOLD_6ace8bcef73211ea87e9f875a4d24e90_20200915120410, child_table, child_table_old, child_table_new;
+drop table if exists _vt_vrp_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_, _vt_hld_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_;
 drop table if exists parent_table, parent_table_old, parent_table_new;
 SET FOREIGN_KEY_CHECKS=1;
 CREATE TABLE parent_table (
@@ -35,10 +36,28 @@ KEY parent_id_idx (parent_id),
 CONSTRAINT `hold_child_parent_fk` FOREIGN KEY (parent_id) REFERENCES parent_table(id) ON DELETE NO ACTION
 );
 insert into _vt_HOLD_6ace8bcef73211ea87e9f875a4d24e90_20200915120410 select * from child_table;
+CREATE TABLE _vt_hld_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_ (
+id INT NOT NULL,
+parent_id INT,
+PRIMARY KEY (id),
+KEY parent_id_idx (parent_id),
+CONSTRAINT `hld_child_parent_fk` FOREIGN KEY (parent_id) REFERENCES parent_table(id) ON DELETE NO ACTION
+);
+insert into _vt_hld_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_ select * from child_table;
+CREATE TABLE _vt_vrp_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_ (
+id INT NOT NULL,
+parent_id INT,
+PRIMARY KEY (id),
+KEY parent_id_idx (parent_id),
+CONSTRAINT `vrp_child_parent_fk` FOREIGN KEY (parent_id) REFERENCES parent_table(id) ON DELETE NO ACTION
+);
+insert into _vt_vrp_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_ select * from child_table;
 insert into child_table values (100, 100);
 ERROR 23000: Cannot add or update a child row: a foreign key constraint fails (`test`.`child_table`, CONSTRAINT `child_parent_fk` FOREIGN KEY (`parent_id`) REFERENCES `parent_table` (`id`))
 insert into _84371a37_6153_11eb_9917_f875a4d24e90_20210128122816_vrepl values (101, 101);
 insert into _vt_HOLD_6ace8bcef73211ea87e9f875a4d24e90_20200915120410 values (102, 102);
+insert into _vt_hld_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_ values (103, 103);
+insert into _vt_vrp_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_ values (103, 103);
 delete from parent_table where id=1;
 ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`child_table`, CONSTRAINT `child_parent_fk` FOREIGN KEY (`parent_id`) REFERENCES `parent_table` (`id`))
 delete from child_table;
@@ -199,5 +218,6 @@ id	parent_id
 13	2
 400	400
 drop table _84371a37_6153_11eb_9917_f875a4d24e90_20210128122816_vrepl;
+drop table if exists _vt_vrp_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_, _vt_hld_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_;
 drop table if exists _84371a37_6153_11eb_9917_f875a4d24e90_20210128122816_vrepl, _vt_HOLD_6ace8bcef73211ea87e9f875a4d24e90_20200915120410, child_table, child_table_old, child_table_new;
 drop table if exists parent_table, parent_table_old, parent_table_new;

mysql-test/t/foreign_key_ignored_tables.test

@@ -10,6 +10,7 @@ drop table if exists t0,t1,t2,t3,t4;
 # Clear up from other tests (to ensure that SHOW TABLES below is right)
 drop table if exists t0,t5,t6,t7,t8,t9,t1_1,t1_2,t9_1,t9_2;
 drop table if exists _84371a37_6153_11eb_9917_f875a4d24e90_20210128122816_vrepl, _vt_HOLD_6ace8bcef73211ea87e9f875a4d24e90_20200915120410, child_table, child_table_old, child_table_new;
+drop table if exists _vt_vrp_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_, _vt_hld_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_;
 drop table if exists parent_table, parent_table_old, parent_table_new;
 --enable_warnings
 
@@ -50,11 +51,31 @@ CREATE TABLE _vt_HOLD_6ace8bcef73211ea87e9f875a4d24e90_20200915120410 (
 );
 insert into _vt_HOLD_6ace8bcef73211ea87e9f875a4d24e90_20200915120410 select * from child_table;
 
-# For normal tables this should be invalid, but for this table it will work:
+CREATE TABLE _vt_hld_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_ (
+  id INT NOT NULL,
+  parent_id INT,
+  PRIMARY KEY (id),
+  KEY parent_id_idx (parent_id),
+  CONSTRAINT `hld_child_parent_fk` FOREIGN KEY (parent_id) REFERENCES parent_table(id) ON DELETE NO ACTION
+);
+insert into _vt_hld_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_ select * from child_table;
+
+CREATE TABLE _vt_vrp_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_ (
+  id INT NOT NULL,
+  parent_id INT,
+  PRIMARY KEY (id),
+  KEY parent_id_idx (parent_id),
+  CONSTRAINT `vrp_child_parent_fk` FOREIGN KEY (parent_id) REFERENCES parent_table(id) ON DELETE NO ACTION
+);
+insert into _vt_vrp_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_ select * from child_table;
+
+# For normal tables this should be invalid, but for internal vitess tables it will work:
 --error ER_NO_REFERENCED_ROW_2
 insert into child_table values (100, 100);
 insert into _84371a37_6153_11eb_9917_f875a4d24e90_20210128122816_vrepl values (101, 101);
 insert into _vt_HOLD_6ace8bcef73211ea87e9f875a4d24e90_20200915120410 values (102, 102);
+insert into _vt_hld_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_ values (103, 103);
+insert into _vt_vrp_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_ values (103, 103);
 
 # This should not work:
 --error ER_ROW_IS_REFERENCED_2
@@ -214,6 +235,7 @@ select * from child_table;
 drop table _84371a37_6153_11eb_9917_f875a4d24e90_20210128122816_vrepl;
 # Cleanup
 --disable_warnings
+drop table if exists _vt_vrp_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_, _vt_hld_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_;
 drop table if exists _84371a37_6153_11eb_9917_f875a4d24e90_20210128122816_vrepl, _vt_HOLD_6ace8bcef73211ea87e9f875a4d24e90_20200915120410, child_table, child_table_old, child_table_new;
 drop table if exists parent_table, parent_table_old, parent_table_new;
 --enable_warnings

sql/table.cc

@@ -175,6 +175,17 @@ const std::regex vitess_vrepl_table_name_regex = std::regex(".*_[0-f]{8}_[0-f]{4
 // - "test/_vt_HOLD_6ace8bcef73211ea87e9f875a4d24e90_20200915120410"
 const std::regex vitess_gc_table_name_regex = std::regex(".*_vt_(HOLD|PURGE|EVAC|DROP)_[0-f]{32}_[0-9]{14}$");
 
+// New vitess table names have a unified format, e.g.:
+// - _vt_vrp_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_ for a vreplication table
+// - _vt_hld_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_ for a lifecycle table
+// The new name format will eventually replace the old format. `vitess_vrepl_table_name_regex` and
+// `vitess_gc_table_name_regex` will eventually be deprecated and removed.
+const std::regex vitess_internal_table_name_regex = std::regex("^_vt_[a-zA-Z0-9]{3}_[0-f]{32}_[0-9]{14}_$");
+// Table name if fixed.
+const int vitess_internal_table_name_length = 56;
+/* Vitess lifecycle table name indicator */
+LEX_CSTRING VITESS_INTERNAL_TABLE_PREFIX = {STRING_WITH_LEN("_vt_")};
+
 /* Functions defined in this file */
 
 static Item *create_view_field(THD *thd, Table_ref *view, Item **field_ref,
@@ -8018,6 +8029,21 @@ bool Table_name_inspector::skip_fk_checks() {
       return true;
     }
   }
+  // New vitess naming format, e.g. `_vt_drp_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_`, can be identified via:
+  // - Expected fixed table length 56
+  // - Ends with "_"
+  // - Table name (ignore possible InnoDB schema encoding) starts with "_vt_"
+  // - Matches regexp
+  int table_name_length = strlen(this->table_name);
+  if (table_name_length >= vitess_internal_table_name_length) {
+    if (this->table_name[table_name_length - 1] == '_') {
+      if (strncmp(&this->table_name[table_name_length - vitess_internal_table_name_length], VITESS_INTERNAL_TABLE_PREFIX.str, VITESS_INTERNAL_TABLE_PREFIX.length) == 0) {
+        if (std::regex_match(&this->table_name[table_name_length - vitess_internal_table_name_length], vitess_internal_table_name_regex)) {
+          return true;
+        }
+      }
+    }
+  }
   return false;
 }