parser: remove universal keyword (#50103)

close #50066
pingcap · Jan 5, 2024 · b4ba24b · b4ba24b
1 parent 7e83932
commit b4ba24b
Show file tree

Hide file tree

Showing 8 changed files with 10,351 additions and 10,412 deletions.
diff --git a/pkg/parser/ast/misc.go b/pkg/parser/ast/misc.go
@@ -1972,7 +1972,6 @@ type CreateBindingStmt struct {
 	stmtNode
 
 	GlobalScope bool
-	IsUniversal bool
 	OriginNode  StmtNode
 	HintedNode  StmtNode
 	PlanDigest  string
@@ -1985,9 +1984,6 @@ func (n *CreateBindingStmt) Restore(ctx *format.RestoreCtx) error {
 	} else {
 		ctx.WriteKeyWord("SESSION ")
 	}
-	if n.IsUniversal {
-		ctx.WriteKeyWord("UNIVERSAL ")
-	}
 	if n.OriginNode == nil {
 		ctx.WriteKeyWord("BINDING FROM HISTORY USING PLAN DIGEST ")
 		ctx.WriteString(n.PlanDigest)

diff --git a/pkg/parser/keywords.go b/pkg/parser/keywords.go
@@ -610,7 +610,6 @@ var Keywords = []KeywordsType{
 	{"UNCOMMITTED", false, "unreserved"},
 	{"UNDEFINED", false, "unreserved"},
 	{"UNICODE", false, "unreserved"},
-	{"UNIVERSAL", false, "unreserved"},
 	{"UNKNOWN", false, "unreserved"},
 	{"UNSET", false, "unreserved"},
 	{"USER", false, "unreserved"},

diff --git a/pkg/parser/keywords_test.go b/pkg/parser/keywords_test.go
@@ -36,7 +36,7 @@ func TestKeywords(t *testing.T) {
 }
 
 func TestKeywordsLength(t *testing.T) {
-	require.Equal(t, 647, len(parser.Keywords))
+	require.Equal(t, 646, len(parser.Keywords))
 
 	reservedNr := 0
 	for _, kw := range parser.Keywords {

diff --git a/pkg/parser/misc.go b/pkg/parser/misc.go
@@ -843,7 +843,6 @@ var tokenMap = map[string]int{
 	"UNDEFINED":                undefined,
 	"UNICODE":                  unicodeSym,
 	"UNION":                    union,
-	"UNIVERSAL":                universal,
 	"UNIQUE":                   unique,
 	"UNKNOWN":                  unknown,
 	"UNLOCK":                   unlock,