Apply feedback

google · Mar 1, 2022 · a4abdcd · a4abdcd
1 parent 2bd4286
commit a4abdcd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/interpreter/interpretable.go b/interpreter/interpretable.go
@@ -534,13 +534,12 @@ type evalVarArgs struct {
 }
 
 // NewCall creates a new call Interpretable.
-func NewCall(id int64, function, overload string, args []Interpretable, trait int, impl functions.FunctionOp) InterpretableCall {
+func NewCall(id int64, function, overload string, args []Interpretable, impl functions.FunctionOp) InterpretableCall {
 	return &evalVarArgs{
 		id:       id,
 		function: function,
 		overload: overload,
 		args:     args,
-		trait:    trait,
 		impl:     impl,
 	}
 }

diff --git a/interpreter/interpreter_test.go b/interpreter/interpreter_test.go
@@ -1332,7 +1332,7 @@ var (
 
 func BenchmarkInterpreter(b *testing.B) {
 	for _, tst := range testData {
-		prg, vars, err := program(b, &tst, Optimize())
+		prg, vars, err := program(b, &tst, Optimize(), CompileRegexConstants(MatchesRegexOptimization))
 		if err != nil {
 			b.Fatal(err)
 		}
@@ -1349,7 +1349,7 @@ func BenchmarkInterpreter(b *testing.B) {
 
 func BenchmarkInterpreter_Parallel(b *testing.B) {
 	for _, tst := range testData {
-		prg, vars, err := program(b, &tst, Optimize())
+		prg, vars, err := program(b, &tst, Optimize(), CompileRegexConstants(MatchesRegexOptimization))
 		if err != nil {
 			b.Fatal(err)
 		}

diff --git a/interpreter/optimizations.go b/interpreter/optimizations.go
@@ -21,6 +21,9 @@ import (
 	"github.com/google/cel-go/common/types/ref"
 )
 
+// MatchesRegexOptimization optimizes the 'matches' standard library function by compiling the regex pattern and
+// reporting any compilation errors at program creation time, and using the compiled regex pattern for all function
+// call invocations.
 var MatchesRegexOptimization = &RegexOptimization{
 	Function:   "matches",
 	RegexIndex: 1,
@@ -29,7 +32,7 @@ var MatchesRegexOptimization = &RegexOptimization{
 		if err != nil {
 			return nil, err
 		}
-		return NewCall(call.ID(), call.Function(), call.OverloadID(), call.Args(), 0, func(values ...ref.Val) ref.Val {
+		return NewCall(call.ID(), call.Function(), call.OverloadID(), call.Args(), func(values ...ref.Val) ref.Val {
 			if len(values) != 2 {
 				return types.NoSuchOverloadErr()
 			}