fix #158

tonivade · Aug 16, 2023 · 6efe2c4 · 6efe2c4
1 parent 07a7a26
commit 6efe2c4
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 4 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,4 +1,4 @@
-version=2.1
+version=2.1.1-SNAPSHOT
 
 joptVersion=5.0.4
 logbackVersion=1.3.8

diff --git a/lib/src/main/java/com/github/tonivade/claudb/command/list/LeftPopCommand.java b/lib/src/main/java/com/github/tonivade/claudb/command/list/LeftPopCommand.java
@@ -33,7 +33,7 @@ public RedisToken execute(Database db, Request request) {
     db.merge(safeKey(request.getParam(0)), DatabaseValue.EMPTY_LIST,
         (oldValue, newValue) -> {
           List<SafeString> list = oldValue.getList();
-          if (list.size() > 1) {
+          if (!list.isEmpty()) {
             removed.add(list.get(0));
           }
           return list(list.stream().skip(1).collect(toList()));

diff --git a/lib/src/main/java/com/github/tonivade/claudb/command/list/RightPopCommand.java b/lib/src/main/java/com/github/tonivade/claudb/command/list/RightPopCommand.java
@@ -36,7 +36,7 @@ public RedisToken execute(Database db, Request request) {
         (oldValue, newValue) -> {
           List<SafeString> copy = new ArrayList<>(oldValue.getList());
           Collections.reverse(copy);
-          if (copy.size() > 1) {
+          if (!copy.isEmpty()) {
             removed.add(copy.remove(0));
           }
           Collections.reverse(copy);

diff --git a/lib/src/test/java/com/github/tonivade/claudb/ClauDBServerTest.java b/lib/src/test/java/com/github/tonivade/claudb/ClauDBServerTest.java
@@ -116,6 +116,18 @@ void testNotExist() {
     });
   }
 
+  @Test
+  public void testPushPull() {
+    execute(jedis -> {
+      long push = jedis.rpush("key", "val1", "val2");
+      String pop1 = jedis.rpop("key");
+      String pop2 = jedis.rpop("key");
+      assertThat(push, is(2l));
+      assertThat(pop1, equalTo("val2"));
+      assertThat(pop2, equalTo("val1"));
+    });
+  }
+
   private void execute(Consumer<Jedis> action) {
     try (Jedis jedis = createClientConnection()) {
       action.accept(jedis);

diff --git a/lib/src/test/java/com/github/tonivade/claudb/command/list/LeftPopCommandTest.java b/lib/src/test/java/com/github/tonivade/claudb/command/list/LeftPopCommandTest.java
@@ -28,7 +28,13 @@ public void testExecute()  {
         .execute()
         .assertValue("key", isList("b", "c"))
         .assertThat(string("a"));
-
+
+    rule.withData("key", list("a"))
+        .withParams("key")
+        .execute()
+        .assertValue("key", isList())
+        .assertThat(string("a"));
+
     rule.withData("key", list())
         .withParams("key")
         .execute()

diff --git a/lib/src/test/java/com/github/tonivade/claudb/command/list/RightPopCommandTest.java b/lib/src/test/java/com/github/tonivade/claudb/command/list/RightPopCommandTest.java
@@ -29,6 +29,12 @@ public void testExecute()  {
         .assertValue("key", isList("a", "b"))
         .assertThat(string("c"));
 
+    rule.withData("key", list("a"))
+        .withParams("key")
+        .execute()
+        .assertValue("key", isList())
+        .assertThat(string("a"));
+
     rule.withData("key", list())
         .withParams("key")
         .execute()