From 4bb7b8a6ea6104ec24f7b3f7fc19cf42b96237b2 Mon Sep 17 00:00:00 2001 From: aliiohs Date: Mon, 18 Mar 2019 17:02:39 +0800 Subject: [PATCH] Merge branch 'master' into support_update_Pump_or_Drainer_status_2019_3_14 # Conflicts: # parser.go --- parser.y | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/parser.y b/parser.y index e8a61da3e..611796c4e 100644 --- a/parser.y +++ b/parser.y @@ -181,6 +181,8 @@ import ( minuteMicrosecond "MINUTE_MICROSECOND" minuteSecond "MINUTE_SECOND" mod "MOD" + node_id "NODE_ID" + node_state "NODE_STATE" not "NOT" noWriteToBinLog "NO_WRITE_TO_BINLOG" nthValue "NTH_VALUE" @@ -623,6 +625,7 @@ import ( RevokeRoleStmt "Revoke role statement" RollbackStmt "ROLLBACK statement" SetStmt "Set variable statement" + ChangeStmt "Change statement" SetRoleStmt "Set active role statement" SetDefaultRoleStmt "Set default statement for some user" ShowStmt "Show engines/databases/tables/user/columns/warnings/status statement" @@ -5541,6 +5544,24 @@ UnionSelect: UnionOpt: DefaultTrueDistinctOpt +/********************Change Statement*******************************/ +ChangeStmt: + "CHANGE" "PUMP" "TO" "NODE_STATE" eq stringLit forKwd "NODE_ID" stringLit + { + $$ = &ast.ChangeStmt{ + NodeType: ast.PumpType, + State: $6, + NodeID: $9, + } + } +| "CHANGE" "DRAINER" "TO" "NODE_STATE" eq stringLit forKwd "NODE_ID" stringLit + { + $$ = &ast.ChangeStmt{ + NodeType: ast.DrainerType, + State: $6, + NodeID: $9, + } + } /********************Set Statement*******************************/ SetStmt: @@ -6500,6 +6521,7 @@ Statement: | DeleteFromStmt | ExecuteStmt | ExplainStmt +| ChangeStmt | CreateDatabaseStmt | CreateIndexStmt | CreateTableStmt