Merge branch 'redis:main' into main

redis · Nov 28, 2024 · af2f813 · af2f813
2 parents 7653e75 + 06ed4fa
commit af2f813
Show file tree

Hide file tree

Showing 26 changed files with 5,217 additions and 393 deletions.
diff --git a/cluster.go b/cluster.go
@@ -144,8 +144,14 @@ func (s clusterslots) parse(tls bool) map[string]group {
 }
 
 func getClusterSlots(c conn, timeout time.Duration) clusterslots {
-	ctx, cancel := context.WithTimeout(context.Background(), timeout)
-	defer cancel()
+	var ctx context.Context
+	var cancel context.CancelFunc
+	if timeout > 0 {
+		ctx, cancel = context.WithTimeout(context.Background(), timeout)
+		defer cancel()
+	} else {
+		ctx = context.Background()
+	}
 	v := c.Version()
 	if v < 8 {
 		return clusterslots{reply: c.Do(ctx, cmds.SlotCmd), addr: c.Addr(), ver: v}

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -35,6 +35,10 @@ services:
     image: redis:5-alpine
     ports:
       - "6356:6379"
+  compat-redisearch:
+    image: redis/redis-stack:7.4.0-v0
+    ports:
+      - "6381:6379"
   sentinel:
     image: redis:7.4-alpine
     entrypoint:

diff --git a/hack/cmds/commands_search.json b/hack/cmds/commands_search.json
@@ -173,7 +173,8 @@
               "TAG",
               "NUMERIC",
               "GEO",
-              "VECTOR"
+              "VECTOR",
+              "GEOSHAPE"
             ]
           },
           {
@@ -182,14 +183,6 @@
             "optional": true,
             "multiple": true,
             "block": [
-              {
-                "name": "withsuffixtrie",
-                "type": "enum",
-                "enum": [
-                  "WITHSUFFIXTRIE"
-                ],
-                "optional": true
-              },
               {
                 "name": "sortable",
                 "type": "block",
@@ -253,6 +246,30 @@
                 "enum": [
                   "CASESENSITIVE"
                 ]
+              },
+              {
+                "name": "WITHSUFFIXTRIE",
+                "type": "enum",
+                "optional": true,
+                "enum": [
+                  "WITHSUFFIXTRIE"
+                ]
+              },
+              {
+                "name": "INDEXEMPTY",
+                "type": "enum",
+                "optional": true,
+                "enum": [
+                  "INDEXEMPTY"
+                ]
+              },
+              {
+                "name": "INDEXMISSING",
+                "type": "enum",
+                "optional": true,
+                "enum": [
+                  "INDEXMISSING"
+                ]
               }
             ]
           }
@@ -1092,6 +1109,14 @@
               "ASC",
               "DESC"
             ]
+          },
+          {
+            "name": "withcount",
+            "type": "enum",
+            "optional": true,
+            "enum": [
+              "WITHCOUNT"
+            ]
           }
         ]
       },
@@ -1315,6 +1340,14 @@
                 "type": "integer",
                 "command": "MAX",
                 "optional": true
+              },
+              {
+                "name": "withcount",
+                "type": "enum",
+                "enum": [
+                  "WITHCOUNT"
+                ],
+                "optional": true
               }
             ]
           },
@@ -1422,6 +1455,14 @@
           }
         ]
       },
+      {
+        "name": "addscores",
+        "type": "enum",
+        "enum": [
+          "ADDSCORES"
+        ],
+        "optional": true
+      },
       {
         "name": "dialect",
         "type": "integer",