diff --git a/redisson-spring-data/redisson-spring-data-16/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-16/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index 189b86ce5..0ed556c48 100644 --- a/redisson-spring-data/redisson-spring-data-16/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-16/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -1765,7 +1765,9 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(script); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } protected RedisCommand toCommand(ReturnType returnType, String name) { @@ -1800,7 +1802,9 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } @Override @@ -1810,7 +1814,16 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); + } + + private static byte[] getKey(int numKeys, byte[][] keysAndArgs) { + if (numKeys > 0 && keysAndArgs.length > 0) { + return keysAndArgs[0]; + } + return null; } private static final RedisCommand PFADD = new RedisCommand("PFADD"); diff --git a/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index 064b92168..cf94be6c8 100644 --- a/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-17/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -1819,11 +1819,13 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(script); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } protected RedisCommand toCommand(ReturnType returnType, String name) { - RedisCommand c = null; + RedisCommand c = null; if (returnType == ReturnType.BOOLEAN) { c = org.redisson.api.RScript.ReturnType.BOOLEAN.getCommand(); } else if (returnType == ReturnType.INTEGER) { @@ -1854,7 +1856,9 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } @Override @@ -1864,7 +1868,16 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); + } + + private static byte[] getKey(int numKeys, byte[][] keysAndArgs) { + if (numKeys > 0 && keysAndArgs.length > 0) { + return keysAndArgs[0]; + } + return null; } private static final RedisCommand PFADD = new RedisCommand("PFADD"); diff --git a/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index d96400fd7..0f16c0297 100644 --- a/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-18/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -1832,11 +1832,13 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(script); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } protected RedisCommand toCommand(ReturnType returnType, String name) { - RedisCommand c = null; + RedisCommand c = null; if (returnType == ReturnType.BOOLEAN) { c = org.redisson.api.RScript.ReturnType.BOOLEAN.getCommand(); } else if (returnType == ReturnType.INTEGER) { @@ -1867,7 +1869,9 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } @Override @@ -1877,7 +1881,16 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); + } + + private static byte[] getKey(int numKeys, byte[][] keysAndArgs) { + if (numKeys > 0 && keysAndArgs.length > 0) { + return keysAndArgs[0]; + } + return null; } @Override diff --git a/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index ca628f47d..9d1301414 100644 --- a/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-20/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -1835,11 +1835,13 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(script); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } protected RedisCommand toCommand(ReturnType returnType, String name) { - RedisCommand c = null; + RedisCommand c = null; if (returnType == ReturnType.BOOLEAN) { c = org.redisson.api.RScript.ReturnType.BOOLEAN.getCommand(); } else if (returnType == ReturnType.INTEGER) { @@ -1870,7 +1872,9 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } @Override @@ -1880,7 +1884,16 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); + } + + private static byte[] getKey(int numKeys, byte[][] keysAndArgs) { + if (numKeys > 0 && keysAndArgs.length > 0) { + return keysAndArgs[0]; + } + return null; } @Override diff --git a/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index 2a79a5e76..865b536f9 100644 --- a/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-21/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -1838,11 +1838,13 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(script); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } protected RedisCommand toCommand(ReturnType returnType, String name) { - RedisCommand c = null; + RedisCommand c = null; if (returnType == ReturnType.BOOLEAN) { c = org.redisson.api.RScript.ReturnType.BOOLEAN.getCommand(); } else if (returnType == ReturnType.INTEGER) { @@ -1873,7 +1875,9 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } @Override @@ -1883,7 +1887,16 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); + } + + private static byte[] getKey(int numKeys, byte[][] keysAndArgs) { + if (numKeys > 0 && keysAndArgs.length > 0) { + return keysAndArgs[0]; + } + return null; } @Override diff --git a/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index 232a0cee9..d2c0bf9ce 100644 --- a/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-22/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -1838,11 +1838,13 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(script); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } protected RedisCommand toCommand(ReturnType returnType, String name) { - RedisCommand c = null; + RedisCommand c = null; if (returnType == ReturnType.BOOLEAN) { c = org.redisson.api.RScript.ReturnType.BOOLEAN.getCommand(); } else if (returnType == ReturnType.INTEGER) { @@ -1873,7 +1875,9 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } @Override @@ -1883,7 +1887,16 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); + } + + private static byte[] getKey(int numKeys, byte[][] keysAndArgs) { + if (numKeys > 0 && keysAndArgs.length > 0) { + return keysAndArgs[0]; + } + return null; } @Override diff --git a/redisson-spring-data/redisson-spring-data-23/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-23/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index d3ec27856..6d29304ae 100644 --- a/redisson-spring-data/redisson-spring-data-23/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-23/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -1838,11 +1838,13 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(script); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } protected RedisCommand toCommand(ReturnType returnType, String name) { - RedisCommand c = null; + RedisCommand c = null; if (returnType == ReturnType.BOOLEAN) { c = org.redisson.api.RScript.ReturnType.BOOLEAN.getCommand(); } else if (returnType == ReturnType.INTEGER) { @@ -1873,7 +1875,9 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } @Override @@ -1883,7 +1887,16 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); + } + + private static byte[] getKey(int numKeys, byte[][] keysAndArgs) { + if (numKeys > 0 && keysAndArgs.length > 0) { + return keysAndArgs[0]; + } + return null; } @Override diff --git a/redisson-spring-data/redisson-spring-data-24/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-24/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index 95078aa66..f7a992ae5 100644 --- a/redisson-spring-data/redisson-spring-data-24/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-24/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -1863,11 +1863,13 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(script); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } protected RedisCommand toCommand(ReturnType returnType, String name) { - RedisCommand c = null; + RedisCommand c = null; if (returnType == ReturnType.BOOLEAN) { c = org.redisson.api.RScript.ReturnType.BOOLEAN.getCommand(); } else if (returnType == ReturnType.INTEGER) { @@ -1898,7 +1900,9 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } @Override @@ -1908,7 +1912,16 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); + } + + private static byte[] getKey(int numKeys, byte[][] keysAndArgs) { + if (numKeys > 0 && keysAndArgs.length > 0) { + return keysAndArgs[0]; + } + return null; } @Override diff --git a/redisson-spring-data/redisson-spring-data-25/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-25/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index a396fc546..e372a4051 100644 --- a/redisson-spring-data/redisson-spring-data-25/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-25/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -1902,11 +1902,13 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(script); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } protected RedisCommand toCommand(ReturnType returnType, String name) { - RedisCommand c = null; + RedisCommand c = null; if (returnType == ReturnType.BOOLEAN) { c = org.redisson.api.RScript.ReturnType.BOOLEAN.getCommand(); } else if (returnType == ReturnType.INTEGER) { @@ -1937,7 +1939,9 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } @Override @@ -1947,7 +1951,16 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); + } + + private static byte[] getKey(int numKeys, byte[][] keysAndArgs) { + if (numKeys > 0 && keysAndArgs.length > 0) { + return keysAndArgs[0]; + } + return null; } @Override diff --git a/redisson-spring-data/redisson-spring-data-26/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-26/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index ff096453f..997841274 100644 --- a/redisson-spring-data/redisson-spring-data-26/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-26/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -1907,11 +1907,13 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(script); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } protected RedisCommand toCommand(ReturnType returnType, String name) { - RedisCommand c = null; + RedisCommand c = null; if (returnType == ReturnType.BOOLEAN) { c = org.redisson.api.RScript.ReturnType.BOOLEAN.getCommand(); } else if (returnType == ReturnType.INTEGER) { @@ -1942,7 +1944,9 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } @Override @@ -1952,7 +1956,16 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); + } + + private static byte[] getKey(int numKeys, byte[][] keysAndArgs) { + if (numKeys > 0 && keysAndArgs.length > 0) { + return keysAndArgs[0]; + } + return null; } @Override diff --git a/redisson-spring-data/redisson-spring-data-27/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java b/redisson-spring-data/redisson-spring-data-27/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java index 3eda19263..f659178c0 100644 --- a/redisson-spring-data/redisson-spring-data-27/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java +++ b/redisson-spring-data/redisson-spring-data-27/src/main/java/org/redisson/spring/data/connection/RedissonConnection.java @@ -1907,11 +1907,13 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(script); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } protected RedisCommand toCommand(ReturnType returnType, String name) { - RedisCommand c = null; + RedisCommand c = null; if (returnType == ReturnType.BOOLEAN) { c = org.redisson.api.RScript.ReturnType.BOOLEAN.getCommand(); } else if (returnType == ReturnType.INTEGER) { @@ -1942,7 +1944,9 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); } @Override @@ -1952,7 +1956,16 @@ public class RedissonConnection extends AbstractRedisConnection { params.add(scriptSha); params.add(numKeys); params.addAll(Arrays.asList(keysAndArgs)); - return write(null, ByteArrayCodec.INSTANCE, c, params.toArray()); + + byte[] key = getKey(numKeys, keysAndArgs); + return write(key, ByteArrayCodec.INSTANCE, c, params.toArray()); + } + + private static byte[] getKey(int numKeys, byte[][] keysAndArgs) { + if (numKeys > 0 && keysAndArgs.length > 0) { + return keysAndArgs[0]; + } + return null; } @Override