parser: add TableOptimizerHint TIDB_HASHAGG and TIDB_STREAMAGG (#394)

pingcap · Jul 23, 2019 · 09602ee · 09602ee
1 parent 837bc29
commit 09602ee
Show file tree

Hide file tree

Showing 5 changed files with 6,306 additions and 6,256 deletions.
diff --git a/ast/misc.go b/ast/misc.go
@@ -2032,9 +2032,10 @@ type TableOptimizerHint struct {
 func (n *TableOptimizerHint) Restore(ctx *RestoreCtx) error {
 	ctx.WriteKeyWord(n.HintName.String())
 	ctx.WritePlain("(")
-	if n.HintName.L == "max_execution_time" {
+	switch n.HintName.L {
+	case "max_execution_time":
 		ctx.WritePlainf("%d", n.MaxExecutionTime)
-	} else {
+	case "tidb_hj", "tidb_smj", "tidb_inlj":
 		for i, table := range n.Tables {
 			if i != 0 {
 				ctx.WritePlain(", ")

diff --git a/misc.go b/misc.go
@@ -523,6 +523,8 @@ var tokenMap = map[string]int{
 	"TIDB_HJ":                  tidbHJ,
 	"TIDB_INLJ":                tidbINLJ,
 	"TIDB_SMJ":                 tidbSMJ,
+	"TIDB_HASHAGG":             tidbHASHAGG,
+	"TIDB_STREAMAGG":           tidbSTREAMAGG,
 	"TIME":                     timeType,
 	"TIMESTAMP":                timestampType,
 	"TIMESTAMPADD":             timestampAdd,