finish (#906)

Signed-off-by: Tong Zhigao <tongzhigao@pingcap.com>
pingcap · Jun 18, 2020 · 789c193 · 789c193
1 parent a87fd8a
commit 789c193
Show file tree

Hide file tree

Showing 5 changed files with 7,770 additions and 7,738 deletions.
diff --git a/ast/functions.go b/ast/functions.go
@@ -687,6 +687,8 @@ const (
 	AggFuncStddevSamp = "stddev_samp"
 	// AggFuncJsonObjectAgg is the name of json_objectagg function
 	AggFuncJsonObjectAgg = "json_objectagg"
+	// AggFuncApproxCountDistinct is the name of approx_count_distinct function.
+	AggFuncApproxCountDistinct = "approx_count_distinct"
 )
 
 // AggregateFuncExpr represents aggregate function expression.

diff --git a/misc.go b/misc.go
@@ -226,6 +226,7 @@ var tokenMap = map[string]int{
 	"CONVERT":                  convert,
 	"COPY":                     copyKwd,
 	"COUNT":                    count,
+	"APPROX_COUNT_DISTINCT":    approxCountDistinct,
 	"CPU":                      cpu,
 	"CREATE":                   create,
 	"CROSS":                    cross,
@@ -723,38 +724,39 @@ var tokenMap = map[string]int{
 
 // See https://dev.mysql.com/doc/refman/5.7/en/function-resolution.html for details
 var btFuncTokenMap = map[string]int{
-	"ADDDATE":      builtinAddDate,
-	"BIT_AND":      builtinBitAnd,
-	"BIT_OR":       builtinBitOr,
-	"BIT_XOR":      builtinBitXor,
-	"CAST":         builtinCast,
-	"COUNT":        builtinCount,
-	"CURDATE":      builtinCurDate,
-	"CURTIME":      builtinCurTime,
-	"DATE_ADD":     builtinDateAdd,
-	"DATE_SUB":     builtinDateSub,
-	"EXTRACT":      builtinExtract,
-	"GROUP_CONCAT": builtinGroupConcat,
-	"MAX":          builtinMax,
-	"MID":          builtinSubstring,
-	"MIN":          builtinMin,
-	"NOW":          builtinNow,
-	"POSITION":     builtinPosition,
-	"SESSION_USER": builtinUser,
-	"STD":          builtinStddevPop,
-	"STDDEV":       builtinStddevPop,
-	"STDDEV_POP":   builtinStddevPop,
-	"STDDEV_SAMP":  builtinStddevSamp,
-	"SUBDATE":      builtinSubDate,
-	"SUBSTR":       builtinSubstring,
-	"SUBSTRING":    builtinSubstring,
-	"SUM":          builtinSum,
-	"SYSDATE":      builtinSysDate,
-	"SYSTEM_USER":  builtinUser,
-	"TRIM":         builtinTrim,
-	"VARIANCE":     builtinVarPop,
-	"VAR_POP":      builtinVarPop,
-	"VAR_SAMP":     builtinVarSamp,
+	"ADDDATE":               builtinAddDate,
+	"BIT_AND":               builtinBitAnd,
+	"BIT_OR":                builtinBitOr,
+	"BIT_XOR":               builtinBitXor,
+	"CAST":                  builtinCast,
+	"COUNT":                 builtinCount,
+	"APPROX_COUNT_DISTINCT": builtinApproxCountDistinct,
+	"CURDATE":               builtinCurDate,
+	"CURTIME":               builtinCurTime,
+	"DATE_ADD":              builtinDateAdd,
+	"DATE_SUB":              builtinDateSub,
+	"EXTRACT":               builtinExtract,
+	"GROUP_CONCAT":          builtinGroupConcat,
+	"MAX":                   builtinMax,
+	"MID":                   builtinSubstring,
+	"MIN":                   builtinMin,
+	"NOW":                   builtinNow,
+	"POSITION":              builtinPosition,
+	"SESSION_USER":          builtinUser,
+	"STD":                   builtinStddevPop,
+	"STDDEV":                builtinStddevPop,
+	"STDDEV_POP":            builtinStddevPop,
+	"STDDEV_SAMP":           builtinStddevSamp,
+	"SUBDATE":               builtinSubDate,
+	"SUBSTR":                builtinSubstring,
+	"SUBSTRING":             builtinSubstring,
+	"SUM":                   builtinSum,
+	"SYSDATE":               builtinSysDate,
+	"SYSTEM_USER":           builtinUser,
+	"TRIM":                  builtinTrim,
+	"VARIANCE":              builtinVarPop,
+	"VAR_POP":               builtinVarPop,
+	"VAR_SAMP":              builtinVarSamp,
 }
 
 var windowFuncTokenMap = map[string]int{