fix(bug): Remove warnings in native plugin manager (lf-edge#1418)

* fix(plugin): avoid get function instance every time when function call Signed-off-by: Jianxiang Ran <rxan_embedded@163.com> * fix(plugin): do not print message when plugin so file not exist Signed-off-by: Jianxiang Ran <rxan_embedded@163.com> * fix(plugin): fix UT error Signed-off-by: Jianxiang Ran <rxan_embedded@163.com> Signed-off-by: Jianxiang Ran <rxan_embedded@163.com>
ngjaying · Sep 29, 2022 · dd855b3 · dd855b3
1 parent 480ec49
commit dd855b3
Show file tree

Hide file tree

Showing 13 changed files with 122 additions and 115 deletions.
diff --git a/internal/binder/function/binder.go b/internal/binder/function/binder.go
@@ -17,6 +17,7 @@ package function
 import (
 	"github.com/lf-edge/ekuiper/internal/binder"
 	"github.com/lf-edge/ekuiper/pkg/api"
+	"github.com/lf-edge/ekuiper/pkg/ast"
 	"github.com/lf-edge/ekuiper/pkg/errorx"
 )
 
@@ -25,15 +26,6 @@ var ( // init once and read only
 	funcFactoriesNames []string
 )
 
-type FuncType int
-
-const (
-	FuncTypeUnknown FuncType = iota - 1
-	FuncTypeScalar
-	FuncTypeAgg
-	FuncTypeCols
-)
-
 func init() {
 	f := binder.FactoryEntry{
 		Name:    "built-in",
@@ -92,31 +84,31 @@ func ConvName(name string) (string, bool) {
 }
 
 type multiAggFunc interface {
-	GetFuncType(name string) FuncType
+	GetFuncType(name string) ast.FuncType
 }
 
 func IsAggFunc(funcName string) bool {
 	f, _ := Function(funcName)
 	if f != nil {
 		if mf, ok := f.(multiAggFunc); ok {
-			return mf.GetFuncType(funcName) == FuncTypeAgg
+			return mf.GetFuncType(funcName) == ast.FuncTypeAgg
 		} else {
 			return f.IsAggregate()
 		}
 	}
 	return false
 }
 
-func GetFuncType(funcName string) FuncType {
+func GetFuncType(funcName string) ast.FuncType {
 	f, _ := Function(funcName)
 	if f != nil {
 		if mf, ok := f.(multiAggFunc); ok {
 			return mf.GetFuncType(funcName)
 		}
 		if f.IsAggregate() {
-			return FuncTypeAgg
+			return ast.FuncTypeAgg
 		}
-		return FuncTypeScalar
+		return ast.FuncTypeScalar
 	}
-	return FuncTypeUnknown
+	return ast.FuncTypeUnknown
 }
diff --git a/internal/binder/function/funcs_agg.go b/internal/binder/function/funcs_agg.go
@@ -22,7 +22,7 @@ import (
 
 func registerAggFunc() {
 	builtins["avg"] = builtinFunc{
-		fType: FuncTypeAgg,
+		fType: ast.FuncTypeAgg,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			arg0 := args[0].([]interface{})
 			c := getCount(arg0)
@@ -52,15 +52,15 @@ func registerAggFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["count"] = builtinFunc{
-		fType: FuncTypeAgg,
+		fType: ast.FuncTypeAgg,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			arg0 := args[0].([]interface{})
 			return getCount(arg0), true
 		},
 		val: ValidateOneArg,
 	}
 	builtins["max"] = builtinFunc{
-		fType: FuncTypeAgg,
+		fType: ast.FuncTypeAgg,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			arg0 := args[0].([]interface{})
 			if len(arg0) > 0 {
@@ -101,7 +101,7 @@ func registerAggFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["min"] = builtinFunc{
-		fType: FuncTypeAgg,
+		fType: ast.FuncTypeAgg,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			arg0 := args[0].([]interface{})
 			if len(arg0) > 0 {
@@ -142,7 +142,7 @@ func registerAggFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["sum"] = builtinFunc{
-		fType: FuncTypeAgg,
+		fType: ast.FuncTypeAgg,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			arg0 := args[0].([]interface{})
 			if len(arg0) > 0 {
@@ -171,14 +171,14 @@ func registerAggFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["collect"] = builtinFunc{
-		fType: FuncTypeAgg,
+		fType: ast.FuncTypeAgg,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			return args[0], true
 		},
 		val: ValidateOneArg,
 	}
 	builtins["deduplicate"] = builtinFunc{
-		fType: FuncTypeAgg,
+		fType: ast.FuncTypeAgg,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			v1, ok1 := args[0].([]interface{})
 			v2, ok2 := args[1].([]interface{})

diff --git a/internal/binder/function/funcs_cols.go b/internal/binder/function/funcs_cols.go
@@ -42,7 +42,7 @@ func wrapColFunc(colFunc ColFunc) funcExe {
 
 func registerColsFunc() {
 	builtins["changed_cols"] = builtinFunc{
-		fType: FuncTypeCols,
+		fType: ast.FuncTypeCols,
 		exec:  wrapColFunc(changedFunc),
 		val: func(_ api.FunctionContext, args []ast.Expr) error {
 			if len(args) <= 2 {

diff --git a/internal/binder/function/funcs_math.go b/internal/binder/function/funcs_math.go
@@ -24,7 +24,7 @@ import (
 
 func registerMathFunc() {
 	builtins["abs"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, ok := args[0].(int); ok {
 				t := float64(v)
@@ -39,7 +39,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["acos"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Acos(v), true
@@ -50,7 +50,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["asin"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Asin(v), true
@@ -61,7 +61,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["atan"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Atan(v), true
@@ -72,7 +72,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["atan2"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v1, e := toF64(args[0]); e == nil {
 				if v2, e1 := toF64(args[1]); e1 == nil {
@@ -87,7 +87,7 @@ func registerMathFunc() {
 		val: ValidateTwoNumberArg,
 	}
 	builtins["bitand"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			v1, ok1 := args[0].(int)
 			v2, ok2 := args[1].(int)
@@ -100,7 +100,7 @@ func registerMathFunc() {
 		val: ValidateTwoIntArg,
 	}
 	builtins["bitor"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			v1, ok1 := args[0].(int)
 			v2, ok2 := args[1].(int)
@@ -113,7 +113,7 @@ func registerMathFunc() {
 		val: ValidateTwoIntArg,
 	}
 	builtins["bitxor"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			v1, ok1 := args[0].(int)
 			v2, ok2 := args[1].(int)
@@ -126,7 +126,7 @@ func registerMathFunc() {
 		val: ValidateTwoIntArg,
 	}
 	builtins["bitnot"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			v1, ok1 := args[0].(int)
 			if ok1 {
@@ -146,7 +146,7 @@ func registerMathFunc() {
 		},
 	}
 	builtins["ceil"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Ceil(v), true
@@ -157,7 +157,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["cos"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Cos(v), true
@@ -168,7 +168,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["cosh"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Cosh(v), true
@@ -179,7 +179,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["exp"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Exp(v), true
@@ -190,7 +190,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["ln"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Log2(v), true
@@ -201,7 +201,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["log"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Log10(v), true
@@ -212,7 +212,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["mod"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				if v1, e1 := toF64(args[1]); e == nil {
@@ -227,7 +227,7 @@ func registerMathFunc() {
 		val: ValidateTwoNumberArg,
 	}
 	builtins["power"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v1, e := toF64(args[0]); e == nil {
 				if v2, e2 := toF64(args[1]); e2 == nil {
@@ -242,14 +242,14 @@ func registerMathFunc() {
 		val: ValidateTwoNumberArg,
 	}
 	builtins["rand"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			return rand.Float64(), true
 		},
 		val: ValidateOneArg,
 	}
 	builtins["round"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Round(v), true
@@ -260,7 +260,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["sign"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				if v > 0 {
@@ -277,7 +277,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["sin"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Sin(v), true
@@ -288,7 +288,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["sinh"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Sinh(v), true
@@ -299,7 +299,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["sqrt"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Sqrt(v), true
@@ -310,7 +310,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["tan"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Tan(v), true
@@ -321,7 +321,7 @@ func registerMathFunc() {
 		val: ValidateOneNumberArg,
 	}
 	builtins["tanh"] = builtinFunc{
-		fType: FuncTypeScalar,
+		fType: ast.FuncTypeScalar,
 		exec: func(ctx api.FunctionContext, args []interface{}) (interface{}, bool) {
 			if v, e := toF64(args[0]); e == nil {
 				return math.Tanh(v), true