update: 添加部分utf8mb3排序规则支持(utf8mb3_general_ci,utf8mb3_unicode_ci,utf8m…

…b3_bin) (#603)
hanchuanchuan · Oct 29, 2023 · b426096 · b426096
1 parent 078585e
commit b426096
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/docs/ghost.md b/docs/ghost.md
@@ -2,8 +2,8 @@
 
 ### gh-ost
 
-- gh-ost is built-in GoInception. No additional installation.
-- About Stop, Pause, Recover are contained in GoInception command.
+- gh-ost is built-in GoInception. No additional installation. About Stop, Pause, Recover are contained in GoInception command.
+- Support calling gh-ost in binary mode, the parameter switch is `ghost_bin_dir`, please refer to the `osc_bin_dir` parameter of pt-osc for usage, if this parameter is not specified, it will still be called with the built-in gh-ost.
 
 #### Options
 

diff --git a/docs/zh/ghost.md b/docs/zh/ghost.md
@@ -1,7 +1,7 @@
 # gh-ost
 
-- 内置gh-ost源码(`v1.0.48`)，因此无须下载。
-- 手动终止和暂停及恢复功能已开放相应命令，因此隐藏相关参数。
+- 内置gh-ost源码(`v1.0.48`)，因此无须下载。手动终止和暂停及恢复功能已开放相应命令，因此隐藏相关参数。
+- 支持binary方式调用gh-ost, 参数开关为`ghost_bin_dir`, 使用方式请参考pt-osc的`osc_bin_dir`参数,在未指定该参数时仍以内置源码方式调用.
 
 ####参数设置
 

diff --git a/util/charset/charset.go b/util/charset/charset.go
@@ -191,8 +191,22 @@ func GetCollations() []*Collation {
 	return collations
 }
 
+func utf8Alias(csname string) string {
+	switch csname {
+	case "utf8mb3_bin":
+		csname = "utf8_bin"
+	case "utf8mb3_unicode_ci":
+		csname = "utf8_unicode_ci"
+	case "utf8mb3_general_ci":
+		csname = "utf8_general_ci"
+	default:
+	}
+	return csname
+}
+
 func GetCollationByName(name string) (*Collation, error) {
-	collation, ok := collationsNameMap[strings.ToLower(name)]
+	csname := utf8Alias(strings.ToLower(name))
+	collation, ok := collationsNameMap[csname]
 	if !ok {
 		return nil, ErrUnknownCollation.GenWithStackByArgs(name)
 	}