Merge branch 'redis:master' into MultiNodePipelineExecutor

dolavb · web-flow · commit a50568a9a04b · 2025-01-21T15:49:01.000-08:00
diff --git a/.github/workflows/test-on-docker.yml b/.github/workflows/test-on-docker.yml
@@ -41,9 +41,9 @@ jobs:
           - "7.2.6"
           # - "6.2.16"
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up publishing to maven central
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '8'
           distribution: 'temurin'
@@ -53,7 +53,7 @@ jobs:
           sudo apt install -y make
           make compile-module
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository
@@ -124,7 +124,7 @@ jobs:
         continue-on-error: true
       # Upload code coverage
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         with:
           fail_ci_if_error: false
           token: ${{ secrets.CODECOV_TOKEN }}
diff --git a/src/test/java/io/redis/examples/CmdsCnxmgmtExample.java b/src/test/java/io/redis/examples/CmdsCnxmgmtExample.java
@@ -0,0 +1,49 @@
+// EXAMPLE: cmds_cnxmgmt
+// REMOVE_START
+package io.redis.examples;
+
+import org.junit.Assert;
+import org.junit.Test;
+// REMOVE_END
+
+import redis.clients.jedis.Jedis;
+
+// HIDE_START
+public class CmdsCnxmgmtExample {
+    @Test
+    public void run() {
+// HIDE_END
+        Jedis jedis = new Jedis("redis://localhost:6379");
+
+        // STEP_START auth1
+        // REMOVE_START
+        jedis.configSet("requirepass", "temp_pass");
+        // REMOVE_END
+        // Note: you must use the `Jedis` class rather than `UnifiedJedis`
+        // to access the `auth` commands.
+        String authResult1 = jedis.auth("default",  "temp_pass");
+        System.out.println(authResult1); // >>> OK
+        // REMOVE_START
+        Assert.assertEquals("OK", authResult1);
+        jedis.configSet("requirepass", "");
+        // REMOVE_END
+        // STEP_END
+       
+        // STEP_START auth2
+        // REMOVE_START
+        jedis.aclSetUser("test-user", "on", ">strong_password", "+acl");
+        // REMOVE_END
+        // Note: you must use the `Jedis` class rather than `UnifiedJedis`
+        // to access the `auth` commands.
+        String authResult2 = jedis.auth("test-user", "strong_password");
+        System.out.println(authResult2); // >>> OK
+        // REMOVE_START
+        Assert.assertEquals("OK", authResult2);
+        jedis.aclDelUser("test-user");
+        // REMOVE_END
+        // STEP_END
+        
+        // HIDE_START
+    }
+}
+// HIDE_END
diff --git a/src/test/java/io/redis/examples/CmdsServerMgmtExample.java b/src/test/java/io/redis/examples/CmdsServerMgmtExample.java
@@ -0,0 +1,58 @@
+// EXAMPLE: cmds_servermgmt
+// REMOVE_START
+package io.redis.examples;
+
+import org.junit.Assert;
+import org.junit.Test;
+// REMOVE_END
+import java.util.Set;
+
+import redis.clients.jedis.Jedis;
+// HIDE_START
+import redis.clients.jedis.UnifiedJedis;
+
+public class CmdsServerMgmtExample {
+    @Test
+    public void run() {
+        UnifiedJedis jedis = new UnifiedJedis("redis://localhost:6379");
+// HIDE_END
+
+        // STEP_START flushall
+        // REMOVE_START
+        jedis.set("testkey1", "1");
+        jedis.set("testkey2", "2");
+        jedis.set("testkey3", "3");
+        // REMOVE_END
+        String flushAllResult1 = jedis.flushAll();
+        System.out.println(flushAllResult1); // >>> OK
+
+        Set<String> flushAllResult2 = jedis.keys("*");
+        System.out.println(flushAllResult2); // >>> []
+        // STEP_END
+        // REMOVE_START
+        Assert.assertEquals("OK", flushAllResult1);
+        Assert.assertEquals("[]", flushAllResult2.toString());
+        // REMOVE_END
+
+        // STEP_START info
+        // Note: you must use the `Jedis` class to access the `info`
+        // command rather than `UnifiedJedis`.
+        Jedis jedis2 = new Jedis("redis://localhost:6379");
+
+        String infoResult = jedis2.info();
+        
+        // Check the first 8 characters of the result (the full `info` string
+        // is much longer than this).
+        System.out.println(infoResult.substring(0, 8)); // >>> # Server
+
+        jedis2.close();
+        // STEP_END
+        // REMOVE_START
+        Assert.assertEquals("# Server", infoResult.substring(0, 8));
+        // REMOVE_END
+        
+// HIDE_START
+        jedis.close();
+    }
+}
+// HIDE_END
diff --git a/src/test/java/io/redis/examples/GeoIndexExample.java b/src/test/java/io/redis/examples/GeoIndexExample.java
@@ -0,0 +1,180 @@
+// EXAMPLE: geoindex
+// REMOVE_START
+package io.redis.examples;
+
+import org.junit.Assert;
+import org.junit.Test;
+// REMOVE_END
+
+// HIDE_START
+import org.json.JSONObject;
+
+import redis.clients.jedis.UnifiedJedis;
+import redis.clients.jedis.json.Path2;
+import redis.clients.jedis.search.Document;
+import redis.clients.jedis.search.FTCreateParams;
+import redis.clients.jedis.search.FTSearchParams;
+import redis.clients.jedis.search.IndexDataType;
+import redis.clients.jedis.search.schemafields.*;
+import redis.clients.jedis.search.schemafields.GeoShapeField.CoordinateSystem;
+import redis.clients.jedis.search.SearchResult;
+import redis.clients.jedis.exceptions.JedisDataException;
+// HIDE_END
+
+// HIDE_START
+public class GeoIndexExample {
+
+    @Test
+    public void run() {
+        UnifiedJedis jedis = new UnifiedJedis("redis://localhost:6379");
+        //REMOVE_START
+        // Clear any keys here before using them in tests.
+        try {
+            jedis.ftDropIndex("productidx");
+        } catch (JedisDataException j) {}
+        
+        try {
+            jedis.ftDropIndex("geomidx");
+        } catch (JedisDataException j) {}
+        
+        jedis.del("product:46885", "product:46886", "shape:1", "shape:2", "shape:3", "shape:4");
+        //REMOVE_END
+// HIDE_END
+
+        // STEP_START create_geo_idx
+        SchemaField[] geoSchema = {
+            GeoField.of("$.location").as("location")
+        };
+
+        String geoIdxCreateResult = jedis.ftCreate("productidx",
+            FTCreateParams.createParams()
+                    .on(IndexDataType.JSON)
+                    .addPrefix("product:"),
+            geoSchema
+        );
+        // STEP_END
+        // REMOVE_START
+        Assert.assertEquals("OK", geoIdxCreateResult);
+        // REMOVE_END
+        
+        // STEP_START add_geo_json
+        JSONObject prd46885 = new JSONObject()
+                .put("description", "Navy Blue Slippers")
+                .put("price", 45.99)
+                .put("city", "Denver")
+                .put("location", "-104.991531, 39.742043");
+        
+        String jsonAddResult1 = jedis.jsonSet("product:46885", new Path2("$"), prd46885);
+        System.out.println(jsonAddResult1); // >>> OK
+
+        JSONObject prd46886 = new JSONObject()
+                .put("description", "Bright Green Socks")
+                .put("price", 25.50)
+                .put("city", "Fort Collins")
+                .put("location", "-105.0618814,40.5150098");
+        
+        String jsonAddResult2 = jedis.jsonSet("product:46886", new Path2("$"), prd46886);
+        System.out.println(jsonAddResult2); // >>> OK
+        // STEP_END
+        // REMOVE_START
+        Assert.assertEquals("OK", jsonAddResult1);
+        Assert.assertEquals("OK", jsonAddResult2);
+        // REMOVE_END
+
+        // STEP_START geo_query
+        SearchResult geoResult = jedis.ftSearch("productidx",
+            "@location:[-104.800644 38.846127 100 mi]"
+        );
+
+        System.out.println(geoResult.getTotalResults()); // >>> 1
+
+        for (Document doc: geoResult.getDocuments()) {
+            System.out.println(doc.getId());
+        }
+        // >>> product:46885
+        // STEP_END
+        // REMOVE_START
+        Assert.assertEquals("OK", jsonAddResult1);
+        Assert.assertEquals("OK", jsonAddResult2);
+        Assert.assertEquals("product:46885", geoResult.getDocuments().get(0).getId());
+        // REMOVE_END
+
+        // STEP_START create_gshape_idx
+        SchemaField[] geomSchema = {
+            TextField.of("$.name").as("name"),
+            GeoShapeField.of("$.geom", CoordinateSystem.FLAT).as("geom")
+        };
+
+        String geomIndexCreateResult = jedis.ftCreate("geomidx",
+            FTCreateParams.createParams()
+                    .on(IndexDataType.JSON)
+                    .addPrefix("shape"),
+            geomSchema
+        );
+        System.out.println(geomIndexCreateResult); // >>> OK
+        // STEP_END
+        // REMOVE_START
+        Assert.assertEquals("OK", geomIndexCreateResult);
+        // REMOVE_END
+
+        // STEP_START add_gshape_json
+        JSONObject shape1 = new JSONObject()
+                .put("name", "Green Square")
+                .put("geom", "POLYGON ((1 1, 1 3, 3 3, 3 1, 1 1))");
+        
+        String gmJsonRes1 = jedis.jsonSet("shape:1", new Path2("$"), shape1);
+        System.out.println(gmJsonRes1); // >>> OK
+
+        JSONObject shape2 = new JSONObject()
+                .put("name", "Red Rectangle")
+                .put("geom", "POLYGON ((2 2.5, 2 3.5, 3.5 3.5, 3.5 2.5, 2 2.5))");
+        
+        String gmJsonRes2 = jedis.jsonSet("shape:2", new Path2("$"), shape2);
+        System.out.println(gmJsonRes2); // >>> OK
+
+        JSONObject shape3 = new JSONObject()
+                .put("name", "Blue Triangle")
+                .put("geom", "POLYGON ((3.5 1, 3.75 2, 4 1, 3.5 1))");
+        
+        String gmJsonRes3 = jedis.jsonSet("shape:3", new Path2("$"), shape3);
+        System.out.println(gmJsonRes3); // >>> OK
+
+        JSONObject shape4 = new JSONObject()
+                .put("name", "Purple Point")
+                .put("geom", "POINT (2 2)");
+        
+        String gmJsonRes4 = jedis.jsonSet("shape:4", new Path2("$"), shape4);
+        System.out.println(gmJsonRes4); // >>> OK
+        // STEP_END
+        // REMOVE_START
+        Assert.assertEquals("OK", gmJsonRes1);
+        Assert.assertEquals("OK", gmJsonRes2);
+        Assert.assertEquals("OK", gmJsonRes3);
+        Assert.assertEquals("OK", gmJsonRes4);
+        // REMOVE_END
+
+        // STEP_START gshape_query
+        SearchResult geomResult = jedis.ftSearch("geomidx",
+            "(-@name:(Green Square) @geom:[WITHIN $qshape])",
+            FTSearchParams.searchParams()
+                    .addParam("qshape", "POLYGON ((1 1, 1 3, 3 3, 3 1, 1 1))")
+                    .dialect(4)
+                    .limit(0, 1)
+        );
+        System.out.println(geomResult.getTotalResults()); // >>> 1
+
+        for (Document doc: geomResult.getDocuments()) {
+            System.out.println(doc.getId());
+        }
+        // shape:4
+        // STEP_END
+        // REMOVE_START
+        Assert.assertEquals(1, geomResult.getTotalResults());
+        Assert.assertEquals("shape:4", geomResult.getDocuments().get(0).getId());
+        // REMOVE_END
+        // HIDE_START
+
+        jedis.close();
+    }
+}
+// HIDE_END
diff --git a/src/test/java/redis/clients/jedis/authentication/RedisEntraIDClusterIntegrationTests.java b/src/test/java/redis/clients/jedis/authentication/RedisEntraIDClusterIntegrationTests.java
diff --git a/src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationClusterIntegrationTests.java b/src/test/java/redis/clients/jedis/authentication/TokenBasedAuthenticationClusterIntegrationTests.java
