Redis Cluster: keysPattern -> keyPattern

Author: Veirisa

driver/src/main/java/jdbc/client/helpers/query/parser/QueryParser.java

@@ -120,12 +120,12 @@ private QueryParser() {
         // keys pattern queries
         if (command == Command.KEYS) {
             String pattern = getFirst(params);
-            return new RedisKeysPatternQuery(compositeCommand, params, pattern, columnHint, nodeHint, isBlocking);
+            return new RedisKeyPatternQuery(compositeCommand, params, pattern, columnHint, nodeHint, isBlocking);
         }
         if (command == Command.SCAN) {
             Integer matchIndex = getIndex(params, p -> Keyword.MATCH.name().equalsIgnoreCase(p));
             String pattern = matchIndex == null || matchIndex == params.length - 1 ? null : params[matchIndex + 1];
-            return new RedisKeysPatternQuery(compositeCommand, params, pattern, columnHint, nodeHint, isBlocking);
+            return new RedisKeyPatternQuery(compositeCommand, params, pattern, columnHint, nodeHint, isBlocking);
         }
 
         return new RedisQuery(compositeCommand, params, columnHint, nodeHint, BLOCKING_COMMANDS.contains(command));

driver/src/main/java/jdbc/client/impl/RedisClientBase.java

@@ -3,7 +3,7 @@
 import jdbc.client.RedisClient;
 import jdbc.client.helpers.query.RedisQueryHelper;
 import jdbc.client.helpers.result.RedisResultHelper;
-import jdbc.client.structures.query.RedisKeysPatternQuery;
+import jdbc.client.structures.query.RedisKeyPatternQuery;
 import jdbc.client.structures.query.RedisQuery;
 import jdbc.client.structures.query.RedisSetDatabaseQuery;
 import jdbc.client.structures.result.RedisResult;
@@ -30,7 +30,7 @@ public final RedisResult execute(String sql) throws SQLException {
 
     public Object execute(@NotNull RedisQuery query) throws SQLException {
        if (query instanceof RedisSetDatabaseQuery) return executeImpl((RedisSetDatabaseQuery) query);
-       if (query instanceof RedisKeysPatternQuery) return executeImpl((RedisKeysPatternQuery) query);
+       if (query instanceof RedisKeyPatternQuery) return executeImpl((RedisKeyPatternQuery) query);
        return executeImpl(query);
     }
 
@@ -39,7 +39,7 @@ private Object executeImpl(@NotNull RedisSetDatabaseQuery query) {
         return setDatabase(query.getDbIndex());
     }
 
-    protected Object executeImpl(@NotNull RedisKeysPatternQuery query) throws SQLException {
+    protected Object executeImpl(@NotNull RedisKeyPatternQuery query) throws SQLException {
         return executeImpl((RedisQuery) query);
     }
 

driver/src/main/java/jdbc/client/impl/cluster/RedisJedisClusterClient.java

@@ -5,7 +5,7 @@
 import jdbc.client.impl.RedisJedisURIBase.CompleteHostAndPortMapper;
 import jdbc.client.impl.standalone.RedisJedisClient;
 import jdbc.client.structures.query.NodeHint;
-import jdbc.client.structures.query.RedisKeysPatternQuery;
+import jdbc.client.structures.query.RedisKeyPatternQuery;
 import jdbc.client.structures.query.RedisQuery;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -74,14 +74,14 @@ private synchronized Object execute(@NotNull HostAndPort nodeHostAndPort,
 
 
     @Override
-    protected Object executeImpl(@NotNull RedisKeysPatternQuery query) throws SQLException {
+    protected Object executeImpl(@NotNull RedisKeyPatternQuery query) throws SQLException {
         checkSupportInClusterMode(query);
         return super.executeImpl(query);
     }
 
-    private static void checkSupportInClusterMode(@NotNull RedisKeysPatternQuery query) throws SQLException {
-        String keysPattern = query.getKeysPattern();
-        if (keysPattern == null || !JedisClusterHashTag.isClusterCompliantMatchPattern(keysPattern))
+    private static void checkSupportInClusterMode(@NotNull RedisKeyPatternQuery query) throws SQLException {
+        String keyPattern = query.getKeyPattern();
+        if (keyPattern == null || !JedisClusterHashTag.isClusterCompliantMatchPattern(keyPattern))
             throw new SQLException(String.format("Cluster mode only supports %s command"
                     + " with pattern containing hash-tag ( curly-brackets enclosed string )", query.getCommand()));
     }

driver/src/main/java/jdbc/client/structures/query/RedisKeyPatternQuery.java

@@ -0,0 +1,30 @@
+package jdbc.client.structures.query;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class RedisKeyPatternQuery extends RedisQuery {
+
+    private final String keyPattern;
+
+    public RedisKeyPatternQuery(@NotNull CompositeCommand compositeCommand,
+                                @NotNull String[] params,
+                                @Nullable String keyPattern,
+                                @Nullable ColumnHint columnHint,
+                                @Nullable NodeHint nodeHint,
+                                boolean isBlocking) {
+        super(compositeCommand, params, columnHint, nodeHint, isBlocking);
+        this.keyPattern = keyPattern;
+    }
+
+    @Nullable
+    public String getKeyPattern() {
+        return keyPattern;
+    }
+
+    @Nullable
+    @Override
+    public String getSampleKey() {
+        return keyPattern;
+    }
+}