Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 11 additions & 7 deletions go/vt/schema/tablegc.go
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ const (
)

const (
GCTableNameExpression string = `^_vt_(HOLD|PURGE|EVAC|DROP)_([0-f]{32})_([0-9]{14})$`
GCTableNameExpression string = `^_vt_(HOLD|PURGE|EVAC|DROP|hold|purge|evac|drop)_([0-f]{32})_([0-9]{14})$`
// NewGCTableNameExpression parses new intrnal table name format, e.g. _vt_hld_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_
NewGCTableNameExpression string = `^_vt_(hld|prg|evc|drp)_([0-f]{32})_([0-9]{14})_$`
)
Expand All @@ -55,14 +55,18 @@ var (
gcTableNameRegexp = regexp.MustCompile(GCTableNameExpression)

gcStates = map[string]TableGCState{
string(HoldTableGCState): HoldTableGCState,
string(HoldTableGCState): HoldTableGCState,
strings.ToLower(string(HoldTableGCState)): HoldTableGCState,
"hld": HoldTableGCState,
string(PurgeTableGCState): PurgeTableGCState,
"prg": PurgeTableGCState,
string(EvacTableGCState): EvacTableGCState,
"evc": EvacTableGCState,
string(DropTableGCState): DropTableGCState,
"drp": DropTableGCState,
strings.ToLower(string(PurgeTableGCState)): PurgeTableGCState,
"prg": PurgeTableGCState,
string(EvacTableGCState): EvacTableGCState,
strings.ToLower(string(EvacTableGCState)): EvacTableGCState,
"evc": EvacTableGCState,
string(DropTableGCState): DropTableGCState,
strings.ToLower(string(DropTableGCState)): DropTableGCState,
"drp": DropTableGCState,
}
)

Expand Down
30 changes: 30 additions & 0 deletions go/vt/schema/tablegc_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,11 @@ func TestIsGCTableName(t *testing.T) {
"_vt_DROP_6ace8bcef73211ea87e9f875a4d24e90_20200915120410",
"_vt_HOLD_6ace8bcef73211ea87e9f875a4d24e90_20200915120410",
"_vt_drp_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_",
// Test lowercase variants for lower_case_table_names=1 compatibility
"_vt_drop_6ace8bcef73211ea87e9f875a4d24e90_20200915120410",
"_vt_hold_6ace8bcef73211ea87e9f875a4d24e90_20200915120410",
"_vt_purge_6ace8bcef73211ea87e9f875a4d24e90_20200915120410",
"_vt_evac_6ace8bcef73211ea87e9f875a4d24e90_20200915120410",
}
for _, tableName := range names {
t.Run(tableName, func(t *testing.T) {
Expand Down Expand Up @@ -166,6 +171,31 @@ func TestAnalyzeGCTableName(t *testing.T) {
tableName: "_vt_xyz_6ace8bcef73211ea87e9f875a4d24e90_20200915120410_",
isGC: false,
},
// Test lowercase variants for lower_case_table_names=1 compatibility
{
tableName: "_vt_drop_6ace8bcef73211ea87e9f875a4d24e90_20200915120410",
state: DropTableGCState,
t: baseTime,
isGC: true,
},
{
tableName: "_vt_hold_6ace8bcef73211ea87e9f875a4d24e90_20200915120410",
state: HoldTableGCState,
t: baseTime,
isGC: true,
},
{
tableName: "_vt_purge_6ace8bcef73211ea87e9f875a4d24e90_20200915120410",
state: PurgeTableGCState,
t: baseTime,
isGC: true,
},
{
tableName: "_vt_evac_6ace8bcef73211ea87e9f875a4d24e90_20200915120410",
state: EvacTableGCState,
t: baseTime,
isGC: true,
},
}
for _, ts := range tt {
t.Run(ts.tableName, func(t *testing.T) {
Expand Down
Loading