Skip to content

Commit db55e96

Browse files
committed
Online DDL: recognize shorter vitess artifact table name
Signed-off-by: Shlomi Noach <2607934+shlomi-noach@users.noreply.github.com>
1 parent 4f08558 commit db55e96

File tree

3 files changed

+7
-1
lines changed

3 files changed

+7
-1
lines changed

go/vt/schema/name_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,8 @@ func TestNameIsGCTableName(t *testing.T) {
3636
"_4e5dcf80_354b_11eb_82cd_f875a4d24e90_20201203114014_ghc",
3737
"_4e5dcf80_354b_11eb_82cd_f875a4d24e90_20201203114014_del",
3838
"_4e5dcf80_354b_11eb_82cd_f875a4d24e90_20201203114013_new",
39+
"_4e5dcf80_354b_11eb_82cd_f875a4d24e90_20201203114013_vrepl",
40+
"_4e5dcf80_354b_11eb_82cd_f875a4d24e90_20201203114013_vrp",
3941
"_table_old",
4042
"__table_old",
4143
}
@@ -63,6 +65,8 @@ func TestIsInternalOperationTableName(t *testing.T) {
6365
"_4e5dcf80_354b_11eb_82cd_f875a4d24e90_20201203114014_ghc",
6466
"_4e5dcf80_354b_11eb_82cd_f875a4d24e90_20201203114014_del",
6567
"_4e5dcf80_354b_11eb_82cd_f875a4d24e90_20201203114013_new",
68+
"_4e5dcf80_354b_11eb_82cd_f875a4d24e90_20201203114013_vrepl",
69+
"_4e5dcf80_354b_11eb_82cd_f875a4d24e90_20201203114013_vrp",
6670
"_table_old",
6771
"__table_old",
6872
"_vt_DROP_6ace8bcef73211ea87e9f875a4d24e90_20200915120410",

go/vt/schema/online_ddl.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ import (
3232

3333
var (
3434
onlineDdlUUIDRegexp = regexp.MustCompile(`^[0-f]{8}_[0-f]{4}_[0-f]{4}_[0-f]{4}_[0-f]{12}$`)
35-
onlineDDLGeneratedTableNameRegexp = regexp.MustCompile(`^_[0-f]{8}_[0-f]{4}_[0-f]{4}_[0-f]{4}_[0-f]{12}_([0-9]{14})_(gho|ghc|del|new|vrepl)$`)
35+
onlineDDLGeneratedTableNameRegexp = regexp.MustCompile(`^_[0-f]{8}_[0-f]{4}_[0-f]{4}_[0-f]{4}_[0-f]{12}_([0-9]{14})_(gho|ghc|del|new|vrepl|vrp)$`)
3636
ptOSCGeneratedTableNameRegexp = regexp.MustCompile(`^_.*_old$`)
3737
migrationContextValidatorRegexp = regexp.MustCompile(`^[\w:-]*$`)
3838
)

go/vt/schema/online_ddl_test.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,7 @@ func TestIsOnlineDDLTableName(t *testing.T) {
107107
"_4e5dcf80_354b_11eb_82cd_f875a4d24e90_20201203114014_del",
108108
"_4e5dcf80_354b_11eb_82cd_f875a4d24e90_20201203114013_new",
109109
"_84371a37_6153_11eb_9917_f875a4d24e90_20210128122816_vrepl",
110+
"_84371a37_6153_11eb_9917_f875a4d24e90_20210128122816_vrp",
110111
"_table_old",
111112
"__table_old",
112113
}
@@ -121,6 +122,7 @@ func TestIsOnlineDDLTableName(t *testing.T) {
121122
"_table_ghc",
122123
"_table_del",
123124
"_table_vrepl",
125+
"_table_vrp",
124126
"table_old",
125127
}
126128
for _, tableName := range irrelevantNames {

0 commit comments

Comments
 (0)