dschneider-pivotal commented on a change in pull request #7403:
URL: https://github.com/apache/geode/pull/7403#discussion_r827462119
##########
File path:
geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java
##########
@@ -127,50 +127,139 @@ private int getArrayIndex(int listIndex) {
}
/**
- * @param elementsToAdd elements to add to this set; NOTE this list may by
modified by this call
- * @param region the region this instance is stored in
- * @param key the name of the set to add to
- * @param onlyIfExists if true then the elements should only be added if the
key already exists
- * and holds a list, otherwise no operation is performed.
- * @return the length of the list after the operation
- */
- public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
- final boolean onlyIfExists) {
- elementsPush(elementsToAdd);
- storeChanges(region, key, new AddByteArrays(elementsToAdd));
+ * @return the number of elements in the list
+ **/
+ public int llen() {
return elementList.size();
}
/**
* @param region the region this instance is stored in
- * @param key the name of the set to add to
+ * @param key the name of the list to add to
Review comment:
change "add to" to "pop from"
##########
File path:
geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java
##########
@@ -127,50 +127,139 @@ private int getArrayIndex(int listIndex) {
}
/**
- * @param elementsToAdd elements to add to this set; NOTE this list may by
modified by this call
- * @param region the region this instance is stored in
- * @param key the name of the set to add to
- * @param onlyIfExists if true then the elements should only be added if the
key already exists
- * and holds a list, otherwise no operation is performed.
- * @return the length of the list after the operation
- */
- public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
- final boolean onlyIfExists) {
- elementsPush(elementsToAdd);
- storeChanges(region, key, new AddByteArrays(elementsToAdd));
+ * @return the number of elements in the list
+ **/
+ public int llen() {
return elementList.size();
}
/**
* @param region the region this instance is stored in
- * @param key the name of the set to add to
+ * @param key the name of the list to add to
* @return the element actually popped
*/
public byte[] lpop(Region<RedisKey, RedisData> region, RedisKey key) {
- byte[] popped = elementRemove(0);
- RemoveElementsByIndex removed = new RemoveElementsByIndex();
- removed.add(0);
+ byte newVersion;
+ byte[] popped;
+ RemoveElementsByIndex removed;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ popped = removeFirstElement();
+ removed = new RemoveElementsByIndex(newVersion);
+ removed.add(0);
+ }
storeChanges(region, key, removed);
return popped;
}
+ public synchronized byte[] removeFirstElement() {
+ return elementList.removeFirst();
+ }
+
+ public synchronized byte[] removeLastElement() {
+ return elementList.removeLast();
+ }
+
/**
- * @return the number of elements in the list
+ * @param elementsToAdd elements to add to this list; NOTE this list may be
modified by this call
+ * @param region the region this instance is stored in
+ * @param key the name of the list to add to
+ * @param onlyIfExists if true then the elements should only be added if the
key already exists
+ * and holds a list, otherwise no operation is performed.
+ * @return the length of the list after the operation
*/
- public int llen() {
+ public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
+ final boolean onlyIfExists) {
+ byte newVersion;
+ AddByteArrays addByteArrays;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ elementsPush(elementsToAdd);
+ addByteArrays = new AddByteArrays(newVersion, elementsToAdd);
+ }
+ storeChanges(region, key, addByteArrays);
return elementList.size();
}
+ /**
+ * @param elementsToAdd elements to add to this list; NOTE this list may be
modified by this call
+ * @param region the region this instance is stored in
+ * @param key the name of the list to add to
+ * @return the number of elements actually added
+ */
+ public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key) {
+ byte newVersion;
+ AddByteArrays addByteArrays;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ elementsPush(elementsToAdd);
+ addByteArrays = new AddByteArrays(newVersion, elementsToAdd);
+ }
+ storeChanges(region, key, addByteArrays);
+ return elementList.size();
+ }
+
+ public byte[] ltrim(long start, long end, Region<RedisKey, RedisData> region,
+ RedisKey key) {
+ byte newVersion;
+ int length = elementList.size();
+ int boundedStart = getBoundedStartIndex(start, length);
+ int boundedEnd = getBoundedEndIndex(end, length);
+ List<Integer> removed = new ArrayList<>();
+ RemoveElementsByIndex removeElementsByIndex;
+
+ synchronized (this) {
+ if (boundedStart > boundedEnd || boundedStart == length) {
+ // Remove everything
+ for (int i = length - 1; i >= 0; i--) {
+ removed.add(i);
+ }
+ } else {
+ // Remove any elements after boundedEnd
+ for (int i = length - 1; i > boundedEnd; i--) {
+ removed.add(i);
+ }
+
+ // Remove any elements before boundedStart
+ for (int i = boundedStart - 1; i >= 0; i--) {
+ removed.add(i);
+ }
+ }
+
+ if (removed.size() > 0) {
Review comment:
no need for this size check. The for statement in elementsRemove will do
nothing if remove is empty
##########
File path:
geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java
##########
@@ -127,50 +127,139 @@ private int getArrayIndex(int listIndex) {
}
/**
- * @param elementsToAdd elements to add to this set; NOTE this list may by
modified by this call
- * @param region the region this instance is stored in
- * @param key the name of the set to add to
- * @param onlyIfExists if true then the elements should only be added if the
key already exists
- * and holds a list, otherwise no operation is performed.
- * @return the length of the list after the operation
- */
- public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
- final boolean onlyIfExists) {
- elementsPush(elementsToAdd);
- storeChanges(region, key, new AddByteArrays(elementsToAdd));
+ * @return the number of elements in the list
+ **/
+ public int llen() {
return elementList.size();
}
/**
* @param region the region this instance is stored in
- * @param key the name of the set to add to
+ * @param key the name of the list to add to
* @return the element actually popped
*/
public byte[] lpop(Region<RedisKey, RedisData> region, RedisKey key) {
- byte[] popped = elementRemove(0);
- RemoveElementsByIndex removed = new RemoveElementsByIndex();
- removed.add(0);
+ byte newVersion;
+ byte[] popped;
+ RemoveElementsByIndex removed;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ popped = removeFirstElement();
+ removed = new RemoveElementsByIndex(newVersion);
Review comment:
I think the sync can end right after the removeFirstElement call. No
need to hold sync while creating the DeltaInfo instance
##########
File path:
geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java
##########
@@ -127,50 +127,139 @@ private int getArrayIndex(int listIndex) {
}
/**
- * @param elementsToAdd elements to add to this set; NOTE this list may by
modified by this call
- * @param region the region this instance is stored in
- * @param key the name of the set to add to
- * @param onlyIfExists if true then the elements should only be added if the
key already exists
- * and holds a list, otherwise no operation is performed.
- * @return the length of the list after the operation
- */
- public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
- final boolean onlyIfExists) {
- elementsPush(elementsToAdd);
- storeChanges(region, key, new AddByteArrays(elementsToAdd));
+ * @return the number of elements in the list
+ **/
+ public int llen() {
return elementList.size();
}
/**
* @param region the region this instance is stored in
- * @param key the name of the set to add to
+ * @param key the name of the list to add to
* @return the element actually popped
*/
public byte[] lpop(Region<RedisKey, RedisData> region, RedisKey key) {
- byte[] popped = elementRemove(0);
- RemoveElementsByIndex removed = new RemoveElementsByIndex();
- removed.add(0);
+ byte newVersion;
+ byte[] popped;
+ RemoveElementsByIndex removed;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ popped = removeFirstElement();
+ removed = new RemoveElementsByIndex(newVersion);
+ removed.add(0);
+ }
storeChanges(region, key, removed);
return popped;
}
+ public synchronized byte[] removeFirstElement() {
+ return elementList.removeFirst();
+ }
+
+ public synchronized byte[] removeLastElement() {
+ return elementList.removeLast();
+ }
+
/**
- * @return the number of elements in the list
+ * @param elementsToAdd elements to add to this list; NOTE this list may be
modified by this call
+ * @param region the region this instance is stored in
+ * @param key the name of the list to add to
+ * @param onlyIfExists if true then the elements should only be added if the
key already exists
+ * and holds a list, otherwise no operation is performed.
+ * @return the length of the list after the operation
*/
- public int llen() {
+ public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
+ final boolean onlyIfExists) {
+ byte newVersion;
+ AddByteArrays addByteArrays;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ elementsPush(elementsToAdd);
+ addByteArrays = new AddByteArrays(newVersion, elementsToAdd);
+ }
+ storeChanges(region, key, addByteArrays);
return elementList.size();
}
+ /**
+ * @param elementsToAdd elements to add to this list; NOTE this list may be
modified by this call
+ * @param region the region this instance is stored in
+ * @param key the name of the list to add to
+ * @return the number of elements actually added
+ */
+ public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key) {
+ byte newVersion;
+ AddByteArrays addByteArrays;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ elementsPush(elementsToAdd);
+ addByteArrays = new AddByteArrays(newVersion, elementsToAdd);
+ }
+ storeChanges(region, key, addByteArrays);
+ return elementList.size();
+ }
+
+ public byte[] ltrim(long start, long end, Region<RedisKey, RedisData> region,
+ RedisKey key) {
+ byte newVersion;
+ int length = elementList.size();
+ int boundedStart = getBoundedStartIndex(start, length);
+ int boundedEnd = getBoundedEndIndex(end, length);
+ List<Integer> removed = new ArrayList<>();
Review comment:
It does not seem performant to build up an ArrayList of every index we
are going to remove. All you need for this DeltaInfo is two numbers, start and
end. So just add an RetainElementsByIndexRange DeltaInfo.
You can make sure they are actual "bounded" indexes.
Then instead of elementsRemove having to iterate over the list for very item
you are removing, you can just implement elementsRetainByIndexRange that takes
two ints. You should be able to implement that method by using an Iterator that
only traverse the linked list once.
##########
File path:
geode-for-redis/src/main/java/org/apache/geode/redis/internal/commands/executor/list/LTrimExecutor.java
##########
@@ -0,0 +1,57 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
contributor license
+ * agreements. See the NOTICE file distributed with this work for additional
information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache
License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the
License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express
+ * or implied. See the License for the specific language governing permissions
and limitations under
+ * the License.
+ */
+package org.apache.geode.redis.internal.commands.executor.list;
+
+import static org.apache.geode.redis.internal.RedisConstants.ERROR_NOT_INTEGER;
+
+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;
+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.netty.Coder;
+import org.apache.geode.redis.internal.netty.ExecutionHandlerContext;
+
+public class LTrimExecutor implements CommandExecutor {
+ private static final int startIndex = 2;
+ private static final int stopIndex = 3;
+
+ @Override
+ public RedisResponse executeCommand(Command command, ExecutionHandlerContext
context) {
+ List<byte[]> commandElems = command.getProcessedCommand();
+ Region<RedisKey, RedisData> region = context.getRegion();
+ RedisKey key = command.getKey();
+
+ long start;
+ long end;
+
+ try {
+ byte[] startI = commandElems.get(startIndex);
+ byte[] stopI = commandElems.get(stopIndex);
+ start = Coder.bytesToLong(startI);
+ end = Coder.bytesToLong(stopI);
+ } catch (NumberFormatException e) {
+ return RedisResponse.error(ERROR_NOT_INTEGER);
+ }
+
+ byte[] retVal =
+ context.listLockedExecute(key, false, list -> list.ltrim(start, end,
region, key));
+ // return RedisResponse.error(ERROR_NOT_INTEGER);
Review comment:
remove this comment
##########
File path:
geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSet.java
##########
@@ -422,16 +424,21 @@ synchronized boolean membersRemove(byte[] memberToRemove)
{
* @return the number of members actually added
*/
public long sadd(List<byte[]> membersToAdd, Region<RedisKey, RedisData>
region, RedisKey key) {
- AddByteArrays delta = new AddByteArrays();
+ AddByteArrays delta;
+ byte newVersion;
int membersAdded = 0;
- for (byte[] member : membersToAdd) {
- if (membersAdd(member)) {
- delta.add(member);
- membersAdded++;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
Review comment:
newVersion can be declared inside the sync
##########
File path:
geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java
##########
@@ -127,50 +127,139 @@ private int getArrayIndex(int listIndex) {
}
/**
- * @param elementsToAdd elements to add to this set; NOTE this list may by
modified by this call
- * @param region the region this instance is stored in
- * @param key the name of the set to add to
- * @param onlyIfExists if true then the elements should only be added if the
key already exists
- * and holds a list, otherwise no operation is performed.
- * @return the length of the list after the operation
- */
- public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
- final boolean onlyIfExists) {
- elementsPush(elementsToAdd);
- storeChanges(region, key, new AddByteArrays(elementsToAdd));
+ * @return the number of elements in the list
+ **/
+ public int llen() {
return elementList.size();
}
/**
* @param region the region this instance is stored in
- * @param key the name of the set to add to
+ * @param key the name of the list to add to
* @return the element actually popped
*/
public byte[] lpop(Region<RedisKey, RedisData> region, RedisKey key) {
- byte[] popped = elementRemove(0);
- RemoveElementsByIndex removed = new RemoveElementsByIndex();
- removed.add(0);
+ byte newVersion;
+ byte[] popped;
+ RemoveElementsByIndex removed;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ popped = removeFirstElement();
+ removed = new RemoveElementsByIndex(newVersion);
+ removed.add(0);
+ }
storeChanges(region, key, removed);
return popped;
}
+ public synchronized byte[] removeFirstElement() {
+ return elementList.removeFirst();
+ }
+
+ public synchronized byte[] removeLastElement() {
+ return elementList.removeLast();
+ }
+
/**
- * @return the number of elements in the list
+ * @param elementsToAdd elements to add to this list; NOTE this list may be
modified by this call
+ * @param region the region this instance is stored in
+ * @param key the name of the list to add to
+ * @param onlyIfExists if true then the elements should only be added if the
key already exists
+ * and holds a list, otherwise no operation is performed.
+ * @return the length of the list after the operation
*/
- public int llen() {
+ public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
+ final boolean onlyIfExists) {
+ byte newVersion;
+ AddByteArrays addByteArrays;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ elementsPush(elementsToAdd);
+ addByteArrays = new AddByteArrays(newVersion, elementsToAdd);
Review comment:
no need to hold sync while creating AddByteArray
##########
File path:
geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisSet.java
##########
@@ -422,16 +424,21 @@ synchronized boolean membersRemove(byte[] memberToRemove)
{
* @return the number of members actually added
*/
public long sadd(List<byte[]> membersToAdd, Region<RedisKey, RedisData>
region, RedisKey key) {
- AddByteArrays delta = new AddByteArrays();
+ AddByteArrays delta;
+ byte newVersion;
int membersAdded = 0;
- for (byte[] member : membersToAdd) {
- if (membersAdd(member)) {
- delta.add(member);
- membersAdded++;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ delta = new AddByteArrays(newVersion);
+ for (byte[] member : membersToAdd) {
+ if (membersAdd(member)) {
+ delta.add(member);
+ membersAdded++;
+ }
+ }
+ if (membersAdded == 0) {
Review comment:
The sync can end before you check if membersAdded is 0
##########
File path:
geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java
##########
@@ -127,50 +127,139 @@ private int getArrayIndex(int listIndex) {
}
/**
- * @param elementsToAdd elements to add to this set; NOTE this list may by
modified by this call
- * @param region the region this instance is stored in
- * @param key the name of the set to add to
- * @param onlyIfExists if true then the elements should only be added if the
key already exists
- * and holds a list, otherwise no operation is performed.
- * @return the length of the list after the operation
- */
- public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
- final boolean onlyIfExists) {
- elementsPush(elementsToAdd);
- storeChanges(region, key, new AddByteArrays(elementsToAdd));
+ * @return the number of elements in the list
+ **/
+ public int llen() {
return elementList.size();
}
/**
* @param region the region this instance is stored in
- * @param key the name of the set to add to
+ * @param key the name of the list to add to
* @return the element actually popped
*/
public byte[] lpop(Region<RedisKey, RedisData> region, RedisKey key) {
- byte[] popped = elementRemove(0);
- RemoveElementsByIndex removed = new RemoveElementsByIndex();
- removed.add(0);
+ byte newVersion;
+ byte[] popped;
+ RemoveElementsByIndex removed;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ popped = removeFirstElement();
+ removed = new RemoveElementsByIndex(newVersion);
+ removed.add(0);
+ }
storeChanges(region, key, removed);
return popped;
}
+ public synchronized byte[] removeFirstElement() {
+ return elementList.removeFirst();
+ }
+
+ public synchronized byte[] removeLastElement() {
+ return elementList.removeLast();
+ }
+
/**
- * @return the number of elements in the list
+ * @param elementsToAdd elements to add to this list; NOTE this list may be
modified by this call
+ * @param region the region this instance is stored in
+ * @param key the name of the list to add to
+ * @param onlyIfExists if true then the elements should only be added if the
key already exists
+ * and holds a list, otherwise no operation is performed.
+ * @return the length of the list after the operation
*/
- public int llen() {
+ public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
+ final boolean onlyIfExists) {
+ byte newVersion;
+ AddByteArrays addByteArrays;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ elementsPush(elementsToAdd);
+ addByteArrays = new AddByteArrays(newVersion, elementsToAdd);
+ }
+ storeChanges(region, key, addByteArrays);
return elementList.size();
}
+ /**
+ * @param elementsToAdd elements to add to this list; NOTE this list may be
modified by this call
+ * @param region the region this instance is stored in
+ * @param key the name of the list to add to
+ * @return the number of elements actually added
+ */
+ public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key) {
+ byte newVersion;
+ AddByteArrays addByteArrays;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ elementsPush(elementsToAdd);
+ addByteArrays = new AddByteArrays(newVersion, elementsToAdd);
+ }
+ storeChanges(region, key, addByteArrays);
+ return elementList.size();
+ }
+
+ public byte[] ltrim(long start, long end, Region<RedisKey, RedisData> region,
+ RedisKey key) {
+ byte newVersion;
+ int length = elementList.size();
+ int boundedStart = getBoundedStartIndex(start, length);
+ int boundedEnd = getBoundedEndIndex(end, length);
+ List<Integer> removed = new ArrayList<>();
+ RemoveElementsByIndex removeElementsByIndex;
+
+ synchronized (this) {
+ if (boundedStart > boundedEnd || boundedStart == length) {
+ // Remove everything
+ for (int i = length - 1; i >= 0; i--) {
+ removed.add(i);
+ }
+ } else {
+ // Remove any elements after boundedEnd
+ for (int i = length - 1; i > boundedEnd; i--) {
+ removed.add(i);
+ }
+
+ // Remove any elements before boundedStart
+ for (int i = boundedStart - 1; i >= 0; i--) {
+ removed.add(i);
+ }
+ }
+
+ if (removed.size() > 0) {
+ elementsRemove(removed);
+ }
+ newVersion = incrementAndGetVersion();
+ removeElementsByIndex = new RemoveElementsByIndex(newVersion, removed);
+ }
+ storeChanges(region, key, removeElementsByIndex);
+ return null;
Review comment:
It seems like this method return type should be void since it always
returns null.
##########
File path:
geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java
##########
@@ -127,50 +127,139 @@ private int getArrayIndex(int listIndex) {
}
/**
- * @param elementsToAdd elements to add to this set; NOTE this list may by
modified by this call
- * @param region the region this instance is stored in
- * @param key the name of the set to add to
- * @param onlyIfExists if true then the elements should only be added if the
key already exists
- * and holds a list, otherwise no operation is performed.
- * @return the length of the list after the operation
- */
- public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
- final boolean onlyIfExists) {
- elementsPush(elementsToAdd);
- storeChanges(region, key, new AddByteArrays(elementsToAdd));
+ * @return the number of elements in the list
+ **/
+ public int llen() {
return elementList.size();
}
/**
* @param region the region this instance is stored in
- * @param key the name of the set to add to
+ * @param key the name of the list to add to
* @return the element actually popped
*/
public byte[] lpop(Region<RedisKey, RedisData> region, RedisKey key) {
- byte[] popped = elementRemove(0);
- RemoveElementsByIndex removed = new RemoveElementsByIndex();
- removed.add(0);
+ byte newVersion;
+ byte[] popped;
+ RemoveElementsByIndex removed;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ popped = removeFirstElement();
+ removed = new RemoveElementsByIndex(newVersion);
+ removed.add(0);
+ }
storeChanges(region, key, removed);
return popped;
}
+ public synchronized byte[] removeFirstElement() {
+ return elementList.removeFirst();
+ }
+
+ public synchronized byte[] removeLastElement() {
+ return elementList.removeLast();
+ }
+
/**
- * @return the number of elements in the list
+ * @param elementsToAdd elements to add to this list; NOTE this list may be
modified by this call
+ * @param region the region this instance is stored in
+ * @param key the name of the list to add to
+ * @param onlyIfExists if true then the elements should only be added if the
key already exists
+ * and holds a list, otherwise no operation is performed.
+ * @return the length of the list after the operation
*/
- public int llen() {
+ public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
+ final boolean onlyIfExists) {
+ byte newVersion;
Review comment:
Couldn't this just call lpush(elementsToAdd, region, key) instead of
duplicating the code?
##########
File path:
geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java
##########
@@ -127,50 +127,139 @@ private int getArrayIndex(int listIndex) {
}
/**
- * @param elementsToAdd elements to add to this set; NOTE this list may by
modified by this call
- * @param region the region this instance is stored in
- * @param key the name of the set to add to
- * @param onlyIfExists if true then the elements should only be added if the
key already exists
- * and holds a list, otherwise no operation is performed.
- * @return the length of the list after the operation
- */
- public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
- final boolean onlyIfExists) {
- elementsPush(elementsToAdd);
- storeChanges(region, key, new AddByteArrays(elementsToAdd));
+ * @return the number of elements in the list
+ **/
+ public int llen() {
return elementList.size();
}
/**
* @param region the region this instance is stored in
- * @param key the name of the set to add to
+ * @param key the name of the list to add to
* @return the element actually popped
*/
public byte[] lpop(Region<RedisKey, RedisData> region, RedisKey key) {
- byte[] popped = elementRemove(0);
- RemoveElementsByIndex removed = new RemoveElementsByIndex();
- removed.add(0);
+ byte newVersion;
+ byte[] popped;
+ RemoveElementsByIndex removed;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ popped = removeFirstElement();
+ removed = new RemoveElementsByIndex(newVersion);
+ removed.add(0);
+ }
storeChanges(region, key, removed);
return popped;
}
+ public synchronized byte[] removeFirstElement() {
+ return elementList.removeFirst();
+ }
+
+ public synchronized byte[] removeLastElement() {
+ return elementList.removeLast();
+ }
+
/**
- * @return the number of elements in the list
+ * @param elementsToAdd elements to add to this list; NOTE this list may be
modified by this call
+ * @param region the region this instance is stored in
+ * @param key the name of the list to add to
+ * @param onlyIfExists if true then the elements should only be added if the
key already exists
+ * and holds a list, otherwise no operation is performed.
+ * @return the length of the list after the operation
*/
- public int llen() {
+ public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
+ final boolean onlyIfExists) {
+ byte newVersion;
+ AddByteArrays addByteArrays;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ elementsPush(elementsToAdd);
+ addByteArrays = new AddByteArrays(newVersion, elementsToAdd);
+ }
+ storeChanges(region, key, addByteArrays);
return elementList.size();
}
+ /**
+ * @param elementsToAdd elements to add to this list; NOTE this list may be
modified by this call
+ * @param region the region this instance is stored in
+ * @param key the name of the list to add to
+ * @return the number of elements actually added
+ */
+ public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key) {
+ byte newVersion;
+ AddByteArrays addByteArrays;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ elementsPush(elementsToAdd);
+ addByteArrays = new AddByteArrays(newVersion, elementsToAdd);
+ }
+ storeChanges(region, key, addByteArrays);
+ return elementList.size();
+ }
+
+ public byte[] ltrim(long start, long end, Region<RedisKey, RedisData> region,
+ RedisKey key) {
+ byte newVersion;
+ int length = elementList.size();
+ int boundedStart = getBoundedStartIndex(start, length);
+ int boundedEnd = getBoundedEndIndex(end, length);
+ List<Integer> removed = new ArrayList<>();
+ RemoveElementsByIndex removeElementsByIndex;
+
+ synchronized (this) {
+ if (boundedStart > boundedEnd || boundedStart == length) {
+ // Remove everything
+ for (int i = length - 1; i >= 0; i--) {
+ removed.add(i);
+ }
+ } else {
+ // Remove any elements after boundedEnd
+ for (int i = length - 1; i > boundedEnd; i--) {
+ removed.add(i);
+ }
+
+ // Remove any elements before boundedStart
+ for (int i = boundedStart - 1; i >= 0; i--) {
+ removed.add(i);
+ }
+ }
+
+ if (removed.size() > 0) {
+ elementsRemove(removed);
+ }
+ newVersion = incrementAndGetVersion();
Review comment:
The sync only needs to be around elementsRemove and
incrementAndGetVersion. No need to hold it while populating the removed list.
Remember we have no other writers. Just a possible concurrent reader calling
toData
##########
File path:
geode-for-redis/src/main/java/org/apache/geode/redis/internal/data/RedisList.java
##########
@@ -127,50 +127,139 @@ private int getArrayIndex(int listIndex) {
}
/**
- * @param elementsToAdd elements to add to this set; NOTE this list may by
modified by this call
- * @param region the region this instance is stored in
- * @param key the name of the set to add to
- * @param onlyIfExists if true then the elements should only be added if the
key already exists
- * and holds a list, otherwise no operation is performed.
- * @return the length of the list after the operation
- */
- public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
- final boolean onlyIfExists) {
- elementsPush(elementsToAdd);
- storeChanges(region, key, new AddByteArrays(elementsToAdd));
+ * @return the number of elements in the list
+ **/
+ public int llen() {
return elementList.size();
}
/**
* @param region the region this instance is stored in
- * @param key the name of the set to add to
+ * @param key the name of the list to add to
* @return the element actually popped
*/
public byte[] lpop(Region<RedisKey, RedisData> region, RedisKey key) {
- byte[] popped = elementRemove(0);
- RemoveElementsByIndex removed = new RemoveElementsByIndex();
- removed.add(0);
+ byte newVersion;
+ byte[] popped;
+ RemoveElementsByIndex removed;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ popped = removeFirstElement();
+ removed = new RemoveElementsByIndex(newVersion);
+ removed.add(0);
+ }
storeChanges(region, key, removed);
return popped;
}
+ public synchronized byte[] removeFirstElement() {
+ return elementList.removeFirst();
+ }
+
+ public synchronized byte[] removeLastElement() {
+ return elementList.removeLast();
+ }
+
/**
- * @return the number of elements in the list
+ * @param elementsToAdd elements to add to this list; NOTE this list may be
modified by this call
+ * @param region the region this instance is stored in
+ * @param key the name of the list to add to
+ * @param onlyIfExists if true then the elements should only be added if the
key already exists
+ * and holds a list, otherwise no operation is performed.
+ * @return the length of the list after the operation
*/
- public int llen() {
+ public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key,
+ final boolean onlyIfExists) {
+ byte newVersion;
+ AddByteArrays addByteArrays;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ elementsPush(elementsToAdd);
+ addByteArrays = new AddByteArrays(newVersion, elementsToAdd);
+ }
+ storeChanges(region, key, addByteArrays);
return elementList.size();
}
+ /**
+ * @param elementsToAdd elements to add to this list; NOTE this list may be
modified by this call
+ * @param region the region this instance is stored in
+ * @param key the name of the list to add to
+ * @return the number of elements actually added
+ */
+ public long lpush(List<byte[]> elementsToAdd, Region<RedisKey, RedisData>
region, RedisKey key) {
+ byte newVersion;
+ AddByteArrays addByteArrays;
+ synchronized (this) {
+ newVersion = incrementAndGetVersion();
+ elementsPush(elementsToAdd);
+ addByteArrays = new AddByteArrays(newVersion, elementsToAdd);
Review comment:
no need to hold sync while creating AddByteArray
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
