parser: treat node_id and node_stats as tidb keyword (#263)

pingcap · Mar 27, 2019 · cc00daf · cc00daf
1 parent cc0fa08
commit cc00daf
Show file tree

Hide file tree

Showing 5 changed files with 5,121 additions and 5,104 deletions.
diff --git a/consistent_test.go b/consistent_test.go
@@ -38,10 +38,10 @@ func (s *testConsistentSuite) TestKeywordConsistent(c *C) {
 	c.Assert(err, IsNil)
 	content := string(data)
 
-	reservedKeywordStartMarker := "\t/* The following tokens belong to ReservedKeyword. */"
-	unreservedKeywordStartMarker := "\t/* The following tokens belong to UnReservedKeyword. */"
-	notKeywordTokenStartMarker := "\t/* The following tokens belong to NotKeywordToken. */"
-	tidbKeywordStartMarker := "\t/* The following tokens belong to TiDBKeyword. */"
+	reservedKeywordStartMarker := "\t/* The following tokens belong to ReservedKeyword. Notice: make sure these tokens are contained in ReservedKeyword. */"
+	unreservedKeywordStartMarker := "\t/* The following tokens belong to UnReservedKeyword. Notice: make sure these tokens are contained in UnReservedKeyword. */"
+	notKeywordTokenStartMarker := "\t/* The following tokens belong to NotKeywordToken. Notice: make sure these tokens are contained in NotKeywordToken. */"
+	tidbKeywordStartMarker := "\t/* The following tokens belong to TiDBKeyword. Notice: make sure these tokens are contained in TiDBKeyword. */"
 	identTokenEndMarker := "%token\t<item>"
 
 	reservedKeywords := extractKeywords(content, reservedKeywordStartMarker, unreservedKeywordStartMarker)

diff --git a/misc.go b/misc.go
@@ -365,8 +365,8 @@ var tokenMap = map[string]int{
 	"NEXT_ROW_ID":              next_row_id,
 	"NO":                       no,
 	"NO_WRITE_TO_BINLOG":       noWriteToBinLog,
-	"NODE_ID":                  node_id,
-	"NODE_STATE":               node_state,
+	"NODE_ID":                  nodeID,
+	"NODE_STATE":               nodeState,
 	"NONE":                     none,
 	"NOT":                      not,
 	"NOW":                      now,