提交 af21009e 编写于 作者: martianzhang's avatar martianzhang

vendor daily update

上级 d4242989
...@@ -730,6 +730,7 @@ const ( ...@@ -730,6 +730,7 @@ const (
AdminChecksumTable AdminChecksumTable
AdminShowSlow AdminShowSlow
AdminShowNextRowID AdminShowNextRowID
AdminRestoreTable
) )
// HandleRange represents a range where handle value >= Begin and < End. // HandleRange represents a range where handle value >= Begin and < End.
......
...@@ -411,6 +411,7 @@ var tokenMap = map[string]int{ ...@@ -411,6 +411,7 @@ var tokenMap = map[string]int{
"RESPECT": respect, "RESPECT": respect,
"REPLICATION": replication, "REPLICATION": replication,
"RESTRICT": restrict, "RESTRICT": restrict,
"RESTORE": restore,
"REVERSE": reverse, "REVERSE": reverse,
"REVOKE": revoke, "REVOKE": revoke,
"RIGHT": right, "RIGHT": right,
......
...@@ -54,6 +54,7 @@ const ( ...@@ -54,6 +54,7 @@ const (
ActionModifyTableCharsetAndCollate ActionType = 22 ActionModifyTableCharsetAndCollate ActionType = 22
ActionTruncateTablePartition ActionType = 23 ActionTruncateTablePartition ActionType = 23
ActionDropView ActionType = 24 ActionDropView ActionType = 24
ActionRestoreTable ActionType = 25
) )
// AddIndexStr is a string related to the operation of "add index". // AddIndexStr is a string related to the operation of "add index".
...@@ -84,6 +85,7 @@ var actionMap = map[ActionType]string{ ...@@ -84,6 +85,7 @@ var actionMap = map[ActionType]string{
ActionModifyTableCharsetAndCollate: "modify table charset and collate", ActionModifyTableCharsetAndCollate: "modify table charset and collate",
ActionTruncateTablePartition: "truncate partition", ActionTruncateTablePartition: "truncate partition",
ActionDropView: "drop view", ActionDropView: "drop view",
ActionRestoreTable: "restore table",
} }
// String return current ddl action in string // String return current ddl action in string
......
...@@ -482,6 +482,7 @@ import ( ...@@ -482,6 +482,7 @@ import (
tidbHJ "TIDB_HJ" tidbHJ "TIDB_HJ"
tidbSMJ "TIDB_SMJ" tidbSMJ "TIDB_SMJ"
tidbINLJ "TIDB_INLJ" tidbINLJ "TIDB_INLJ"
restore "RESTORE"
builtinAddDate builtinAddDate
builtinBitAnd builtinBitAnd
...@@ -2995,7 +2996,7 @@ UnReservedKeyword: ...@@ -2995,7 +2996,7 @@ UnReservedKeyword:
TiDBKeyword: TiDBKeyword:
"ADMIN" | "BUCKETS" | "CANCEL" | "DDL" | "JOBS" | "JOB" | "STATS" | "STATS_META" | "STATS_HISTOGRAMS" | "STATS_BUCKETS" | "STATS_HEALTHY" | "TIDB" | "TIDB_HJ" | "TIDB_SMJ" | "TIDB_INLJ" "ADMIN" | "BUCKETS" | "CANCEL" | "DDL" | "JOBS" | "JOB" | "STATS" | "STATS_META" | "STATS_HISTOGRAMS" | "STATS_BUCKETS" | "STATS_HEALTHY" | "TIDB" | "TIDB_HJ" | "TIDB_SMJ" | "TIDB_INLJ" | "RESTORE"
NotKeywordToken: NotKeywordToken:
"ADDDATE" | "BIT_AND" | "BIT_OR" | "BIT_XOR" | "CAST" | "COPY" | "COUNT" | "CURTIME" | "DATE_ADD" | "DATE_SUB" | "EXTRACT" | "GET_FORMAT" | "GROUP_CONCAT" "ADDDATE" | "BIT_AND" | "BIT_OR" | "BIT_XOR" | "CAST" | "COPY" | "COUNT" | "CURTIME" | "DATE_ADD" | "DATE_SUB" | "EXTRACT" | "GET_FORMAT" | "GROUP_CONCAT"
...@@ -5763,6 +5764,13 @@ AdminStmt: ...@@ -5763,6 +5764,13 @@ AdminStmt:
Index: string($5), Index: string($5),
} }
} }
| "ADMIN" "RESTORE" "TABLE" "BY" "JOB" NumList
{
$$ = &ast.AdminStmt{
Tp: ast.AdminRestoreTable,
JobIDs: $6.([]int64),
}
}
| "ADMIN" "CLEANUP" "INDEX" TableName Identifier | "ADMIN" "CLEANUP" "INDEX" TableName Identifier
{ {
$$ = &ast.AdminStmt{ $$ = &ast.AdminStmt{
......
...@@ -111,106 +111,106 @@ ...@@ -111,106 +111,106 @@
"revisionTime": "2018-10-24T15:10:47Z" "revisionTime": "2018-10-24T15:10:47Z"
}, },
{ {
"checksumSHA1": "/y8A3Ro/qdM6f7XFR0JADJl0sFw=", "checksumSHA1": "oPVvRBag6XbaB4dN38RkdejKr70=",
"path": "github.com/pingcap/parser", "path": "github.com/pingcap/parser",
"revision": "5d5a6dd34655f3d11723db47479541d32d2c76f2", "revision": "24cab7ea76283def175c657d7572bf4764fead4c",
"revisionTime": "2019-01-03T13:14:33Z" "revisionTime": "2019-01-04T04:24:18Z"
}, },
{ {
"checksumSHA1": "TmSk8q5zaa7SI3G9VJpal7z8o+4=", "checksumSHA1": "8hcQ9TZ4Uy3ucYasBUPUTA/Km34=",
"path": "github.com/pingcap/parser/ast", "path": "github.com/pingcap/parser/ast",
"revision": "5d5a6dd34655f3d11723db47479541d32d2c76f2", "revision": "24cab7ea76283def175c657d7572bf4764fead4c",
"revisionTime": "2019-01-03T13:14:33Z" "revisionTime": "2019-01-04T04:24:18Z"
}, },
{ {
"checksumSHA1": "skWGV4FNvD3vr+5olepaPPnylUw=", "checksumSHA1": "skWGV4FNvD3vr+5olepaPPnylUw=",
"path": "github.com/pingcap/parser/auth", "path": "github.com/pingcap/parser/auth",
"revision": "5d5a6dd34655f3d11723db47479541d32d2c76f2", "revision": "24cab7ea76283def175c657d7572bf4764fead4c",
"revisionTime": "2019-01-03T13:14:33Z" "revisionTime": "2019-01-04T04:24:18Z"
}, },
{ {
"checksumSHA1": "t4UHo966WzU9Z0IJkyGHRp0loOk=", "checksumSHA1": "t4UHo966WzU9Z0IJkyGHRp0loOk=",
"path": "github.com/pingcap/parser/charset", "path": "github.com/pingcap/parser/charset",
"revision": "5d5a6dd34655f3d11723db47479541d32d2c76f2", "revision": "24cab7ea76283def175c657d7572bf4764fead4c",
"revisionTime": "2019-01-03T13:14:33Z" "revisionTime": "2019-01-04T04:24:18Z"
}, },
{ {
"checksumSHA1": "SInoXbsRe0tnBwmatmtZYfSFbdk=", "checksumSHA1": "SInoXbsRe0tnBwmatmtZYfSFbdk=",
"path": "github.com/pingcap/parser/format", "path": "github.com/pingcap/parser/format",
"revision": "5d5a6dd34655f3d11723db47479541d32d2c76f2", "revision": "24cab7ea76283def175c657d7572bf4764fead4c",
"revisionTime": "2019-01-03T13:14:33Z" "revisionTime": "2019-01-04T04:24:18Z"
}, },
{ {
"checksumSHA1": "fMXmawvMELfwCuO/vrNtkUjQN/0=", "checksumSHA1": "ZADwr2/PcEd9VI3XF9OvN4HkJ+8=",
"path": "github.com/pingcap/parser/model", "path": "github.com/pingcap/parser/model",
"revision": "5d5a6dd34655f3d11723db47479541d32d2c76f2", "revision": "24cab7ea76283def175c657d7572bf4764fead4c",
"revisionTime": "2019-01-03T13:14:33Z" "revisionTime": "2019-01-04T04:24:18Z"
}, },
{ {
"checksumSHA1": "kkqyRzO7TCqnABxjJEo+JclJZLM=", "checksumSHA1": "kkqyRzO7TCqnABxjJEo+JclJZLM=",
"path": "github.com/pingcap/parser/mysql", "path": "github.com/pingcap/parser/mysql",
"revision": "5d5a6dd34655f3d11723db47479541d32d2c76f2", "revision": "24cab7ea76283def175c657d7572bf4764fead4c",
"revisionTime": "2019-01-03T13:14:33Z" "revisionTime": "2019-01-04T04:24:18Z"
}, },
{ {
"checksumSHA1": "mxpiJJ3b08I0o0Sd2rJLYMwz7uw=", "checksumSHA1": "mxpiJJ3b08I0o0Sd2rJLYMwz7uw=",
"path": "github.com/pingcap/parser/opcode", "path": "github.com/pingcap/parser/opcode",
"revision": "5d5a6dd34655f3d11723db47479541d32d2c76f2", "revision": "24cab7ea76283def175c657d7572bf4764fead4c",
"revisionTime": "2019-01-03T13:14:33Z" "revisionTime": "2019-01-04T04:24:18Z"
}, },
{ {
"checksumSHA1": "XvnUllvwMYd6HrMvMiKnn4cGN2M=", "checksumSHA1": "XvnUllvwMYd6HrMvMiKnn4cGN2M=",
"path": "github.com/pingcap/parser/terror", "path": "github.com/pingcap/parser/terror",
"revision": "5d5a6dd34655f3d11723db47479541d32d2c76f2", "revision": "24cab7ea76283def175c657d7572bf4764fead4c",
"revisionTime": "2019-01-03T13:14:33Z" "revisionTime": "2019-01-04T04:24:18Z"
}, },
{ {
"checksumSHA1": "CpuZhpMNeho4tIFPwY2GUDvuEfQ=", "checksumSHA1": "CpuZhpMNeho4tIFPwY2GUDvuEfQ=",
"path": "github.com/pingcap/parser/types", "path": "github.com/pingcap/parser/types",
"revision": "5d5a6dd34655f3d11723db47479541d32d2c76f2", "revision": "24cab7ea76283def175c657d7572bf4764fead4c",
"revisionTime": "2019-01-03T13:14:33Z" "revisionTime": "2019-01-04T04:24:18Z"
}, },
{ {
"checksumSHA1": "MxoLdFWi8nwd0uqTJnYqw+JaDAY=", "checksumSHA1": "MxoLdFWi8nwd0uqTJnYqw+JaDAY=",
"path": "github.com/pingcap/tidb/sessionctx/stmtctx", "path": "github.com/pingcap/tidb/sessionctx/stmtctx",
"revision": "0147e0cece4481807289cc4cd867cb8d2abd3145", "revision": "7ee6811d9777bc2ae281292bf2f6313abb64b5c3",
"revisionTime": "2019-01-03T09:11:14Z" "revisionTime": "2019-01-04T07:15:18Z"
}, },
{ {
"checksumSHA1": "wlD7aGqTJ5eBQYK0ub4b2Ick1j8=", "checksumSHA1": "wlD7aGqTJ5eBQYK0ub4b2Ick1j8=",
"path": "github.com/pingcap/tidb/types", "path": "github.com/pingcap/tidb/types",
"revision": "0147e0cece4481807289cc4cd867cb8d2abd3145", "revision": "7ee6811d9777bc2ae281292bf2f6313abb64b5c3",
"revisionTime": "2019-01-03T09:11:14Z" "revisionTime": "2019-01-04T07:15:18Z"
}, },
{ {
"checksumSHA1": "DWVD7+ygtT66IQ+cqXmMJ5OVqUk=", "checksumSHA1": "DWVD7+ygtT66IQ+cqXmMJ5OVqUk=",
"path": "github.com/pingcap/tidb/types/json", "path": "github.com/pingcap/tidb/types/json",
"revision": "0147e0cece4481807289cc4cd867cb8d2abd3145", "revision": "7ee6811d9777bc2ae281292bf2f6313abb64b5c3",
"revisionTime": "2019-01-03T09:11:14Z" "revisionTime": "2019-01-04T07:15:18Z"
}, },
{ {
"checksumSHA1": "6vi/eCZXqNTa5eAUpxDZet4LPlY=", "checksumSHA1": "6vi/eCZXqNTa5eAUpxDZet4LPlY=",
"path": "github.com/pingcap/tidb/types/parser_driver", "path": "github.com/pingcap/tidb/types/parser_driver",
"revision": "0147e0cece4481807289cc4cd867cb8d2abd3145", "revision": "7ee6811d9777bc2ae281292bf2f6313abb64b5c3",
"revisionTime": "2019-01-03T09:11:14Z" "revisionTime": "2019-01-04T07:15:18Z"
}, },
{ {
"checksumSHA1": "SS7twHZofFKr8w/pwIKmkp3u5qU=", "checksumSHA1": "SS7twHZofFKr8w/pwIKmkp3u5qU=",
"path": "github.com/pingcap/tidb/util/execdetails", "path": "github.com/pingcap/tidb/util/execdetails",
"revision": "0147e0cece4481807289cc4cd867cb8d2abd3145", "revision": "7ee6811d9777bc2ae281292bf2f6313abb64b5c3",
"revisionTime": "2019-01-03T09:11:14Z" "revisionTime": "2019-01-04T07:15:18Z"
}, },
{ {
"checksumSHA1": "nUC7zVoAMNR2a+z2iGqHoN2AkFE=", "checksumSHA1": "nUC7zVoAMNR2a+z2iGqHoN2AkFE=",
"path": "github.com/pingcap/tidb/util/hack", "path": "github.com/pingcap/tidb/util/hack",
"revision": "0147e0cece4481807289cc4cd867cb8d2abd3145", "revision": "7ee6811d9777bc2ae281292bf2f6313abb64b5c3",
"revisionTime": "2019-01-03T09:11:14Z" "revisionTime": "2019-01-04T07:15:18Z"
}, },
{ {
"checksumSHA1": "xSyepiuqsoaaeDch7cXeumvVHKM=", "checksumSHA1": "xSyepiuqsoaaeDch7cXeumvVHKM=",
"path": "github.com/pingcap/tidb/util/memory", "path": "github.com/pingcap/tidb/util/memory",
"revision": "0147e0cece4481807289cc4cd867cb8d2abd3145", "revision": "7ee6811d9777bc2ae281292bf2f6313abb64b5c3",
"revisionTime": "2019-01-03T09:11:14Z" "revisionTime": "2019-01-04T07:15:18Z"
}, },
{ {
"checksumSHA1": "SmYeIK/fIYXNu8IKxD6HOVQVTuU=", "checksumSHA1": "SmYeIK/fIYXNu8IKxD6HOVQVTuU=",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册