Merge branch 'master' into key-arg-prefix

redis · Apr 17, 2024 · 9a86cce · 9a86cce
2 parents 4bb8198 + e607593
commit 9a86cce
Show file tree

Hide file tree

Showing 13 changed files with 1,983 additions and 74 deletions.
diff --git a/pom.xml b/pom.xml
@@ -79,7 +79,7 @@
 		<dependency>
 			<groupId>com.kohlschutter.junixsocket</groupId>
 			<artifactId>junixsocket-core</artifactId>
-			<version>2.9.0</version>
+			<version>2.9.1</version>
 			<type>pom</type>
 			<scope>test</scope>
 		</dependency>
@@ -177,7 +177,7 @@
 			<plugin>
 				<groupId>org.jacoco</groupId>
 				<artifactId>jacoco-maven-plugin</artifactId>
-				<version>0.8.11</version>
+				<version>0.8.12</version>
 				<executions>
 					<execution>
 						<goals>
@@ -216,7 +216,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-source-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.3.1</version>
 				<configuration>
 					<attach>true</attach>
 				</configuration>
@@ -272,7 +272,7 @@
 			</plugin>
 			<plugin>
 				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.4.0</version>
 				<configuration>
 					<archive>
 						<manifestFile>${project.build.outputDirectory}/META-INF/MANIFEST.MF</manifestFile>
@@ -306,7 +306,7 @@
 					<!--Sign the components - this is required by maven central for releases -->
 					<plugin>
 						<artifactId>maven-gpg-plugin</artifactId>
-						<version>3.2.2</version>
+						<version>3.2.3</version>
 						<configuration>
 							<gpgArguments>
 								<arg>--pinentry-mode</arg>

diff --git a/src/main/java/redis/clients/jedis/JedisCluster.java b/src/main/java/redis/clients/jedis/JedisCluster.java
@@ -258,11 +258,12 @@ public ClusterPipeline pipelined() {
   }
 
   /**
+   * @param doMulti param
    * @return nothing
    * @throws UnsupportedOperationException
    */
   @Override
-  public Transaction multi() {
+  public AbstractTransaction transaction(boolean doMulti) {
     throw new UnsupportedOperationException();
   }
 }
diff --git a/src/main/java/redis/clients/jedis/JedisPubSubBase.java b/src/main/java/redis/clients/jedis/JedisPubSubBase.java
@@ -133,10 +133,13 @@ private void process() {
           onUnsubscribe(enchannel, subscribedChannels);
         } else if (Arrays.equals(MESSAGE.getRaw(), resp)) {
           final byte[] bchannel = (byte[]) listReply.get(1);
-          final byte[] bmesg = (byte[]) listReply.get(2);
+          final Object mesg = listReply.get(2);
           final T enchannel = (bchannel == null) ? null : encode(bchannel);
-          final T enmesg = (bmesg == null) ? null : encode(bmesg);
-          onMessage(enchannel, enmesg);
+          if (mesg instanceof List) {
+            ((List<byte[]>) mesg).forEach(bmesg -> onMessage(enchannel, encode(bmesg)));
+          } else {
+            onMessage(enchannel, (mesg == null) ? null : encode((byte[]) mesg));
+          }
         } else if (Arrays.equals(PMESSAGE.getRaw(), resp)) {
           final byte[] bpattern = (byte[]) listReply.get(1);
           final byte[] bchannel = (byte[]) listReply.get(2);

diff --git a/src/main/java/redis/clients/jedis/JedisSharding.java b/src/main/java/redis/clients/jedis/JedisSharding.java
@@ -59,11 +59,12 @@ public ShardedPipeline pipelined() {
   }
 
   /**
+   * @param doMulti param
    * @return nothing
    * @throws UnsupportedOperationException
    */
   @Override
-  public Transaction multi() {
+  public AbstractTransaction transaction(boolean doMulti) {
     throw new UnsupportedOperationException();
   }
 }
diff --git a/src/main/java/redis/clients/jedis/Transaction.java b/src/main/java/redis/clients/jedis/Transaction.java
@@ -75,13 +75,6 @@ public Transaction(Connection connection, boolean doMulti, boolean closeConnecti
     this(connection, doMulti, closeConnection, createCommandObjects(connection));
   }
 
-  private static CommandObjects createCommandObjects(Connection connection) {
-    CommandObjects commandObjects = new CommandObjects();
-    RedisProtocol proto = connection.getRedisProtocol();
-    if (proto != null) commandObjects.setProtocol(proto);
-    return commandObjects;
-  }
-
   /**
    * Creates a new transaction.
    *
@@ -103,6 +96,13 @@ private static CommandObjects createCommandObjects(Connection connection) {
     if (doMulti) multi();
   }
 
+  private static CommandObjects createCommandObjects(Connection connection) {
+    CommandObjects commandObjects = new CommandObjects();
+    RedisProtocol proto = connection.getRedisProtocol();
+    if (proto != null) commandObjects.setProtocol(proto);
+    return commandObjects;
+  }
+
   @Override
   public final void multi() {
     connection.sendCommand(MULTI);

diff --git a/src/main/java/redis/clients/jedis/UnifiedJedis.java b/src/main/java/redis/clients/jedis/UnifiedJedis.java
@@ -4878,13 +4878,24 @@ public PipelineBase pipelined() {
     }
   }
 
+  /**
+   * @return transaction object
+   */
   public AbstractTransaction multi() {
+    return transaction(true);
+  }
+
+  /**
+   * @param doMulti {@code false} should be set to enable manual WATCH, UNWATCH and MULTI
+   * @return transaction object
+   */
+  public AbstractTransaction transaction(boolean doMulti) {
     if (provider == null) {
-      throw new IllegalStateException("It is not allowed to create Pipeline from this " + getClass());
+      throw new IllegalStateException("It is not allowed to create Transaction from this " + getClass());
     } else if (provider instanceof MultiClusterPooledConnectionProvider) {
-      return new MultiClusterTransaction((MultiClusterPooledConnectionProvider) provider, true, commandObjects);
+      return new MultiClusterTransaction((MultiClusterPooledConnectionProvider) provider, doMulti, commandObjects);
     } else {
-      return new Transaction(provider.getConnection(), true, true, commandObjects);
+      return new Transaction(provider.getConnection(), doMulti, true, commandObjects);
     }
   }
 

diff --git a/src/test/java/redis/clients/jedis/UnifiedJedisCustomCommandsTest.java b/src/test/java/redis/clients/jedis/UnifiedJedisCustomCommandsTest.java
@@ -46,7 +46,7 @@ public void testSendCommandWithProtocolCommandAndByteArrayArgs() {
     byte[][] args = { "arg1".getBytes(), "arg2".getBytes() };
     CommandArguments commandArguments = mock(CommandArguments.class);
     CommandArguments commandArgumentsWithArgs = mock(CommandArguments.class);
-    when(commandArguments.addObjects(args)).thenReturn(commandArgumentsWithArgs);
+    when(commandArguments.addObjects((Object[]) args)).thenReturn(commandArgumentsWithArgs);
 
     when(commandObjects.commandArguments(cmd)).thenReturn(commandArguments);
     when(commandExecutor.executeCommand(any())).thenReturn("OK");
@@ -74,7 +74,7 @@ public void testSendBlockingCommandWithProtocolCommandAndByteArrayArgs() {
     CommandArguments commandArgumentsWithArgs = mock(CommandArguments.class);
     when(commandArgumentsWithArgs.blocking()).thenReturn(commandArgumentsBlocking);
 
-    when(commandArguments.addObjects(args)).thenReturn(commandArgumentsWithArgs);
+    when(commandArguments.addObjects((Object[]) args)).thenReturn(commandArgumentsWithArgs);
 
     when(commandObjects.commandArguments(cmd)).thenReturn(commandArguments);
     when(commandExecutor.executeCommand(any())).thenReturn("OK");
@@ -98,7 +98,7 @@ public void testSendCommandWithProtocolCommandAndStringArgs() {
     String[] args = { "arg1", "arg2" };
     CommandArguments commandArguments = mock(CommandArguments.class);
     CommandArguments commandArgumentsWithArgs = mock(CommandArguments.class);
-    when(commandArguments.addObjects(args)).thenReturn(commandArgumentsWithArgs);
+    when(commandArguments.addObjects((Object[]) args)).thenReturn(commandArgumentsWithArgs);
 
     when(commandObjects.commandArguments(cmd)).thenReturn(commandArguments);
     when(commandExecutor.executeCommand(any())).thenReturn("OK");
@@ -126,7 +126,7 @@ public void testSendBlockingCommandWithProtocolCommandAndStringArgs() {
     CommandArguments commandArgumentsWithArgs = mock(CommandArguments.class);
     when(commandArgumentsWithArgs.blocking()).thenReturn(commandArgumentsBlocking);
 
-    when(commandArguments.addObjects(args)).thenReturn(commandArgumentsWithArgs);
+    when(commandArguments.addObjects((Object[]) args)).thenReturn(commandArgumentsWithArgs);
 
     when(commandObjects.commandArguments(cmd)).thenReturn(commandArguments);
     when(commandExecutor.executeCommand(any())).thenReturn("OK");