This is an automated email from the ASF dual-hosted git repository. upthewaterspout pushed a commit to branch feature/redis-performance-testing in repository https://gitbox.apache.org/repos/asf/geode.git
commit 09bb9e3f9496ce8327a16489cc7eab513b7d0495 Author: Jens Deppe <[email protected]> AuthorDate: Mon Mar 15 07:46:49 2021 -0700 Fix minor compile error and spotless cleanup --- .../geode/redis/session/SessionExpirationDUnitTest.java | 3 +-- .../org/apache/geode/redis/internal/data/RedisHash.java | 8 ++++---- .../org/apache/geode/redis/internal/data/RedisSet.java | 14 ++++++++------ .../apache/geode/redis/internal/delta/AddsDeltaInfo.java | 1 - .../geode/redis/internal/executor/hash/HDelExecutor.java | 1 - .../redis/internal/executor/hash/HExistsExecutor.java | 1 - .../redis/internal/executor/hash/HGetAllExecutor.java | 1 - .../geode/redis/internal/executor/hash/HGetExecutor.java | 1 - .../redis/internal/executor/hash/HIncrByExecutor.java | 1 - .../redis/internal/executor/hash/HIncrByFloatExecutor.java | 1 - .../geode/redis/internal/executor/hash/HKeysExecutor.java | 1 - .../geode/redis/internal/executor/hash/HMGetExecutor.java | 1 - .../geode/redis/internal/executor/hash/HMSetExecutor.java | 2 -- .../redis/internal/executor/hash/HStrLenExecutor.java | 1 - .../geode/redis/internal/executor/hash/HValsExecutor.java | 1 - .../geode/redis/internal/executor/hash/HashExecutor.java | 1 - .../redis/internal/netty/ExecutionHandlerContext.java | 4 +--- 17 files changed, 14 insertions(+), 29 deletions(-) diff --git a/geode-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionExpirationDUnitTest.java b/geode-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionExpirationDUnitTest.java index b0b0502..d3dadb1 100644 --- a/geode-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionExpirationDUnitTest.java +++ b/geode-redis/src/distributedTest/java/org/apache/geode/redis/session/SessionExpirationDUnitTest.java @@ -33,7 +33,6 @@ import org.springframework.web.client.RestTemplate; import org.apache.geode.internal.cache.BucketDump; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.PartitionedRegion; -import org.apache.geode.redis.internal.data.ByteArrayWrapper; import org.apache.geode.redis.internal.data.RedisHash; import org.apache.geode.test.awaitility.GeodeAwaitility; import org.apache.geode.test.dunit.rules.ClusterStartupRule; @@ -161,7 +160,7 @@ public class SessionExpirationDUnitTest extends SessionDUnitTest { return 0; } ObjectInputStream inputStream; - byte[] bytes = redisHash.hget(new ByteArrayWrapper("maxInactiveInterval".getBytes())).toBytes(); + byte[] bytes = redisHash.hget("maxInactiveInterval".getBytes()); ByteArrayInputStream byteStream = new ByteArrayInputStream(bytes); try { inputStream = new ObjectInputStream(byteStream); diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/data/RedisHash.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/data/RedisHash.java index 77f7583..095827c 100644 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/data/RedisHash.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/data/RedisHash.java @@ -96,7 +96,7 @@ public class RedisHash extends AbstractRedisData { super.fromData(in); int size = DataSerializer.readInteger(in); hash = new Object2ObjectOpenCustomHashMap<>(size, ByteArrays.HASH_STRATEGY); - for(int i = 0; i < size; i++) { + for (int i = 0; i < size; i++) { hash.put(DataSerializer.readByteArray(in), DataSerializer.readByteArray(in)); } } @@ -349,12 +349,12 @@ public class RedisHash extends AbstractRedisData { return false; } RedisHash redisHash = (RedisHash) o; - if(hash.size() != redisHash.hash.size()) { + if (hash.size() != redisHash.hash.size()) { return false; } - for(Map.Entry<byte[], byte[]> entry : hash.entrySet()) { - if(!Arrays.equals(redisHash.hash.get(entry.getKey()), (entry.getValue()))) { + for (Map.Entry<byte[], byte[]> entry : hash.entrySet()) { + if (!Arrays.equals(redisHash.hash.get(entry.getKey()), (entry.getValue()))) { return false; } } diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSet.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSet.java index 25286a2..1a97b16 100644 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSet.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSet.java @@ -32,7 +32,6 @@ import java.util.Random; import java.util.Set; import java.util.regex.Pattern; import java.util.stream.Collectors; -import java.util.stream.Stream; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; @@ -124,8 +123,9 @@ public class RedisSet extends AbstractRedisData { } } if (!popped.isEmpty()) { - storeChanges(region, key, new RemsDeltaInfo(popped.stream().map(ByteArrayWrapper::toBytes).collect( - Collectors.toCollection(ArrayList::new)))); + storeChanges(region, key, + new RemsDeltaInfo(popped.stream().map(ByteArrayWrapper::toBytes).collect( + Collectors.toCollection(ArrayList::new)))); } return popped; } @@ -237,7 +237,8 @@ public class RedisSet extends AbstractRedisData { membersToAdd.removeIf(memberToAdd -> !membersAdd(memberToAdd)); int membersAdded = membersToAdd.size(); if (membersAdded != 0) { - final ArrayList<byte[]> rStream = membersToAdd.stream().map(ByteArrayWrapper::toBytes).collect(Collectors.toCollection(() -> new ArrayList<>())); + final ArrayList<byte[]> rStream = membersToAdd.stream().map(ByteArrayWrapper::toBytes) + .collect(Collectors.toCollection(() -> new ArrayList<>())); storeChanges(region, key, new AddsDeltaInfo(rStream)); } return membersAdded; @@ -256,8 +257,9 @@ public class RedisSet extends AbstractRedisData { membersToRemove.removeIf(memberToRemove -> !membersRemove(memberToRemove)); int membersRemoved = membersToRemove.size(); if (membersRemoved != 0) { - storeChanges(region, key, new RemsDeltaInfo(membersToRemove.stream().map(ByteArrayWrapper::toBytes).collect( - Collectors.toCollection(ArrayList::new)))); + storeChanges(region, key, + new RemsDeltaInfo(membersToRemove.stream().map(ByteArrayWrapper::toBytes).collect( + Collectors.toCollection(ArrayList::new)))); } return membersRemoved; } diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/delta/AddsDeltaInfo.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/delta/AddsDeltaInfo.java index 1cef973..16fd8bb 100644 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/delta/AddsDeltaInfo.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/delta/AddsDeltaInfo.java @@ -21,7 +21,6 @@ import java.io.IOException; import java.util.ArrayList; import org.apache.geode.DataSerializer; -import org.apache.geode.redis.internal.data.ByteArrayWrapper; public class AddsDeltaInfo implements DeltaInfo { private final ArrayList<byte[]> deltas; diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HDelExecutor.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HDelExecutor.java index ab33beb..e827bea 100755 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HDelExecutor.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HDelExecutor.java @@ -17,7 +17,6 @@ package org.apache.geode.redis.internal.executor.hash; import java.util.ArrayList; import java.util.List; -import org.apache.geode.redis.internal.data.ByteArrayWrapper; import org.apache.geode.redis.internal.data.RedisKey; import org.apache.geode.redis.internal.executor.RedisResponse; import org.apache.geode.redis.internal.netty.Command; diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HExistsExecutor.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HExistsExecutor.java index 5ff89fe..67aae53 100755 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HExistsExecutor.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HExistsExecutor.java @@ -16,7 +16,6 @@ package org.apache.geode.redis.internal.executor.hash; import java.util.List; -import org.apache.geode.redis.internal.data.ByteArrayWrapper; import org.apache.geode.redis.internal.data.RedisKey; import org.apache.geode.redis.internal.executor.RedisResponse; import org.apache.geode.redis.internal.netty.Command; diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetAllExecutor.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetAllExecutor.java index 6f214fd..5a55305 100755 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetAllExecutor.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetAllExecutor.java @@ -16,7 +16,6 @@ package org.apache.geode.redis.internal.executor.hash; import java.util.Collection; -import org.apache.geode.redis.internal.data.ByteArrayWrapper; import org.apache.geode.redis.internal.data.RedisKey; import org.apache.geode.redis.internal.executor.RedisResponse; import org.apache.geode.redis.internal.netty.Command; diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetExecutor.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetExecutor.java index 0fe626b..c4721da 100755 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetExecutor.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HGetExecutor.java @@ -16,7 +16,6 @@ package org.apache.geode.redis.internal.executor.hash; import java.util.List; -import org.apache.geode.redis.internal.data.ByteArrayWrapper; import org.apache.geode.redis.internal.data.RedisKey; import org.apache.geode.redis.internal.executor.RedisResponse; import org.apache.geode.redis.internal.netty.Command; diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByExecutor.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByExecutor.java index 8283228..1942c57 100755 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByExecutor.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByExecutor.java @@ -16,7 +16,6 @@ package org.apache.geode.redis.internal.executor.hash; import java.util.List; -import org.apache.geode.redis.internal.data.ByteArrayWrapper; import org.apache.geode.redis.internal.data.RedisKey; import org.apache.geode.redis.internal.executor.RedisResponse; import org.apache.geode.redis.internal.netty.Coder; diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java index d6c69ef..f08a574 100755 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HIncrByFloatExecutor.java @@ -20,7 +20,6 @@ import java.util.List; import org.apache.commons.lang3.tuple.Pair; -import org.apache.geode.redis.internal.data.ByteArrayWrapper; import org.apache.geode.redis.internal.data.RedisKey; import org.apache.geode.redis.internal.executor.RedisResponse; import org.apache.geode.redis.internal.executor.string.IncrByFloatExecutor; diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HKeysExecutor.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HKeysExecutor.java index 783ad66..3bb8d63 100755 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HKeysExecutor.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HKeysExecutor.java @@ -17,7 +17,6 @@ package org.apache.geode.redis.internal.executor.hash; import java.util.Collection; -import org.apache.geode.redis.internal.data.ByteArrayWrapper; import org.apache.geode.redis.internal.data.RedisKey; import org.apache.geode.redis.internal.executor.RedisResponse; import org.apache.geode.redis.internal.netty.Command; diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMGetExecutor.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMGetExecutor.java index aa96b4c8..d9d1781 100755 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMGetExecutor.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMGetExecutor.java @@ -17,7 +17,6 @@ package org.apache.geode.redis.internal.executor.hash; import java.util.ArrayList; import java.util.List; -import org.apache.geode.redis.internal.data.ByteArrayWrapper; import org.apache.geode.redis.internal.data.RedisKey; import org.apache.geode.redis.internal.executor.RedisResponse; import org.apache.geode.redis.internal.netty.Command; diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMSetExecutor.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMSetExecutor.java index a945e30..c240520 100755 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMSetExecutor.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HMSetExecutor.java @@ -14,10 +14,8 @@ */ package org.apache.geode.redis.internal.executor.hash; -import java.util.ArrayList; import java.util.List; -import org.apache.geode.redis.internal.data.ByteArrayWrapper; import org.apache.geode.redis.internal.data.RedisKey; import org.apache.geode.redis.internal.executor.RedisResponse; import org.apache.geode.redis.internal.netty.Command; diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HStrLenExecutor.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HStrLenExecutor.java index de192cd..39f7678 100755 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HStrLenExecutor.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HStrLenExecutor.java @@ -17,7 +17,6 @@ package org.apache.geode.redis.internal.executor.hash; import java.util.List; -import org.apache.geode.redis.internal.data.ByteArrayWrapper; import org.apache.geode.redis.internal.data.RedisKey; import org.apache.geode.redis.internal.executor.RedisResponse; import org.apache.geode.redis.internal.netty.Command; diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HValsExecutor.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HValsExecutor.java index eccaca3..75c2f76 100755 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HValsExecutor.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HValsExecutor.java @@ -17,7 +17,6 @@ package org.apache.geode.redis.internal.executor.hash; import java.util.Collection; -import org.apache.geode.redis.internal.data.ByteArrayWrapper; import org.apache.geode.redis.internal.data.RedisKey; import org.apache.geode.redis.internal.executor.RedisResponse; import org.apache.geode.redis.internal.netty.Command; diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HashExecutor.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HashExecutor.java index 3183693..0c14e4d 100755 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HashExecutor.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/executor/hash/HashExecutor.java @@ -16,7 +16,6 @@ package org.apache.geode.redis.internal.executor.hash; import org.apache.geode.redis.internal.executor.AbstractExecutor; -import org.apache.geode.redis.internal.netty.ExecutionHandlerContext; /** * Executor for handling HASH datatypes diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContext.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContext.java index c43905e..2002d13 100644 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContext.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContext.java @@ -18,7 +18,6 @@ package org.apache.geode.redis.internal.netty; import java.io.IOException; import java.math.BigInteger; -import java.net.SocketAddress; import java.util.concurrent.CountDownLatch; import java.util.concurrent.ExecutorService; import java.util.concurrent.LinkedBlockingQueue; @@ -52,7 +51,6 @@ import org.apache.geode.redis.internal.RegionProvider; import org.apache.geode.redis.internal.data.RedisDataTypeMismatchException; import org.apache.geode.redis.internal.executor.CommandFunction; import org.apache.geode.redis.internal.executor.RedisResponse; -import org.apache.geode.redis.internal.executor.hash.HashExecutor; import org.apache.geode.redis.internal.executor.hash.RedisHashCommands; import org.apache.geode.redis.internal.executor.hash.RedisHashCommandsFunctionInvoker; import org.apache.geode.redis.internal.pubsub.PubSub; @@ -131,7 +129,7 @@ public class ExecutionHandlerContext extends ChannelInboundHandlerAdapter { this.hscanCursor = new BigInteger("0"); redisStats.addClient(); - //TODO - this really should just be a cache wide field, not on the execution context + // TODO - this really should just be a cache wide field, not on the execution context this.hashCommands = new RedisHashCommandsFunctionInvoker(getRegionProvider().getDataRegion()); // backgroundExecutor.submit(this::processCommandQueue); }
