work in progress

viant · Jul 23, 2023 · 6e5caa5 · 6e5caa5
1 parent 53696a7
commit 6e5caa5
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 27 deletions.
diff --git a/cmd/builder.go b/cmd/builder.go
@@ -33,7 +33,6 @@ import (
 	"github.com/viant/toolbox/format"
 	"github.com/viant/velty/ast/expr"
 	"github.com/viant/velty/parser"
-	"github.com/viant/xdatly/predicate"
 	"github.com/viant/xreflect"
 	"go/ast"
 	goFormat "go/format"
@@ -2091,19 +2090,10 @@ func (s *Builder) readParamConfigs(cfg *option.ParameterConfig, cursor *parsly.C
 			if err != nil {
 				return err
 			}
-
-			var namedArgs []*predicate.NamedArgument
-			for pos, argName := range args[2:] {
-				namedArgs = append(namedArgs, &predicate.NamedArgument{
-					Position: pos,
-					Name:     argName,
-				})
-			}
-
 			cfg.Predicate = &config.PredicateConfig{
 				Name:    args[1],
 				Context: ctx,
-				Args:    namedArgs,
+				Args:    args[2:],
 			}
 		case "UtilParam":
 			if len(args) != 0 {

diff --git a/config/predicates.go b/config/predicates.go
@@ -16,7 +16,7 @@ type (
 		Parent  string
 		Name    string
 		Context int
-		Args    []*predicate.NamedArgument
+		Args    []string
 	}
 
 	NamedArg struct {

diff --git a/internal/translator/parser/declarations.go b/internal/translator/parser/declarations.go
@@ -10,7 +10,6 @@ import (
 	"github.com/viant/sqlparser"
 	"github.com/viant/velty/ast/expr"
 	"github.com/viant/velty/parser"
-	"github.com/viant/xdatly/predicate"
 	"github.com/viant/xreflect"
 
 	"strconv"
@@ -227,17 +226,10 @@ func (s *Declarations) parseShorthands(declaration *Declaration, cursor *parsly.
 			if err != nil {
 				return err
 			}
-			var namedArgs []*predicate.NamedArgument
-			for pos, argName := range args[2:] {
-				namedArgs = append(namedArgs, &predicate.NamedArgument{
-					Position: pos,
-					Name:     argName,
-				})
-			}
 			declaration.Predicate = &config.PredicateConfig{
 				Name:    args[1],
 				Context: ctx,
-				Args:    namedArgs,
+				Args:    args[2:],
 			}
 		case "UtilParam":
 			//deprecated

diff --git a/view/predicate.go b/view/predicate.go
@@ -25,7 +25,7 @@ type (
 	predicateEvaluatorProvider struct {
 		evaluator *expand.Evaluator
 		ctxType   reflect.Type
-		argsIndex map[int]*predicate.NamedArgument
+		signature map[int]*predicate.NamedArgument
 		stateName string
 	}
 
@@ -69,12 +69,12 @@ func (c *predicateCache) getEvaluatorProvider(predicateConfig *config.PredicateC
 func (p *predicateEvaluatorProvider) new(predicateConfig *config.PredicateConfig) (*predicateEvaluator, error) {
 	dst := types.NewValue(p.ctxType)
 	dstPtr := xunsafe.AsPointer(dst)
-	for _, field := range predicateConfig.Args {
-		argument, ok := p.argsIndex[field.Position]
+	for i, arg := range predicateConfig.Args {
+		argument, ok := p.signature[i]
 		if !ok {
-			return nil, fmt.Errorf("not found predicate arg %v", field.Position)
+			return nil, fmt.Errorf("not found predicate arg %v", i)
 		}
-		xunsafe.FieldByName(p.ctxType, argument.Name).SetString(dstPtr, field.Name)
+		xunsafe.FieldByName(p.ctxType, argument.Name).SetString(dstPtr, arg)
 	}
 
 	customCtx := &expand.CustomContext{
@@ -111,7 +111,7 @@ func (p *predicateEvaluatorProvider) init(predicateConfig *config.PredicateConfi
 
 	p.ctxType = ctxType
 	p.evaluator = evaluator
-	p.argsIndex = argsIndexed
+	p.signature = argsIndexed
 	p.stateName = stateName
 	return nil
 }