Fix tests for new =~ operator

Author: tidwall

internal/server/expr.go

@@ -10,6 +10,7 @@ import (
 	"github.com/tidwall/gjson"
 	"github.com/tidwall/match"
 	"github.com/tidwall/tile38/internal/field"
+	"github.com/tidwall/tile38/internal/log"
 	"github.com/tidwall/tile38/internal/object"
 	"github.com/tidwall/tinylru"
 )
@@ -104,10 +105,6 @@ func newExprPool(s *Server) *exprPool {
 				if info.Ident == "this" {
 					return expr.Object(o), nil
 				}
-				// Register regex as a root function
-				if info.Ident == "regex" {
-					return expr.Function("regex"), nil
-				}
 				return objExpr(o, info)
 			} else {
 				switch v := info.Value.Value().(type) {
@@ -146,17 +143,16 @@ func newExprPool(s *Server) *exprPool {
 			case expr.OpRegex:
 				field := info.Left.String()
 				pattern := info.Right.String()
-
 				re, ok := pool.regexCache.Get(pattern)
 				if !ok {
 					var err error
 					re, err = regexp.Compile(pattern)
 					if err != nil {
-						return expr.Undefined, fmt.Errorf("invalid regex pattern: %v", err)
+						return expr.Undefined,
+							fmt.Errorf("invalid regex pattern: %v", err)
 					}
 					pool.regexCache.Set(pattern, re)
 				}
-
 				return expr.Bool(re.MatchString(field)), nil
 			}
 			return expr.Undefined, nil
@@ -188,7 +184,10 @@ func (p *exprPool) Put(ctx *expr.Context) {
 
 func (where whereT) matchExpr(s *Server, o *object.Object) bool {
 	ctx := s.epool.Get(o)
-	res, _ := expr.Eval(where.name, ctx)
+	res, err := expr.Eval(where.name, ctx)
+	if err != nil {
+		log.Debugf("%v", err)
+	}
 	s.epool.Put(ctx)
 	return res.Bool()
 }

tests/keys_test.go

@@ -561,19 +561,19 @@ func keys_FIELDS_test(mc *mockServer) error {
 		Do("SCAN", "fleet", "WHERE", "hello.world", "<", `uom`, "IDS").JSON().Str(`{"ok":true,"ids":["truck1","truck2"],"count":2,"cursor":0}`),
 		Do("SCAN", "fleet", "WHERE", "hello.world", "!=", `tom`, "IDS").JSON().Str(`{"ok":true,"ids":["truck1"],"count":1,"cursor":0}`),
 		// Test REGEX on FIELD
-		Do("SCAN", "fleet", "WHERE", "regex(hello.world, 'tom.*')", "IDS").JSON().Str(`{"ok":true,"ids":["truck2"],"count":1,"cursor":0}`),
-		Do("SCAN", "fleet", "WHERE", "regex(hello.world, 'foo.*')", "IDS").JSON().Str(`{"ok":true,"ids":[],"count":0,"cursor":0}`),
-		Do("SCAN", "fleet", "WHERE", "regex(hello.world, '(*')", "IDS").JSON().Str(`{"ok":true,"ids":[],"count":0,"cursor":0}`),
+		Do("SCAN", "fleet", "WHERE", "hello.world =~ 'tom.*'", "IDS").JSON().Str(`{"ok":true,"ids":["truck2"],"count":1,"cursor":0}`),
+		Do("SCAN", "fleet", "WHERE", "hello.world =~ 'foo.*'", "IDS").JSON().Str(`{"ok":true,"ids":[],"count":0,"cursor":0}`),
+		Do("SCAN", "fleet", "WHERE", "hello.world =~ '(*'", "IDS").JSON().Str(`{"ok":true,"ids":[],"count":0,"cursor":0}`),
 
 		Do("SET", "fleet", "truck1", "OBJECT", `{"type":"Feature","geometry":{"type":"Point","coordinates":[-112,33]},"properties":{"speed":50},"asdf":"Adsf"}`).JSON().OK(),
 		Do("SCAN", "fleet", "WHERE", "properties.speed", ">", 49, "IDS").JSON().Str(`{"ok":true,"ids":["truck1"],"count":1,"cursor":0}`),
 		Do("SCAN", "fleet", "WHERE", "properties.speed", ">", 50, "IDS").JSON().Str(`{"ok":true,"ids":[],"count":0,"cursor":0}`),
 		Do("SCAN", "fleet", "WHERE", "properties.speed", "<", 51, "IDS").JSON().Str(`{"ok":true,"ids":["truck1","truck2"],"count":2,"cursor":0}`),
 		// Test REGEX on OBJECT properties
 		Do("SET", "fleet", "truck3", "OBJECT", `{"type":"Feature","geometry":{"type":"Point","coordinates":[-112,33]},"properties":{"name":"truck01"}}`).JSON().OK(),
-		Do("SCAN", "fleet", "WHERE", "regex(properties.name, 'truck.*')", "IDS").JSON().Str(`{"ok":true,"ids":["truck3"],"count":1,"cursor":0}`),
-		Do("SCAN", "fleet", "WHERE", "regex(properties.name, 'foo.*')", "IDS").JSON().Str(`{"ok":true,"ids":[],"count":0,"cursor":0}`),
-		Do("SCAN", "fleet", "WHERE", "regex(properties.name, '(*')", "IDS").JSON().Str(`{"ok":true,"ids":[],"count":0,"cursor":0}`),
+		Do("SCAN", "fleet", "WHERE", "properties.name =~ 'truck.*'", "IDS").JSON().Str(`{"ok":true,"ids":["truck3"],"count":1,"cursor":0}`),
+		Do("SCAN", "fleet", "WHERE", "properties.name =~ 'foo.*'", "IDS").JSON().Str(`{"ok":true,"ids":[],"count":0,"cursor":0}`),
+		Do("SCAN", "fleet", "WHERE", "properties.name =~ '(*'", "IDS").JSON().Str(`{"ok":true,"ids":[],"count":0,"cursor":0}`),
 
 		Do("DROP", "fleet").JSON().OK(),
 		Do("SET", "fleet", "truck1", "FIELD", "speed", "50", "POINT", "-112", "33").JSON().OK(),