From a3ede6cb29ee29996e36cbcb35bfe85f48ae7ebd Mon Sep 17 00:00:00 2001 From: Nikita Koksharov Date: Fri, 14 Oct 2022 12:10:59 +0300 Subject: [PATCH] refactoring --- .../src/main/java/org/redisson/RedissonGeo.java | 6 +++--- .../src/main/java/org/redisson/RedissonObject.java | 7 ++++--- .../java/org/redisson/RedissonQueueSemaphore.java | 4 ++-- .../java/org/redisson/RedissonScoredSortedSet.java | 14 +++++++------- .../main/java/org/redisson/RedissonSetCache.java | 2 +- .../main/java/org/redisson/RedissonTimeSeries.java | 2 +- 6 files changed, 18 insertions(+), 17 deletions(-) diff --git a/redisson/src/main/java/org/redisson/RedissonGeo.java b/redisson/src/main/java/org/redisson/RedissonGeo.java index 3b0dc1a71..c75070923 100644 --- a/redisson/src/main/java/org/redisson/RedissonGeo.java +++ b/redisson/src/main/java/org/redisson/RedissonGeo.java @@ -115,7 +115,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo extends RedissonScoredSortedSet implements RGeo params = new ArrayList<>(members.length + 1); params.add(getRawName()); for (Object member : members) { - params.add(encode(params, member)); + encode(params, member); } RedisCommand> command = new RedisCommand>("GEOHASH", new MapGetAllDecoder((List) Arrays.asList(members), 0)); @@ -207,7 +207,7 @@ public class RedissonGeo extends RedissonScoredSortedSet implements RGeo params = new ArrayList<>(members.length + 1); params.add(getRawName()); for (Object member : members) { - params.add(encode(params, member)); + encode(params, member); } MultiDecoder> decoder = new ListMultiDecoder2( diff --git a/redisson/src/main/java/org/redisson/RedissonObject.java b/redisson/src/main/java/org/redisson/RedissonObject.java index 7d083fc39..2656a0113 100644 --- a/redisson/src/main/java/org/redisson/RedissonObject.java +++ b/redisson/src/main/java/org/redisson/RedissonObject.java @@ -247,7 +247,7 @@ public abstract class RedissonObject implements RObject { protected List encode(Collection values) { List result = new ArrayList<>(values.size()); for (Object object : values) { - result.add(encode(result, object)); + encode(result, object); } return result; } @@ -313,9 +313,10 @@ public abstract class RedissonObject implements RObject { return commandExecutor.encode(codec, value); } - public ByteBuf encode(Collection params, Object value) { + public void encode(Collection params, Object value) { try { - return commandExecutor.encode(codec, value); + Object v = commandExecutor.encode(codec, value); + ((Collection)params).add(v); } catch (Exception e) { params.forEach(v -> { ReferenceCountUtil.safeRelease(v); diff --git a/redisson/src/main/java/org/redisson/RedissonQueueSemaphore.java b/redisson/src/main/java/org/redisson/RedissonQueueSemaphore.java index bf46880f7..ca146b995 100644 --- a/redisson/src/main/java/org/redisson/RedissonQueueSemaphore.java +++ b/redisson/src/main/java/org/redisson/RedissonQueueSemaphore.java @@ -57,12 +57,12 @@ public class RedissonQueueSemaphore extends RedissonSemaphore { params = new ArrayList<>(values.size() + 1); params.add(values.size()); for (Object value : values) { - params.add(encode(params, value)); + encode(params, value); } } else { params = new ArrayList<>(2); params.add(1); - params.add(encode(params, value)); + encode(params, value); } return commandExecutor.evalWriteNoRetryAsync(getRawName(), codec, RedisCommands.EVAL_BOOLEAN, "local value = redis.call('get', KEYS[1]); " + diff --git a/redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java b/redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java index 05b82e84b..74f1e5f02 100644 --- a/redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java +++ b/redisson/src/main/java/org/redisson/RedissonScoredSortedSet.java @@ -408,7 +408,7 @@ public class RedissonScoredSortedSet extends RedissonExpirable implements RSc if (t.getValue() == null) { throw new NullPointerException("map value can't be null"); } - params.add(encode(params, t.getKey())); + encode(params, t.getKey()); params.add(BigDecimal.valueOf(t.getValue()).toPlainString()); } @@ -525,7 +525,7 @@ public class RedissonScoredSortedSet extends RedissonExpirable implements RSc params.add(getRawName()); for (Entry entry : objects.entrySet()) { params.add(BigDecimal.valueOf(entry.getValue()).toPlainString()); - params.add(encode(params, entry.getKey())); + encode(params, entry.getKey()); } return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.ZADD_INT, params.toArray()); @@ -546,7 +546,7 @@ public class RedissonScoredSortedSet extends RedissonExpirable implements RSc params.add("NX"); for (Entry entry : objects.entrySet()) { params.add(BigDecimal.valueOf(entry.getValue()).toPlainString()); - params.add(encode(params, entry.getKey())); + encode(params, entry.getKey()); } return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.ZADD_INT, params.toArray()); @@ -568,7 +568,7 @@ public class RedissonScoredSortedSet extends RedissonExpirable implements RSc params.add("CH"); for (Entry entry : objects.entrySet()) { params.add(BigDecimal.valueOf(entry.getValue()).toPlainString()); - params.add(encode(params, entry.getKey())); + encode(params, entry.getKey()); } return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.ZADD_INT, params.toArray()); @@ -590,7 +590,7 @@ public class RedissonScoredSortedSet extends RedissonExpirable implements RSc params.add("CH"); for (Entry entry : objects.entrySet()) { params.add(BigDecimal.valueOf(entry.getValue()).toPlainString()); - params.add(encode(params, entry.getKey())); + encode(params, entry.getKey()); } return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.ZADD_INT, params.toArray()); @@ -612,7 +612,7 @@ public class RedissonScoredSortedSet extends RedissonExpirable implements RSc params.add("CH"); for (Entry entry : objects.entrySet()) { params.add(BigDecimal.valueOf(entry.getValue()).toPlainString()); - params.add(encode(params, entry.getKey())); + encode(params, entry.getKey()); } return commandExecutor.writeAsync(getRawName(), codec, RedisCommands.ZADD_INT, params.toArray()); @@ -949,7 +949,7 @@ public class RedissonScoredSortedSet extends RedissonExpirable implements RSc List params = new ArrayList<>(c.size() * 2); for (Object object : c) { params.add(0); - params.add(encode(params, object)); + encode(params, object); } return commandExecutor.evalWriteAsync(getRawName(), codec, RedisCommands.EVAL_BOOLEAN, diff --git a/redisson/src/main/java/org/redisson/RedissonSetCache.java b/redisson/src/main/java/org/redisson/RedissonSetCache.java index 196321009..928d7855e 100644 --- a/redisson/src/main/java/org/redisson/RedissonSetCache.java +++ b/redisson/src/main/java/org/redisson/RedissonSetCache.java @@ -366,7 +366,7 @@ public class RedissonSetCache extends RedissonExpirable implements RSetCache< List params = new ArrayList<>(c.size() * 2); for (Object object : c) { params.add(score); - params.add(encode(params, object)); + encode(params, object); } return commandExecutor.evalWriteAsync(getRawName(), codec, RedisCommands.EVAL_BOOLEAN, diff --git a/redisson/src/main/java/org/redisson/RedissonTimeSeries.java b/redisson/src/main/java/org/redisson/RedissonTimeSeries.java index 9f7751f60..6266e8d9f 100644 --- a/redisson/src/main/java/org/redisson/RedissonTimeSeries.java +++ b/redisson/src/main/java/org/redisson/RedissonTimeSeries.java @@ -117,7 +117,7 @@ public class RedissonTimeSeries extends RedissonExpirable implements RTimeSer byte[] random = new byte[16]; ThreadLocalRandom.current().nextBytes(random); params.add(random); - params.add(encode(params, entry.getValue())); + encode(params, entry.getValue()); } if (timeToLive > 0) {