mysql,terror: add plugin error msg (pingcap#173)

lyonzhi · Jan 14, 2019 · 301bf58 · 301bf58
1 parent 98cf96a
commit 301bf58
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/mysql/errcode.go b/mysql/errcode.go
@@ -915,9 +915,18 @@ const (
 	ErrWindowFunctionIgnoresFrame                                   = 3599
 
 	// TiDB self-defined errors.
-	ErrMemExceedThreshold = 8001
-	ErrForUpdateCantRetry = 8002
-	ErrAdminCheckTable    = 8003
+	ErrMemExceedThreshold         = 8001
+	ErrForUpdateCantRetry         = 8002
+	ErrAdminCheckTable            = 8003
+	ErrInvalidPluginID            = 8101
+	ErrInvalidPluginManifest      = 8102
+	ErrInvalidPluginName          = 8103
+	ErrInvalidPluginVersion       = 8104
+	ErrDuplicatePlugin            = 8105
+	ErrInvalidPluginSysVarName    = 8106
+	ErrRequireVersionCheckFail    = 8107
+	ErrUnsupportedReloadPlugin    = 8018
+	ErrUnsupportedReloadPluginVar = 8019
 
 	// TiKV/PD errors.
 	ErrPDServerTimeout    = 9001

diff --git a/mysql/errname.go b/mysql/errname.go
@@ -916,6 +916,16 @@ var MySQLErrName = map[uint16]string{
 	ErrForUpdateCantRetry: "[%d] can not retry select for update statement",
 	ErrAdminCheckTable:    "TiDB admin check table failed.",
 
+	ErrInvalidPluginID:            "Wrong plugin id: %s, valid plugin id is [name]-[version], both name and version should not contain '-'",
+	ErrInvalidPluginManifest:      "Cannot read plugin %s's manifest",
+	ErrInvalidPluginName:          "Plugin load with %s but got wrong name %s",
+	ErrInvalidPluginVersion:       "Plugin load with %s but got %s",
+	ErrDuplicatePlugin:            "Plugin [%s] is redeclared",
+	ErrInvalidPluginSysVarName:    "Plugin %s's sysVar %s must start with its plugin name %s",
+	ErrRequireVersionCheckFail:    "Plugin %s require %s be %v but got %v",
+	ErrUnsupportedReloadPlugin:    "Plugin %s isn't loaded so cannot be reloaded",
+	ErrUnsupportedReloadPluginVar: "Reload plugin with different sysVar is unsupported %v",
+
 	// TiKV/PD errors.
 	ErrPDServerTimeout:    "PD server timeout",
 	ErrTiKVServerTimeout:  "TiKV server timeout",

diff --git a/terror/terror.go b/terror/terror.go
@@ -82,6 +82,7 @@ const (
 	ClassJSON
 	ClassTiKV
 	ClassSession
+	ClassPlugin
 	// Add more as needed.
 )
 
@@ -109,6 +110,7 @@ var errClz2Str = map[ErrClass]string{
 	ClassJSON:       "json",
 	ClassTiKV:       "tikv",
 	ClassSession:    "session",
+	ClassPlugin:     "plugin",
 }
 
 // String implements fmt.Stringer interface.