This is an automated email from the ASF dual-hosted git repository.
ringles pushed a commit to branch
GEODE-9892-Create-Infrastructure-for-Redis-Lists
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to
refs/heads/GEODE-9892-Create-Infrastructure-for-Redis-Lists by this push:
new 9ac638d spA and serialVersionUID
9ac638d is described below
commit 9ac638d2c1cecfdd6c0a369187aecf1f28099c24
Author: Ray Ingles <[email protected]>
AuthorDate: Wed Jan 12 15:38:41 2022 -0500
spA and serialVersionUID
---
.../executor/list/ListsNativeRedisAcceptanceTest.java | 1 -
.../internal/commands/executor/list/LPopDUnitTest.java | 8 ++++----
.../redis/internal/commands/executor/list/LLenExecutor.java | 2 --
.../redis/internal/commands/executor/list/LPopExecutor.java | 6 ------
.../internal/commands/executor/list/LPushExecutor.java | 5 ++---
.../org/apache/geode/redis/internal/data/RedisList.java | 2 +-
.../geode/redis/internal/data/collections/SizeableList.java | 6 +++---
.../geode/redis/internal/netty/ExecutionHandlerContext.java | 2 +-
.../redis/internal/data/collections/SizeableListTest.java | 13 ++++++-------
9 files changed, 17 insertions(+), 28 deletions(-)
diff --git
a/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/commands/executor/list/ListsNativeRedisAcceptanceTest.java
b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/commands/executor/list/ListsNativeRedisAcceptanceTest.java
index 37df9b2..6793b31 100755
---
a/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/commands/executor/list/ListsNativeRedisAcceptanceTest.java
+++
b/geode-for-redis/src/acceptanceTest/java/org/apache/geode/redis/internal/commands/executor/list/ListsNativeRedisAcceptanceTest.java
@@ -18,7 +18,6 @@ package
org.apache.geode.redis.internal.commands.executor.list;
import org.junit.ClassRule;
import org.apache.geode.redis.NativeRedisClusterTestRule;
-import
org.apache.geode.redis.internal.commands.executor.set.AbstractSetsIntegrationTest;
public class ListsNativeRedisAcceptanceTest extends
AbstractListsIntegrationTest {
diff --git
a/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java
b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java
index ad17e12..81cf478 100644
---
a/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java
+++
b/geode-for-redis/src/distributedTest/java/org/apache/geode/redis/internal/commands/executor/list/LPopDUnitTest.java
@@ -81,7 +81,7 @@ public class LPopDUnitTest {
List<String> elements = makeElementList(LIST_SIZE, "element1-");
List<String> halfOfElements = makeElementList(LIST_SIZE / 2, "element1-");
- jedis.lpush(key, elements.toArray(new String[]{}));
+ jedis.lpush(key, elements.toArray(new String[] {}));
for (int i = 0; i < halfOfElements.size(); i++) {
jedis.lpop(key);
}
@@ -103,7 +103,7 @@ public class LPopDUnitTest {
allElements.addAll(elements1);
allElements.addAll(elements2);
- jedis.lpush(key, allElements.toArray(new String[]{}));
+ jedis.lpush(key, allElements.toArray(new String[] {}));
new ConcurrentLoopingThreads(LIST_SIZE,
(i) -> jedis.lpop(key),
@@ -122,8 +122,8 @@ public class LPopDUnitTest {
List<String> elements1 = makeElementList(LIST_SIZE, "element1-");
List<String> elements2 = makeElementList(LIST_SIZE, "element2-");
- jedis.lpush(key1, elements1.toArray(new String[]{}));
- jedis.lpush(key2, elements2.toArray(new String[]{}));
+ jedis.lpush(key1, elements1.toArray(new String[] {}));
+ jedis.lpush(key2, elements2.toArray(new String[] {}));
new ConcurrentLoopingThreads(LIST_SIZE,
(i) -> jedis.lpop(key1),
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/list/LLenExecutor.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/list/LLenExecutor.java
index 810ea3b..71d2d19 100755
---
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/list/LLenExecutor.java
+++
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/list/LLenExecutor.java
@@ -21,8 +21,6 @@ import
org.apache.geode.redis.internal.commands.executor.CommandExecutor;
import org.apache.geode.redis.internal.commands.executor.RedisResponse;
import org.apache.geode.redis.internal.data.RedisData;
import org.apache.geode.redis.internal.data.RedisKey;
-import org.apache.geode.redis.internal.data.RedisList;
-import org.apache.geode.redis.internal.data.RedisSet;
import org.apache.geode.redis.internal.netty.ExecutionHandlerContext;
public class LLenExecutor implements CommandExecutor {
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/list/LPopExecutor.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/list/LPopExecutor.java
index b06c000..be6efec 100755
---
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/list/LPopExecutor.java
+++
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/list/LPopExecutor.java
@@ -15,12 +15,6 @@
package org.apache.geode.redis.internal.commands.executor.list;
-import static
org.apache.geode.redis.internal.RedisConstants.ERROR_VALUE_MUST_BE_POSITIVE;
-import static org.apache.geode.redis.internal.netty.Coder.bytesToLong;
-import static org.apache.geode.redis.internal.netty.Coder.narrowLongToInt;
-
-import java.util.Collection;
-import java.util.List;
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.commands.Command;
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/list/LPushExecutor.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/list/LPushExecutor.java
index efa5085..2b6973e 100755
---
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/list/LPushExecutor.java
+++
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/list/LPushExecutor.java
@@ -14,6 +14,8 @@
*/
package org.apache.geode.redis.internal.commands.executor.list;
+import java.util.List;
+
import org.apache.geode.cache.Region;
import org.apache.geode.redis.internal.commands.Command;
import org.apache.geode.redis.internal.commands.executor.CommandExecutor;
@@ -22,9 +24,6 @@ import org.apache.geode.redis.internal.data.RedisData;
import org.apache.geode.redis.internal.data.RedisKey;
import org.apache.geode.redis.internal.netty.ExecutionHandlerContext;
-import java.util.ArrayList;
-import java.util.List;
-
public class LPushExecutor implements CommandExecutor {
@Override
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java
index d1b672e..e777f5b 100644
---
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java
+++
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java
@@ -126,7 +126,7 @@ public class RedisList extends AbstractRedisData {
throws IOException, ClassNotFoundException {
super.fromData(in, context);
int size = DataSerializer.readPrimitiveInt(in);
- elements = new ElementList(Collections.emptyList()); //TODO: zero arg
constructor!!
+ elements = new ElementList(Collections.emptyList()); // TODO: zero arg
constructor!!
for (int i = 0; i < size; ++i) {
elements.add(DataSerializer.readByteArray(in));
}
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/collections/SizeableList.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/collections/SizeableList.java
index 83426ac..9179072 100644
---
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/collections/SizeableList.java
+++
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/collections/SizeableList.java
@@ -23,7 +23,7 @@ import java.util.LinkedList;
import org.apache.geode.internal.size.Sizeable;
public abstract class SizeableList<K> extends LinkedList<K> implements
Sizeable {
-// private static final long serialVersionUID = 9174920505089089517L;
+ private static final long serialVersionUID = -8255284217236712060L;
private static final int SIZEABLE_LIST_OVERHEAD =
memoryOverhead(SizeableList.class);
private static final int NODE_OVERHEAD = 4;
@@ -31,7 +31,7 @@ public abstract class SizeableList<K> extends LinkedList<K>
implements Sizeable
private int memberOverhead;
public SizeableList(Collection<K> collection) {
- for(K element: collection) {
+ for (K element : collection) {
this.add(0, element);
}
}
@@ -61,4 +61,4 @@ public abstract class SizeableList<K> extends LinkedList<K>
implements Sizeable
}
protected abstract int sizeElement(K element);
-}
\ No newline at end of file
+}
diff --git
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContext.java
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContext.java
index 7c2de2c..af05541 100644
---
a/geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContext.java
+++
b/geode-for-redis/src/main/java/org/apache/geode/redis/internal/netty/ExecutionHandlerContext.java
@@ -491,7 +491,7 @@ public class ExecutionHandlerContext extends
ChannelInboundHandlerAdapter {
}
public <R> R listLockedExecute(RedisKey key, boolean updateStats,
- FailableFunction<RedisList, R> function) {
+ FailableFunction<RedisList, R> function) {
return getRegionProvider().lockedExecute(key,
() -> function.apply(getRedisList(key, updateStats)));
}
diff --git
a/geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/collections/SizeableListTest.java
b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/collections/SizeableListTest.java
index ba6207c..1d6c4cc 100644
---
a/geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/collections/SizeableListTest.java
+++
b/geode-for-redis/src/test/java/org/apache/geode/redis/internal/data/collections/SizeableListTest.java
@@ -14,17 +14,16 @@
*/
package org.apache.geode.redis.internal.data.collections;
-import it.unimi.dsi.fastutil.bytes.ByteArrays;
-import org.apache.geode.cache.util.ObjectSizer;
-import org.apache.geode.internal.size.ReflectionObjectSizer;
-import org.apache.geode.redis.internal.data.RedisList;
-import org.apache.geode.redis.internal.data.RedisSet;
-import org.junit.Test;
+import static org.assertj.core.api.Assertions.assertThat;
import java.util.ArrayList;
import java.util.List;
-import static org.assertj.core.api.Assertions.assertThat;
+import org.junit.Test;
+
+import org.apache.geode.cache.util.ObjectSizer;
+import org.apache.geode.internal.size.ReflectionObjectSizer;
+import org.apache.geode.redis.internal.data.RedisList;
public class SizeableListTest {
private final ObjectSizer sizer = ReflectionObjectSizer.getInstance();
