Merge branch 'master' into search-dialect-default-2

Author: sazzad16

.github/workflows/codeql-analysis.yml

@@ -31,7 +31,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/docs.yml

@@ -28,9 +28,9 @@ jobs:
       - name: Setup Pages
         uses: actions/configure-pages@v3
       - name: Upload artifact
-        uses: actions/upload-pages-artifact@v1
+        uses: actions/upload-pages-artifact@v3
         with:
           path: 'docsbuild'
       - name: Deploy to GitHub Pages
         id: deployment
-        uses: actions/deploy-pages@v2
+        uses: actions/deploy-pages@v4

.github/workflows/doctests.yml

@@ -2,9 +2,8 @@ name: Documentation Tests
 
 on:
   push:
-    tags-ignore:
-      - '*'
     branches:
+      - master
       - 'emb-examples'
   pull_request:
   workflow_dispatch:
@@ -21,16 +20,16 @@ jobs:
           - 6379:6379
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository
             /var/cache/apt
           key: jedis-${{hashFiles('**/pom.xml')}}
       - name: Set up Java
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '11'
           distribution: 'temurin'

.github/workflows/integration.yml

@@ -25,9 +25,9 @@ jobs:
     name: Build and Test
     runs-on: ubuntu-latest
     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'
@@ -37,7 +37,7 @@ jobs:
           sudo apt install -y stunnel make
           make system-setup
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository

.github/workflows/snapshot.yml

@@ -15,17 +15,17 @@ jobs:
     name: Deploy Snapshot
     runs-on: ubuntu-latest
     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'
           server-id: ossrh
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD
       - name: Cache dependencies
-        uses: actions/cache@v2
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository

.github/workflows/spellcheck.yml

@@ -6,7 +6,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Check Spelling
         uses: rojopolis/[email protected]
         with:

.github/workflows/version-and-release.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
 
       - name: get version from tag
         id: get_version
@@ -19,7 +19,7 @@ jobs:
           echo "VERSION=$realversion" >> $GITHUB_OUTPUT
 
       - name: Set up publishing to maven central
-        uses: actions/setup-java@v2
+        uses: actions/setup-java@v4
         with:
           java-version: '8'
           distribution: 'temurin'

docs/jedis-maven.md

@@ -6,7 +6,7 @@
 <dependency>
     <groupId>redis.clients</groupId>
     <artifactId>jedis</artifactId>
-    <version>5.0.0</version>
+    <version>5.2.0</version>
 </dependency>
 ```
 
@@ -28,7 +28,7 @@ and
     <dependency>
       <groupId>redis.clients</groupId>
       <artifactId>jedis</artifactId>
-      <version>5.1.0-SNAPSHOT</version>
+      <version>6.0.0-SNAPSHOT</version>
     </dependency>
   </dependencies>
 ```

pom.xml

@@ -9,7 +9,7 @@
 	<packaging>jar</packaging>
 	<groupId>redis.clients</groupId>
 	<artifactId>jedis</artifactId>
-	<version>5.3.0-SNAPSHOT</version>
+	<version>6.0.0-SNAPSHOT</version>
 	<name>Jedis</name>
 	<description>Jedis is a blazingly small and sane Redis java client.</description>
 	<url>https://github.com/redis/jedis</url>
@@ -62,17 +62,17 @@
 		<dependency>
 			<groupId>org.apache.commons</groupId>
 			<artifactId>commons-pool2</artifactId>
-			<version>2.12.0</version>
+			<version>2.12.1</version>
 		</dependency>
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>20240303</version>
+			<version>20250107</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>
-			<version>2.11.0</version>
+			<version>2.12.1</version>
 		</dependency>
 
 		<dependency>
@@ -145,7 +145,7 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5-fluent</artifactId>
-			<version>5.4.1</version>
+			<version>5.4.2</version>
 			<scope>test</scope>
 		</dependency>
 

src/main/java/redis/clients/jedis/ClusterPipeline.java

@@ -46,13 +46,6 @@ private static ClusterCommandObjects createClusterCommandObjects(RedisProtocol p
     return cco;
   }
 
-  /**
-   * This method must be called after constructor, if graph commands are going to be used.
-   */
-  public void prepareGraphCommands() {
-    super.prepareGraphCommands(provider);
-  }
-
   @Override
   public void close() {
     try {

src/main/java/redis/clients/jedis/CommandObjects.java

@@ -19,10 +19,6 @@
 import redis.clients.jedis.bloom.*;
 import redis.clients.jedis.bloom.RedisBloomProtocol.*;
 import redis.clients.jedis.commands.ProtocolCommand;
-import redis.clients.jedis.gears.*;
-import redis.clients.jedis.gears.RedisGearsProtocol.*;
-import redis.clients.jedis.gears.resps.GearsLibraryInfo;
-import redis.clients.jedis.graph.GraphProtocol.*;
 import redis.clients.jedis.json.*;
 import redis.clients.jedis.json.JsonProtocol.JsonCommand;
 import redis.clients.jedis.json.DefaultGsonObjectMapper;
@@ -3437,7 +3433,7 @@ public final CommandObject<String> ftCursorDel(String indexName, long cursorId)
         .key(indexName).add(cursorId), BuilderFactory.STRING);
   }
 
-  public final CommandObject<Map.Entry<AggregationResult, Map<String, Object>>> ftProfileAggregate(
+  public final CommandObject<Map.Entry<AggregationResult, ProfilingInfo>> ftProfileAggregate(
       String indexName, FTProfileParams profileParams, AggregationBuilder aggr) {
     return new CommandObject<>(checkAndRoundRobinSearchCommand(SearchCommand.PROFILE, indexName)
         .add(SearchKeyword.AGGREGATE).addParams(profileParams).add(SearchKeyword.QUERY)
@@ -3446,7 +3442,7 @@ public final CommandObject<Map.Entry<AggregationResult, Map<String, Object>>> ft
         : AggregationResult.SEARCH_AGGREGATION_RESULT_WITH_CURSOR));
   }
 
-  public final CommandObject<Map.Entry<SearchResult, Map<String, Object>>> ftProfileSearch(
+  public final CommandObject<Map.Entry<SearchResult, ProfilingInfo>> ftProfileSearch(
       String indexName, FTProfileParams profileParams, Query query) {
     return new CommandObject<>(checkAndRoundRobinSearchCommand(SearchCommand.PROFILE, indexName)
         .add(SearchKeyword.SEARCH).addParams(profileParams).add(SearchKeyword.QUERY)
@@ -3455,7 +3451,7 @@ public final CommandObject<Map.Entry<SearchResult, Map<String, Object>>> ftProfi
             () -> new SearchResultBuilder(!query.getNoContent(), query.getWithScores(), true))));
   }
 
-  public final CommandObject<Map.Entry<SearchResult, Map<String, Object>>> ftProfileSearch(
+  public final CommandObject<Map.Entry<SearchResult, ProfilingInfo>> ftProfileSearch(
       String indexName, FTProfileParams profileParams, String query, FTSearchParams searchParams) {
     return new CommandObject<>(checkAndRoundRobinSearchCommand(SearchCommand.PROFILE, indexName)
         .add(SearchKeyword.SEARCH).addParams(profileParams).add(SearchKeyword.QUERY).add(query)
@@ -4385,70 +4381,6 @@ public final CommandObject<List<Double>> tdigestByRevRank(String key, long... ra
   }
   // RedisBloom commands
 
-  // RedisGraph commands
-  @Deprecated
-  public final CommandObject<List<String>> graphList() {
-    return new CommandObject<>(commandArguments(GraphCommand.LIST), BuilderFactory.STRING_LIST);
-  }
-
-  @Deprecated
-  public final CommandObject<List<String>> graphProfile(String graphName, String query) {
-    return new CommandObject<>(commandArguments(GraphCommand.PROFILE).key(graphName).add(query), BuilderFactory.STRING_LIST);
-  }
-
-  @Deprecated
-  public final CommandObject<List<String>> graphExplain(String graphName, String query) {
-    return new CommandObject<>(commandArguments(GraphCommand.EXPLAIN).key(graphName).add(query), BuilderFactory.STRING_LIST);
-  }
-
-  @Deprecated
-  public final CommandObject<List<List<Object>>> graphSlowlog(String graphName) {
-    return new CommandObject<>(commandArguments(GraphCommand.SLOWLOG).key(graphName), BuilderFactory.ENCODED_OBJECT_LIST_LIST);
-  }
-
-  @Deprecated
-  public final CommandObject<String> graphConfigSet(String configName, Object value) {
-    return new CommandObject<>(commandArguments(GraphCommand.CONFIG).add(GraphKeyword.SET).add(configName).add(value), BuilderFactory.STRING);
-  }
-
-  @Deprecated
-  public final CommandObject<Map<String, Object>> graphConfigGet(String configName) {
-    return new CommandObject<>(commandArguments(GraphCommand.CONFIG).add(GraphKeyword.GET).add(configName), BuilderFactory.ENCODED_OBJECT_MAP);
-  }
-  // RedisGraph commands
-
-  // RedisGears commands
-  @Deprecated
-  public final CommandObject<String> tFunctionLoad(String libraryCode, TFunctionLoadParams params) {
-    return new CommandObject<>(commandArguments(GearsCommand.TFUNCTION).add(GearsKeyword.LOAD)
-        .addParams(params).add(libraryCode), BuilderFactory.STRING);
-  }
-
-  @Deprecated
-  public final CommandObject<String> tFunctionDelete(String libraryName) {
-    return new CommandObject<>(commandArguments(GearsCommand.TFUNCTION).add(GearsKeyword.DELETE)
-        .add(libraryName), BuilderFactory.STRING);
-  }
-
-  @Deprecated
-  public final CommandObject<List<GearsLibraryInfo>> tFunctionList(TFunctionListParams params) {
-    return new CommandObject<>(commandArguments(GearsCommand.TFUNCTION).add(GearsKeyword.LIST)
-        .addParams(params), GearsLibraryInfo.GEARS_LIBRARY_INFO_LIST);
-  }
-
-  @Deprecated
-  public final CommandObject<Object> tFunctionCall(String library, String function, List<String> keys, List<String> args) {
-    return new CommandObject<>(commandArguments(GearsCommand.TFCALL).add(library + "." + function)
-        .add(keys.size()).keys(keys).addObjects(args), BuilderFactory.AGGRESSIVE_ENCODED_OBJECT);
-  }
-
-  @Deprecated
-  public final CommandObject<Object> tFunctionCallAsync(String library, String function, List<String> keys, List<String> args) {
-    return new CommandObject<>(commandArguments(GearsCommand.TFCALLASYNC).add(library + "." + function)
-        .add(keys.size()).keys(keys).addObjects(args), BuilderFactory.AGGRESSIVE_ENCODED_OBJECT);
-  }
-  // RedisGears commands
-
   // Transaction commands
   public final CommandObject<String> watch(String... keys) {
     return new CommandObject<>(commandArguments(WATCH).keys((Object[]) keys), BuilderFactory.STRING);
@@ -4496,32 +4428,51 @@ public void setDefaultSearchDialect(int dialect) {
     this.searchDialect.set(dialect);
   }
 
-  private class SearchProfileResponseBuilder<T> extends Builder<Map.Entry<T, Map<String, Object>>> {
+  private class SearchProfileResponseBuilder<T> extends Builder<Map.Entry<T, ProfilingInfo>> {
 
-    private static final String PROFILE_STR = "profile";
+    private static final String PROFILE_STR_REDIS7 = "profile";
+    private static final String PROFILE_STR_REDIS8 = "Profile";
+    private static final String RESULTS_STR_REDIS7 = "results";
+    private static final String RESULTS_STR_REDIS8 = "Results";
 
-    private final Builder<T> replyBuilder;
+    private final Builder<T> resultsBuilder;
 
-    public SearchProfileResponseBuilder(Builder<T> replyBuilder) {
-      this.replyBuilder = replyBuilder;
+    public SearchProfileResponseBuilder(Builder<T> resultsBuilder) {
+      this.resultsBuilder = resultsBuilder;
     }
 
     @Override
-    public Map.Entry<T, Map<String, Object>> build(Object data) {
+    public Map.Entry<T, ProfilingInfo> build(Object data) {
       List list = (List) data;
       if (list == null || list.isEmpty()) return null;
 
-      if (list.get(0) instanceof KeyValue) {
+      if (list.get(0) instanceof KeyValue) { // RESP3
+        Object resultsData = null, profileData = null;
+
         for (KeyValue keyValue : (List<KeyValue>) data) {
-          if (PROFILE_STR.equals(BuilderFactory.STRING.build(keyValue.getKey()))) {
-            return KeyValue.of(replyBuilder.build(data),
-                BuilderFactory.AGGRESSIVE_ENCODED_OBJECT_MAP.build(keyValue.getValue()));
+          String keyStr = BuilderFactory.STRING.build(keyValue.getKey());
+          switch (keyStr) {
+            case PROFILE_STR_REDIS7:
+            case PROFILE_STR_REDIS8:
+              profileData = keyValue.getValue();
+              break;
+            case RESULTS_STR_REDIS7:
+              resultsData = data;
+              break;
+            case RESULTS_STR_REDIS8:
+              resultsData = keyValue.getValue();
+              break;
           }
         }
+
+        assert resultsData != null : "Could not detect Results data.";
+        assert profileData != null : "Could not detect Profile data.";
+        return KeyValue.of(resultsBuilder.build(resultsData),
+                ProfilingInfo.PROFILING_INFO_BUILDER.build(profileData));
       }
 
-      return KeyValue.of(replyBuilder.build(list.get(0)),
-          SearchBuilderFactory.SEARCH_PROFILE_PROFILE.build(list.get(1)));
+      return KeyValue.of(resultsBuilder.build(list.get(0)),
+          ProfilingInfo.PROFILING_INFO_BUILDER.build(list.get(1)));
     }
   }
 

src/main/java/redis/clients/jedis/MultiNodePipelineBase.java

@@ -14,8 +14,6 @@
 import org.slf4j.LoggerFactory;
 
 import redis.clients.jedis.exceptions.JedisConnectionException;
-import redis.clients.jedis.graph.GraphCommandObjects;
-import redis.clients.jedis.providers.ConnectionProvider;
 import redis.clients.jedis.util.IOUtils;
 
 public abstract class MultiNodePipelineBase extends PipelineBase {
@@ -39,16 +37,6 @@ public MultiNodePipelineBase(CommandObjects commandObjects) {
     connections = new LinkedHashMap<>();
   }
 
-  /**
-   * Sub-classes must call this method, if graph commands are going to be used.
-   * @param connectionProvider connection provider
-   */
-  protected final void prepareGraphCommands(ConnectionProvider connectionProvider) {
-    GraphCommandObjects graphCommandObjects = new GraphCommandObjects(connectionProvider);
-    graphCommandObjects.setBaseCommandArgumentsCreator((comm) -> this.commandObjects.commandArguments(comm));
-    super.setGraphCommands(graphCommandObjects);
-  }
-
   protected abstract HostAndPort getNodeKey(CommandArguments args);
 
   protected abstract Connection getConnection(HostAndPort nodeKey);