Merge branch 'master' into master

redis · Mar 22, 2024 · fdcae99 · fdcae99
2 parents b6a3c19 + 8b4f421
commit fdcae99
Show file tree

Hide file tree

Showing 142 changed files with 20,725 additions and 2,063 deletions.
diff --git a/.github/workflows/doctests.yml b/.github/workflows/doctests.yml
@@ -4,6 +4,8 @@ on:
   push:
     tags-ignore:
       - '*'
+    branches:
+      - 'emb-examples'
   pull_request:
   workflow_dispatch:
 

diff --git a/.github/workflows/integration.yml b/.github/workflows/integration.yml
@@ -51,28 +51,10 @@ jobs:
           mvn javadoc:jar
       - name: Run tests
         run: |
-          TEST="" make test
+          make test
         env:
           JVM_OPTS: -Xmx3200m
           TERM: dumb
-      - name: sleep 10s
-        run: sleep 10s
-      - name: Make - start
-        run: |
-          make start
-          sleep 2s
-      - name: Docker - mod or stack
-        run: docker run -p 52567:6379 -d redis/redis-stack-server:edge
-      - name: Test commands - default protocol
-        run: mvn -Dtest="redis.clients.jedis.commands.**" test
-      - name: Test commands - RESP3 protocol
-        run: mvn -DjedisProtocol=3 -Dtest="redis.clients.jedis.commands.**" test
-      - name: Test module commands - default protocol
-        run: mvn -DmodulesDocker="localhost:52567" -Dtest="redis.clients.jedis.modules.**" test
-      - name: Test module commands - RESP3 protocol
-        run: mvn -DjedisProtocol=3 -DmodulesDocker="localhost:52567" -Dtest="redis.clients.jedis.modules.**" test
-      - name: Make - stop
-        run: make stop
       - name: Codecov
         run: |
           bash <(curl -s https://codecov.io/bash)
diff --git a/Makefile b/Makefile
@@ -274,6 +274,50 @@ cluster-enabled yes
 cluster-config-file /tmp/redis_cluster_node5.conf
 endef
 
+# STABLE CLUSTER REDIS NODES
+# The structure of this cluster is not changed by the tests!
+define REDIS_STABLE_CLUSTER_NODE1_CONF
+daemonize yes
+protected-mode no
+requirepass cluster
+port 7479
+cluster-node-timeout 15000
+pidfile /tmp/redis_stable_cluster_node1.pid
+logfile /tmp/redis_stable_cluster_node1.log
+save ""
+appendonly no
+cluster-enabled yes
+cluster-config-file /tmp/redis_stable_cluster_node1.conf
+endef
+
+define REDIS_STABLE_CLUSTER_NODE2_CONF
+daemonize yes
+protected-mode no
+requirepass cluster
+port 7480
+cluster-node-timeout 15000
+pidfile /tmp/redis_stable_cluster_node2.pid
+logfile /tmp/redis_stable_cluster_node2.log
+save ""
+appendonly no
+cluster-enabled yes
+cluster-config-file /tmp/redis_stable_cluster_node2.conf
+endef
+
+define REDIS_STABLE_CLUSTER_NODE3_CONF
+daemonize yes
+protected-mode no
+requirepass cluster
+port 7481
+cluster-node-timeout 15000
+pidfile /tmp/redis_stable_cluster_node3.pid
+logfile /tmp/redis_stable_cluster_node3.log
+save ""
+appendonly no
+cluster-enabled yes
+cluster-config-file /tmp/redis_stable_cluster_node3.conf
+endef
+
 # UDS REDIS NODES
 define REDIS_UDS
 daemonize yes
@@ -355,6 +399,9 @@ export REDIS_CLUSTER_NODE2_CONF
 export REDIS_CLUSTER_NODE3_CONF
 export REDIS_CLUSTER_NODE4_CONF
 export REDIS_CLUSTER_NODE5_CONF
+export REDIS_STABLE_CLUSTER_NODE1_CONF
+export REDIS_STABLE_CLUSTER_NODE2_CONF
+export REDIS_STABLE_CLUSTER_NODE3_CONF
 export REDIS_UDS
 export REDIS_UNAVAILABLE_CONF
 export STUNNEL_CONF
@@ -366,7 +413,7 @@ ifndef STUNNEL_BIN
 endif
 export SKIP_SSL
 
-start: stunnel cleanup
+start: stunnel cleanup compile-module
 	echo "$$REDIS1_CONF" | redis-server -
 	echo "$$REDIS2_CONF" | redis-server -
 	echo "$$REDIS3_CONF" | redis-server -
@@ -393,8 +440,13 @@ start: stunnel cleanup
 	echo "$$REDIS_CLUSTER_NODE3_CONF" | redis-server -
 	echo "$$REDIS_CLUSTER_NODE4_CONF" | redis-server -
 	echo "$$REDIS_CLUSTER_NODE5_CONF" | redis-server -
+	echo "$$REDIS_STABLE_CLUSTER_NODE1_CONF" | redis-server -
+	echo "$$REDIS_STABLE_CLUSTER_NODE2_CONF" | redis-server -
+	echo "$$REDIS_STABLE_CLUSTER_NODE3_CONF" | redis-server -
 	echo "$$REDIS_UDS" | redis-server -
 	echo "$$REDIS_UNAVAILABLE_CONF" | redis-server -
+	redis-cli -a cluster --cluster create 127.0.0.1:7479 127.0.0.1:7480 127.0.0.1:7481 --cluster-yes
+	docker run -p 6479:6379 --name jedis-stack -d redis/redis-stack-server:edge
 
 cleanup:
 	- rm -vf /tmp/redis_cluster_node*.conf 2>/dev/null
@@ -404,6 +456,7 @@ stunnel:
 	@if [ -e "$$STUNNEL_BIN" ]; then\
 	    echo "$$STUNNEL_CONF" | stunnel -fd 0;\
 	fi
+
 stop:
 	kill `cat /tmp/redis1.pid`
 	kill `cat /tmp/redis2.pid`
@@ -426,6 +479,9 @@ stop:
 	kill `cat /tmp/redis_cluster_node3.pid` || true
 	kill `cat /tmp/redis_cluster_node4.pid` || true
 	kill `cat /tmp/redis_cluster_node5.pid` || true
+	kill `cat /tmp/redis_stable_cluster_node1.pid`
+	kill `cat /tmp/redis_stable_cluster_node2.pid`
+	kill `cat /tmp/redis_stable_cluster_node3.pid`
 	kill `cat /tmp/redis_uds.pid` || true
 	kill `cat /tmp/stunnel.pid` || true
 	[ -f /tmp/redis_unavailable.pid ] && kill `cat /tmp/redis_unavailable.pid` || true
@@ -439,29 +495,35 @@ stop:
 	rm -f /tmp/redis_cluster_node3.conf
 	rm -f /tmp/redis_cluster_node4.conf
 	rm -f /tmp/redis_cluster_node5.conf
+	rm -f /tmp/redis_stable_cluster_node1.conf
+	rm -f /tmp/redis_stable_cluster_node2.conf
+	rm -f /tmp/redis_stable_cluster_node3.conf
+	docker rm -f jedis-stack
 
-test: compile-module start
-	sleep 2
+test: | start mvn-test stop
+
+mvn-test:
 	mvn -Dtest=${SKIP_SSL}${TEST} clean compile test
-	make stop
 
-package: start
+package: | start mvn-package stop
+
+mvn-package:
 	mvn clean package
-	make stop
 
-deploy: start
+deploy: | start mvn-deploy stop
+
+mvn-deploy:
 	mvn clean deploy
-	make stop
 
 format:
 	mvn java-formatter:format
 
-release:
-	make start
+release: | start mvn-release stop
+
+mvn-release:
 	mvn release:clean
 	mvn release:prepare
 	mvn release:perform -DskipTests
-	make stop
 
 system-setup:
 	sudo apt install -y gcc g++

diff --git a/pom.xml b/pom.xml
@@ -49,8 +49,8 @@
 		<jedis.module.name>redis.clients.jedis</jedis.module.name>
 		<slf4j.version>1.7.36</slf4j.version>
 		<resilience4j.version>1.7.1</resilience4j.version>
-		<jackson.version>2.16.1</jackson.version>
-		<maven.surefire.version>3.2.3</maven.surefire.version>
+		<jackson.version>2.17.0</jackson.version>
+		<maven.surefire.version>3.2.5</maven.surefire.version>
 	</properties>
 
 	<dependencies>
@@ -67,7 +67,7 @@
 		<dependency>
 			<groupId>org.json</groupId>
 			<artifactId>json</artifactId>
-			<version>20231013</version>
+			<version>20240303</version>
 		</dependency>
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
@@ -79,7 +79,7 @@
 		<dependency>
 			<groupId>com.kohlschutter.junixsocket</groupId>
 			<artifactId>junixsocket-core</artifactId>
-			<version>2.8.3</version>
+			<version>2.9.0</version>
 			<type>pom</type>
 			<scope>test</scope>
 		</dependency>
@@ -300,7 +300,7 @@
 					<!--Sign the components - this is required by maven central for releases -->
 					<plugin>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.1.0</version>
+						<version>3.2.0</version>
 						<configuration>
 							<gpgArguments>
 								<arg>--pinentry-mode</arg>

diff --git a/src/main/java/redis/clients/jedis/AbstractTransaction.java b/src/main/java/redis/clients/jedis/AbstractTransaction.java
@@ -9,6 +9,10 @@ protected AbstractTransaction() {
     super(new CommandObjects());
   }
 
+  protected AbstractTransaction(CommandObjects commandObjects) {
+    super(commandObjects);
+  }
+
   public abstract void multi();
 
   /**

diff --git a/src/main/java/redis/clients/jedis/BuilderFactory.java b/src/main/java/redis/clients/jedis/BuilderFactory.java
@@ -997,6 +997,53 @@ public Map<String, CommandInfo> build(Object data) {
     }
   };
 
+  public static final Builder<Map<String, LatencyLatestInfo>> LATENCY_LATEST_RESPONSE = new Builder<Map<String, LatencyLatestInfo>>() {
+    @Override
+    public Map<String, LatencyLatestInfo> build(Object data) {
+      if (data == null) {
+        return null;
+      }
+
+      List<Object> rawList = (List<Object>) data;
+      Map<String, LatencyLatestInfo> map = new HashMap<>(rawList.size());
+
+      for (Object rawLatencyLatestInfo : rawList) {
+        if (rawLatencyLatestInfo == null) {
+          continue;
+        }
+
+        LatencyLatestInfo latestInfo = LatencyLatestInfo.LATENCY_LATEST_BUILDER.build(rawLatencyLatestInfo);
+        String name = latestInfo.getCommand();
+        map.put(name, latestInfo);
+      }
+
+      return map;
+    }
+  };
+
+  public static final Builder<List<LatencyHistoryInfo>> LATENCY_HISTORY_RESPONSE = new Builder<List<LatencyHistoryInfo>>() {
+    @Override
+    public List<LatencyHistoryInfo> build(Object data) {
+      if (data == null) {
+        return null;
+      }
+
+      List<Object> rawList = (List<Object>) data;
+      List<LatencyHistoryInfo> response = new ArrayList<>(rawList.size());
+
+      for (Object rawLatencyHistoryInfo : rawList) {
+        if (rawLatencyHistoryInfo == null) {
+          continue;
+        }
+
+        LatencyHistoryInfo historyInfo = LatencyHistoryInfo.LATENCY_HISTORY_BUILDER.build(rawLatencyHistoryInfo);
+        response.add(historyInfo);
+      }
+
+      return response;
+    }
+  };
+
   private static final Builder<List<List<Long>>> CLUSTER_SHARD_SLOTS_RANGES = new Builder<List<List<Long>>>() {
 
     @Override

diff --git a/src/main/java/redis/clients/jedis/CommandObjects.java b/src/main/java/redis/clients/jedis/CommandObjects.java
@@ -447,8 +447,8 @@ public final CommandObject<String> setGet(String key, String value) {
   }
 
   public final CommandObject<String> setGet(String key, String value, SetParams params) {
-    return new CommandObject<>(commandArguments(Command.SET).key(key).add(value).addParams(params)
-        .add(Keyword.GET), BuilderFactory.STRING);
+    return new CommandObject<>(commandArguments(Command.SET).key(key).add(value).addParams(params).add(Keyword.GET),
+        BuilderFactory.STRING);
   }
 
   public final CommandObject<String> getDel(String key) {
@@ -468,8 +468,8 @@ public final CommandObject<byte[]> setGet(byte[] key, byte[] value) {
   }
 
   public final CommandObject<byte[]> setGet(byte[] key, byte[] value, SetParams params) {
-    return new CommandObject<>(commandArguments(Command.SET).key(key).add(value).addParams(params)
-        .add(Keyword.GET), BuilderFactory.BINARY);
+    return new CommandObject<>(commandArguments(Command.SET).key(key).add(value).addParams(params).add(Keyword.GET),
+        BuilderFactory.BINARY);
   }
 
   public final CommandObject<byte[]> getDel(byte[] key) {
@@ -480,10 +480,18 @@ public final CommandObject<byte[]> getEx(byte[] key, GetExParams params) {
     return new CommandObject<>(commandArguments(Command.GETEX).key(key).addParams(params), BuilderFactory.BINARY);
   }
 
+  /**
+   * @deprecated Use {@link CommandObjects#setGet(java.lang.String, java.lang.String)}.
+   */
+  @Deprecated
   public final CommandObject<String> getSet(String key, String value) {
     return new CommandObject<>(commandArguments(Command.GETSET).key(key).add(value), BuilderFactory.STRING);
   }
 
+  /**
+   * @deprecated Use {@link CommandObjects#setGet(byte[], byte[])}.
+   */
+  @Deprecated
   public final CommandObject<byte[]> getSet(byte[] key, byte[] value) {
     return new CommandObject<>(commandArguments(Command.GETSET).key(key).add(value), BuilderFactory.BINARY);
   }
@@ -1128,6 +1136,10 @@ public final CommandObject<ScanResult<Map.Entry<String, String>>> hscan(String k
     return new CommandObject<>(commandArguments(HSCAN).key(key).add(cursor).addParams(params), BuilderFactory.HSCAN_RESPONSE);
   }
 
+  public final CommandObject<ScanResult<String>> hscanNoValues(String key, String cursor, ScanParams params) {
+    return new CommandObject<>(commandArguments(HSCAN).key(key).add(cursor).addParams(params).add(NOVALUES), BuilderFactory.SCAN_RESPONSE);
+  }
+
   public final CommandObject<Long> hstrlen(String key, String field) {
     return new CommandObject<>(commandArguments(HSTRLEN).key(key).add(field), BuilderFactory.LONG);
   }
@@ -1136,6 +1148,10 @@ public final CommandObject<ScanResult<Map.Entry<byte[], byte[]>>> hscan(byte[] k
     return new CommandObject<>(commandArguments(HSCAN).key(key).add(cursor).addParams(params), BuilderFactory.HSCAN_BINARY_RESPONSE);
   }
 
+  public final CommandObject<ScanResult<byte[]>> hscanNoValues(byte[] key, byte[] cursor, ScanParams params) {
+    return new CommandObject<>(commandArguments(HSCAN).key(key).add(cursor).addParams(params).add(NOVALUES), BuilderFactory.SCAN_BINARY_RESPONSE);
+  }
+
   public final CommandObject<Long> hstrlen(byte[] key, byte[] field) {
     return new CommandObject<>(commandArguments(HSTRLEN).key(key).add(field), BuilderFactory.LONG);
   }

diff --git a/src/main/java/redis/clients/jedis/ConnectionFactory.java b/src/main/java/redis/clients/jedis/ConnectionFactory.java
@@ -76,7 +76,7 @@ public boolean validateObject(PooledObject<Connection> pooledConnection) {
       // check HostAndPort ??
       return jedis.isConnected() && jedis.ping();
     } catch (final Exception e) {
-      logger.error("Error while validating pooled Connection object.", e);
+      logger.warn("Error while validating pooled Connection object.", e);
       return false;
     }
   }