Cache REGEX (#3036)

Author: jycor

sql/expression/function/regexp_instr.go

@@ -167,8 +167,8 @@ func (r *RegexpInstr) String() string {
 // compile handles compilation of the regex.
 func (r *RegexpInstr) compile(ctx *sql.Context, row sql.Row) {
 	r.compileOnce.Do(func() {
-		r.cacheRegex = canBeCached(r.Text, r.Pattern, r.Flags)
-		r.cacheVal = canBeCached(r.Text, r.Pattern, r.Position, r.Occurrence, r.ReturnOption, r.Flags)
+		r.cacheRegex = canBeCached(r.Pattern, r.Flags)
+		r.cacheVal = r.cacheRegex && canBeCached(r.Text, r.Position, r.Occurrence, r.ReturnOption)
 		if r.cacheRegex {
 			r.re, r.compileErr = compileRegex(ctx, r.Pattern, r.Text, r.Flags, r.FunctionName(), row)
 		}

sql/expression/function/regexp_instr_test.go

@@ -0,0 +1,54 @@
+// Copyright 2025 Dolthub, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package function
+
+import (
+	"fmt"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+
+	"github.com/dolthub/go-mysql-server/sql"
+	"github.com/dolthub/go-mysql-server/sql/expression"
+	"github.com/dolthub/go-mysql-server/sql/types"
+)
+
+// Last Run: 06/17/2025
+// BenchmarkRegexpInStr
+// BenchmarkRegexpInStr-14    	     100	  97313270 ns/op
+// BenchmarkRegexpInStr-14    	   10000	   1001064 ns/op
+func BenchmarkRegexpInStr(b *testing.B) {
+	ctx := sql.NewEmptyContext()
+	data := make([]sql.Row, 100)
+	for i := range data {
+		data[i] = sql.Row{fmt.Sprintf("test%d", i)}
+	}
+
+	for i := 0; i < b.N; i++ {
+		f, err := NewRegexpInstr(
+			expression.NewGetField(0, types.LongText, "text", false),
+			expression.NewLiteral("^test[0-9]$", types.LongText),
+		)
+		require.NoError(b, err)
+		var total int
+		for _, row := range data {
+			res, err := f.Eval(ctx, row)
+			require.NoError(b, err)
+			total += int(res.(int32))
+		}
+		require.Equal(b, 10, total)
+		f.(*RegexpInstr).Dispose()
+	}
+}

sql/expression/function/regexp_like.go

@@ -34,8 +34,9 @@ type RegexpLike struct {
 	Pattern sql.Expression
 	Flags   sql.Expression
 
+	cacheVal    bool
 	cachedVal   any
-	cacheable   bool
+	cacheRegex  bool
 	re          regex.Regex
 	compileOnce sync.Once
 	compileErr  error
@@ -136,12 +137,13 @@ func (r *RegexpLike) String() string {
 // compile handles compilation of the regex.
 func (r *RegexpLike) compile(ctx *sql.Context, row sql.Row) {
 	r.compileOnce.Do(func() {
-		r.cacheable = canBeCached(r.Text, r.Pattern, r.Flags)
-		if r.cacheable {
+		r.cacheRegex = canBeCached(r.Pattern, r.Flags)
+		r.cacheVal = r.cacheRegex && canBeCached(r.Text)
+		if r.cacheRegex {
 			r.re, r.compileErr = compileRegex(ctx, r.Pattern, r.Text, r.Flags, r.FunctionName(), row)
 		}
 	})
-	if !r.cacheable {
+	if !r.cacheRegex {
 		if r.re != nil {
 			if r.compileErr = r.re.Close(); r.compileErr != nil {
 				return
@@ -199,7 +201,7 @@ func (r *RegexpLike) Eval(ctx *sql.Context, row sql.Row) (interface{}, error) {
 		outVal = int8(0)
 	}
 
-	if r.cacheable {
+	if r.cacheVal {
 		r.cachedVal = outVal
 	}
 	return outVal, nil

sql/expression/function/regexp_like_test.go

@@ -363,3 +363,31 @@ func TestRegexpLikeNilAndErrors(t *testing.T) {
 	require.Equal(t, nil, res)
 	f.(*RegexpLike).Dispose()
 }
+
+// Last Run: 06/17/2025
+// BenchmarkRegexpLike
+// BenchmarkRegexpLike-14    	     100	  98269522 ns/op
+// BenchmarkRegexpLike-14    	   10000	    958159 ns/op
+func BenchmarkRegexpLike(b *testing.B) {
+	ctx := sql.NewEmptyContext()
+	data := make([]sql.Row, 100)
+	for i := range data {
+		data[i] = sql.Row{fmt.Sprintf("test%d", i)}
+	}
+
+	for i := 0; i < b.N; i++ {
+		f, err := NewRegexpLike(
+			expression.NewGetField(0, types.LongText, "text", false),
+			expression.NewLiteral("^test[0-9]$", types.LongText),
+		)
+		require.NoError(b, err)
+		var total int8
+		for _, row := range data {
+			res, err := f.Eval(ctx, row)
+			require.NoError(b, err)
+			total += res.(int8)
+		}
+		require.Equal(b, int8(10), total)
+		f.(*RegexpLike).Dispose()
+	}
+}