Remove MULTI from read-only commands #779

MULTI is no longer considered a read-only command to prevent accidental dispatch to slave nodes.
redis · Jun 21, 2018 · d079617 · d079617
1 parent 84c3fdb
commit d079617
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/cluster/ReadOnlyCommands.java
@@ -56,7 +56,7 @@ enum CommandName {
         ASKING, BITCOUNT, BITPOS, CLIENT, COMMAND, DUMP, ECHO, EVAL, EVALSHA, EXISTS, //
         GEODIST, GEOPOS, GEORADIUS, GEORADIUSBYMEMBER, GEOHASH, GET, GETBIT, //
         GETRANGE, HEXISTS, HGET, HGETALL, HKEYS, HLEN, HMGET, HSCAN, HSTRLEN, //
-        HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, MULTI, PFCOUNT, PTTL, //
+        HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, PFCOUNT, PTTL, //
         RANDOMKEY, READWRITE, SCAN, SCARD, SCRIPT, //
         SDIFF, SINTER, SISMEMBER, SMEMBERS, SRANDMEMBER, SSCAN, STRLEN, //
         SUNION, TIME, TTL, TYPE, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //

diff --git a/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java b/src/main/java/io/lettuce/core/masterslave/ReadOnlyCommands.java
@@ -56,7 +56,7 @@ enum CommandName {
         ASKING, BITCOUNT, BITPOS, CLIENT, COMMAND, DUMP, ECHO, EVAL, EVALSHA, EXISTS, //
         GEODIST, GEOPOS, GEORADIUS, GEORADIUSBYMEMBER, GEOHASH, GET, GETBIT, //
         GETRANGE, HEXISTS, HGET, HGETALL, HKEYS, HLEN, HMGET, HSCAN, HSTRLEN, //
-        HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, MULTI, PFCOUNT, PTTL, //
+        HVALS, INFO, KEYS, LINDEX, LLEN, LRANGE, MGET, PFCOUNT, PTTL, //
         RANDOMKEY, READWRITE, SCAN, SCARD, SCRIPT, //
         SDIFF, SINTER, SISMEMBER, SMEMBERS, SRANDMEMBER, SSCAN, STRLEN, //
         SUNION, TIME, TTL, TYPE, ZCARD, ZCOUNT, ZLEXCOUNT, ZRANGE, //

diff --git a/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java b/src/test/java/io/lettuce/core/cluster/ReadOnlyCommandsTest.java
@@ -28,12 +28,13 @@
 public class ReadOnlyCommandsTest {
 
     @Test
-    public void testCount() throws Exception {
-        assertThat(ReadOnlyCommands.getReadOnlyCommands()).hasSize(71);
+    public void testCount() {
+        assertThat(ReadOnlyCommands.getReadOnlyCommands()).hasSize(70);
     }
 
     @Test
-    public void testResolvableCommandNames() throws Exception {
+    public void testResolvableCommandNames() {
+
         for (ProtocolKeyword readOnlyCommand : ReadOnlyCommands.getReadOnlyCommands()) {
             assertThat(readOnlyCommand.name()).isEqualTo(CommandType.valueOf(readOnlyCommand.name()).name());
         }