From b1a1e94bd55add78d16ac41bf821e6944d4c88d0 Mon Sep 17 00:00:00 2001 From: Huachao Huang Date: Fri, 7 Apr 2017 19:06:54 +0800 Subject: [PATCH] expression/builtin: fix inet6_ntoa (#3012) --- expression/builtin.go | 2 +- expression/builtin_miscellaneous.go | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/expression/builtin.go b/expression/builtin.go index eae7270baf226..ab991fb8713e1 100644 --- a/expression/builtin.go +++ b/expression/builtin.go @@ -309,7 +309,7 @@ var funcs = map[string]functionClass{ ast.InetAton: &inetAtonFunctionClass{baseFunctionClass{ast.InetAton, 1, 1}}, ast.InetNtoa: &inetNtoaFunctionClass{baseFunctionClass{ast.InetNtoa, 1, 1}}, ast.Inet6Aton: &inet6AtonFunctionClass{baseFunctionClass{ast.Inet6Aton, 1, 1}}, - ast.Inet6Ntoa: &inet6NtonFunctionClass{baseFunctionClass{ast.Inet6Ntoa, 1, 1}}, + ast.Inet6Ntoa: &inet6NtoaFunctionClass{baseFunctionClass{ast.Inet6Ntoa, 1, 1}}, ast.IsFreeLock: &isFreeLockFunctionClass{baseFunctionClass{ast.IsFreeLock, 1, 1}}, ast.IsIPv4: &isIPv4FunctionClass{baseFunctionClass{ast.IsIPv4, 1, 1}}, ast.IsIPv4Compat: &isIPv4CompatFunctionClass{baseFunctionClass{ast.IsIPv4Compat, 1, 1}}, diff --git a/expression/builtin_miscellaneous.go b/expression/builtin_miscellaneous.go index 012b325db7826..bd6742dba4b00 100644 --- a/expression/builtin_miscellaneous.go +++ b/expression/builtin_miscellaneous.go @@ -33,7 +33,7 @@ var ( _ functionClass = &inetAtonFunctionClass{} _ functionClass = &inetNtoaFunctionClass{} _ functionClass = &inet6AtonFunctionClass{} - _ functionClass = &inet6NtonFunctionClass{} + _ functionClass = &inet6NtoaFunctionClass{} _ functionClass = &isFreeLockFunctionClass{} _ functionClass = &isIPv4FunctionClass{} _ functionClass = &isIPv4CompatFunctionClass{} @@ -56,7 +56,7 @@ var ( _ builtinFunc = &builtinInetAtonSig{} _ builtinFunc = &builtinInetNtoaSig{} _ builtinFunc = &builtinInet6AtonSig{} - _ builtinFunc = &builtinInet6NtonSig{} + _ builtinFunc = &builtinInet6NtoaSig{} _ builtinFunc = &builtinIsFreeLockSig{} _ builtinFunc = &builtinIsIPv4Sig{} _ builtinFunc = &builtinIsIPv4CompatSig{} @@ -329,21 +329,21 @@ func (b *builtinInet6AtonSig) eval(row []types.Datum) (d types.Datum, err error) return d, errFunctionNotExists.GenByArgs("INET6_ATON") } -type inet6NtonFunctionClass struct { +type inet6NtoaFunctionClass struct { baseFunctionClass } -func (c *inet6NtonFunctionClass) getFunction(args []Expression, ctx context.Context) (builtinFunc, error) { - return &builtinInet6NtonSig{newBaseBuiltinFunc(args, ctx)}, errors.Trace(c.verifyArgs(args)) +func (c *inet6NtoaFunctionClass) getFunction(args []Expression, ctx context.Context) (builtinFunc, error) { + return &builtinInet6NtoaSig{newBaseBuiltinFunc(args, ctx)}, errors.Trace(c.verifyArgs(args)) } -type builtinInet6NtonSig struct { +type builtinInet6NtoaSig struct { baseBuiltinFunc } // See https://dev.mysql.com/doc/refman/5.7/en/miscellaneous-functions.html#function_inet6-ntoa -func (b *builtinInet6NtonSig) eval(row []types.Datum) (d types.Datum, err error) { - return d, errFunctionNotExists.GenByArgs("INET6_NTON") +func (b *builtinInet6NtoaSig) eval(row []types.Datum) (d types.Datum, err error) { + return d, errFunctionNotExists.GenByArgs("INET6_NTOA") } type isFreeLockFunctionClass struct {