Merge branch 'master' into migrate_to_clients_test_image

redis · Nov 12, 2024 · d679f01 · d679f01
2 parents 2b3fb84 + 2fdf928
commit d679f01
Show file tree

Hide file tree

Showing 4 changed files with 83 additions and 30 deletions.
diff --git a/src/main/java/redis/clients/jedis/BuilderFactory.java b/src/main/java/redis/clients/jedis/BuilderFactory.java
@@ -975,30 +975,8 @@ public Map<String, CommandDocument> build(Object data) {
     }
   };
 
-  public static final Builder<Map<String, CommandInfo>> COMMAND_INFO_RESPONSE = new Builder<Map<String, CommandInfo>>() {
-    @Override
-    public Map<String, CommandInfo> build(Object data) {
-      if (data == null) {
-        return null;
-      }
-
-      List<Object> rawList = (List<Object>) data;
-      Map<String, CommandInfo> map = new HashMap<>(rawList.size());
-
-      for (Object rawCommandInfo : rawList) {
-        if (rawCommandInfo == null) {
-          continue;
-        }
-
-        List<Object> commandInfo = (List<Object>) rawCommandInfo;
-        String name = STRING.build(commandInfo.get(0));
-        CommandInfo info = CommandInfo.COMMAND_INFO_BUILDER.build(commandInfo);
-        map.put(name, info);
-      }
-
-      return map;
-    }
-  };
+  @Deprecated
+  public static final Builder<Map<String, CommandInfo>> COMMAND_INFO_RESPONSE = CommandInfo.COMMAND_INFO_RESPONSE;
 
   public static final Builder<Map<String, LatencyLatestInfo>> LATENCY_LATEST_RESPONSE = new Builder<Map<String, LatencyLatestInfo>>() {
     @Override

diff --git a/src/main/java/redis/clients/jedis/Jedis.java b/src/main/java/redis/clients/jedis/Jedis.java
@@ -8250,7 +8250,7 @@ public List<KeyValue<String, List<String>>> commandGetKeysAndFlags(String... com
   public Map<String, CommandInfo> commandInfo(String... commands) {
     checkIsInMultiOrPipeline();
     connection.sendCommand(COMMAND, joinParameters(Keyword.INFO.name(), commands));
-    return BuilderFactory.COMMAND_INFO_RESPONSE.build(connection.getOne());
+    return CommandInfo.COMMAND_INFO_RESPONSE.build(connection.getOne());
   }
 
   public List<String> commandList() {

diff --git a/src/main/java/redis/clients/jedis/resps/CommandInfo.java b/src/main/java/redis/clients/jedis/resps/CommandInfo.java
@@ -3,23 +3,40 @@
 import redis.clients.jedis.Builder;
 
 import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
-import static redis.clients.jedis.BuilderFactory.STRING_LIST;
 import static redis.clients.jedis.BuilderFactory.LONG;
+import static redis.clients.jedis.BuilderFactory.STRING;
+import static redis.clients.jedis.BuilderFactory.STRING_LIST;
 
 public class CommandInfo {
+
+  private final String name;
   private final long arity;
   private final List<String> flags;
   private final long firstKey;
   private final long lastKey;
   private final long step;
   private final List<String> aclCategories;
   private final List<String> tips;
-  private final List<String> subcommands;
+  private final Map<String, CommandInfo> subcommands;
 
+  /**
+   * THIS IGNORES 'subcommands' parameter.
+   * @param subcommands WILL BE IGNORED
+   * @deprecated
+   */
+  @Deprecated
   public CommandInfo(long arity, List<String> flags, long firstKey, long lastKey, long step,
       List<String> aclCategories, List<String> tips, List<String> subcommands) {
+    this((String) null, arity, flags, firstKey, lastKey, step, aclCategories, tips, (Map) null);
+  }
+
+  private CommandInfo(String name, long arity, List<String> flags, long firstKey, long lastKey, long step,
+      List<String> aclCategories, List<String> tips, Map<String, CommandInfo> subcommands) {
+    this.name = name;
     this.arity = arity;
     this.flags = flags;
     this.firstKey = firstKey;
@@ -30,6 +47,13 @@ public CommandInfo(long arity, List<String> flags, long firstKey, long lastKey,
     this.subcommands = subcommands;
   }
 
+  /**
+   * Command name
+   */
+  public String getName() {
+    return name;
+  }
+
   /**
    * Arity is the number of arguments a command expects. It follows a simple pattern:
    * A positive integer means a fixed number of arguments.
@@ -90,15 +114,23 @@ public List<String> getTips() {
   /**
    * All the command's subcommands, if any
    */
-  public List<String> getSubcommands() {
+  public Map<String, CommandInfo> getSubcommands() {
     return subcommands;
   }
 
   public static final Builder<CommandInfo> COMMAND_INFO_BUILDER = new Builder<CommandInfo>() {
     @Override
     public CommandInfo build(Object data) {
+      if (data == null) {
+        return null;
+      }
+
       List<Object> commandData = (List<Object>) data;
+      if (commandData.isEmpty()) {
+        return null;
+      }
 
+      String name = STRING.build(commandData.get(0));
       long arity = LONG.build(commandData.get(1));
       List<String> flags = STRING_LIST.build(commandData.get(2));
       long firstKey = LONG.build(commandData.get(3));
@@ -110,9 +142,31 @@ public CommandInfo build(Object data) {
 
       //  (as of Redis 7.0)
       List<String> tips = commandData.size()>=8?STRING_LIST.build(commandData.get(7)):Collections.emptyList();
-      List<String> subcommands = commandData.size()>=10?STRING_LIST.build(commandData.get(9)): Collections.emptyList();
+      Map<String, CommandInfo> subcommands = commandData.size()>=10?COMMAND_INFO_RESPONSE.build(commandData.get(9)): Collections.emptyMap();
+
+      return new CommandInfo(name, arity, flags, firstKey, lastKey, step, aclCategories, tips, subcommands);
+    }
+  };
 
-      return new CommandInfo(arity, flags, firstKey, lastKey, step, aclCategories, tips, subcommands);
+  public static final Builder<Map<String, CommandInfo>> COMMAND_INFO_RESPONSE = new Builder<Map<String, CommandInfo>>() {
+    @Override
+    public Map<String, CommandInfo> build(Object data) {
+      if (data == null) {
+        return null;
+      }
+
+      List<Object> rawList = (List<Object>) data;
+      Map<String, CommandInfo> map = new HashMap<>(rawList.size());
+
+      for (Object rawCommandInfo : rawList) {
+        CommandInfo info = CommandInfo.COMMAND_INFO_BUILDER.build(rawCommandInfo);
+        if (info != null) {
+          map.put(info.getName(), info);
+        }
+      }
+
+      return map;
     }
   };
+
 }
diff --git a/src/test/java/redis/clients/jedis/commands/jedis/ControlCommandsTest.java b/src/test/java/redis/clients/jedis/commands/jedis/ControlCommandsTest.java
@@ -532,6 +532,27 @@ public void commandInfo() {
     assertEquals(0, setInfo.getSubcommands().size());
   }
 
+  @Test // GitHub Issue #4020
+  public void commandInfoAcl() {
+    Map<String, CommandInfo> infos = jedis.commandInfo("ACL");
+    assertThat(infos, Matchers.aMapWithSize(1));
+
+    CommandInfo aclInfo = infos.get("acl");
+    assertEquals(-2, aclInfo.getArity());
+    assertEquals(0, aclInfo.getFlags().size());
+    assertEquals(0, aclInfo.getFirstKey());
+    assertEquals(0, aclInfo.getLastKey());
+    assertEquals(0, aclInfo.getStep());
+    assertEquals(1, aclInfo.getAclCategories().size());
+    assertEquals(0, aclInfo.getTips().size());
+    assertThat(aclInfo.getSubcommands().size(), Matchers.greaterThanOrEqualTo(13));
+    aclInfo.getSubcommands().forEach((name, subcommand) -> {
+      assertThat(name, Matchers.startsWith("acl|"));
+      assertNotNull(subcommand);
+      assertEquals(name, subcommand.getName());
+    });
+  }
+
   @Test
   @Ignore( "Till https://github.com/redis/jedis/issues/4020 is resolved")
   public void commandInfoWithSubcommands() {