misc refactoring (#140)

* add self host params

* add random port for main

* and so the crazy refactoring process sees the sunlight after some months in the dark!

* Too lazy to write descriptive message

* better ignores

* Fixed what was broken.

* bad things happen when you forget about that one little change you made ages ago

* I'm sorry.

* Reset error count between rows. herpderp

* squash me

* I am sorry

* add keys command

Author: tuhuynh27

.github/workflows/build.yml

@@ -3,6 +3,7 @@ on:
   push:
     branches:
       - master
+      - develop
   pull_request:
     types: [opened, synchronize, reopened]
 jobs:

app/build.gradle

@@ -31,7 +31,7 @@ task fatJar(type: Jar) {
     dependsOn(':config:build')
     dependsOn(':util:build')
     dependsOn(':resp-protocol:build')
-    dependsOn(':store:build')
+    dependsOn(':storage:build')
     dependsOn(':core:build')
     manifest.from jar.manifest
     classifier = 'all'

app/src/test/java/dev/keva/app/ApplicationTest.java

@@ -1,24 +1,36 @@
 package dev.keva.app;
 
+import lombok.SneakyThrows;
 import lombok.val;
 import org.junit.jupiter.api.Test;
 import redis.clients.jedis.Jedis;
 
+import java.net.ServerSocket;
 import java.util.concurrent.TimeUnit;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 class ApplicationTest {
 
-    public static final String[] ARGS = new String[0];
+    public static int port = getAvailablePort();
+    public static final String[] ARGS = {"--p", Integer.toString(port)};
 
     @Test
     void testMain() throws Exception {
         new Thread(() -> Application.main(ARGS)).start();
         TimeUnit.SECONDS.sleep(5);
 
-        val jedis = new Jedis("localhost", 6379);
+        val jedis = new Jedis("localhost", port);
         val pong = jedis.ping();
         assertEquals("PONG", pong);
     }
+
+    @SneakyThrows
+    public static int getAvailablePort() {
+        final int port;
+        try (val serverSocket = new ServerSocket(0)) {
+            port = serverSocket.getLocalPort();
+        }
+        return port;
+    }
 }

core/build.gradle

@@ -11,7 +11,7 @@ dependencies {
     implementation project(':util')
     implementation project(':config')
     implementation project(':resp-protocol')
-    implementation project(':store')
+    implementation project(':storage')
 
     implementation 'dev.keva:keva-ioc:1.0.0'
 

core/src/main/java/dev/keva/core/command/impl/generic/Del.java

@@ -7,7 +7,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 import static dev.keva.core.command.annotation.ParamLength.Type.AT_LEAST;
 

core/src/main/java/dev/keva/core/command/impl/generic/Dump.java

@@ -7,7 +7,7 @@
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.BulkReply;
 import dev.keva.protocol.resp.reply.Reply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 import java.util.Base64;
 

core/src/main/java/dev/keva/core/command/impl/generic/Exists.java

@@ -7,7 +7,7 @@
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
 import dev.keva.protocol.resp.reply.Reply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 import static dev.keva.core.command.annotation.ParamLength.Type.AT_LEAST;
 

core/src/main/java/dev/keva/core/command/impl/generic/Expire.java

@@ -6,7 +6,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 import java.nio.charset.StandardCharsets;
 

core/src/main/java/dev/keva/core/command/impl/generic/ExpireAt.java

@@ -6,7 +6,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 import java.nio.charset.StandardCharsets;
 

core/src/main/java/dev/keva/core/command/impl/generic/Key.java

@@ -0,0 +1,41 @@
+package dev.keva.core.command.impl.generic;
+
+import dev.keva.core.command.annotation.CommandImpl;
+import dev.keva.core.command.annotation.Execute;
+import dev.keva.core.command.annotation.ParamLength;
+import dev.keva.core.exception.CommandException;
+import dev.keva.ioc.annotation.Autowired;
+import dev.keva.ioc.annotation.Component;
+import dev.keva.protocol.resp.reply.BulkReply;
+import dev.keva.protocol.resp.reply.MultiBulkReply;
+import dev.keva.storage.KevaDatabase;
+
+import java.nio.charset.StandardCharsets;
+import java.util.Set;
+
+@Component
+@CommandImpl("keys")
+@ParamLength(1)
+public class Key {
+    private final KevaDatabase database;
+
+    @Autowired
+    public Key(KevaDatabase database) {
+        this.database = database;
+    }
+
+    @Execute
+    public MultiBulkReply execute(byte[] key) {
+        String keyStr = new String(key, StandardCharsets.UTF_8);
+        if (!keyStr.equals("*")) {
+            throw new CommandException("Only support * pattern for now");
+        }
+        Set<byte[]> keys = database.keySet();
+        BulkReply[] replies = new BulkReply[keys.size()];
+        int i = 0;
+        for (byte[] k : keys) {
+            replies[i++] = new BulkReply(k);
+        }
+        return new MultiBulkReply(replies);
+    }
+}

core/src/main/java/dev/keva/core/command/impl/generic/Rename.java

@@ -7,7 +7,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.StatusReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("rename")

core/src/main/java/dev/keva/core/command/impl/generic/Restore.java

@@ -8,7 +8,7 @@
 import dev.keva.protocol.resp.reply.ErrorReply;
 import dev.keva.protocol.resp.reply.Reply;
 import dev.keva.protocol.resp.reply.StatusReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 import java.math.BigInteger;
 import java.util.Base64;

core/src/main/java/dev/keva/core/command/impl/generic/Type.java

@@ -6,7 +6,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.StatusReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 import org.apache.commons.lang3.SerializationException;
 import org.apache.commons.lang3.SerializationUtils;
 

core/src/main/java/dev/keva/core/command/impl/hash/HDel.java

@@ -7,7 +7,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("hdel")

core/src/main/java/dev/keva/core/command/impl/hash/HExists.java

@@ -6,7 +6,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("hexists")

core/src/main/java/dev/keva/core/command/impl/hash/HGet.java

@@ -6,7 +6,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.BulkReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("hget")

core/src/main/java/dev/keva/core/command/impl/hash/HGetAll.java

@@ -7,7 +7,7 @@
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.BulkReply;
 import dev.keva.protocol.resp.reply.MultiBulkReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("hgetall")

core/src/main/java/dev/keva/core/command/impl/hash/HKeys.java

@@ -7,10 +7,9 @@
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.BulkReply;
 import dev.keva.protocol.resp.reply.MultiBulkReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 import dev.keva.util.hashbytes.BytesKey;
 import dev.keva.util.hashbytes.BytesValue;
-import org.apache.commons.lang3.SerializationUtils;
 
 import java.util.HashMap;
 import java.util.Map;

core/src/main/java/dev/keva/core/command/impl/hash/HLen.java

@@ -6,7 +6,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("hlen")

core/src/main/java/dev/keva/core/command/impl/hash/HSet.java

@@ -7,7 +7,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("hset")

core/src/main/java/dev/keva/core/command/impl/hash/HStrLen.java

@@ -6,7 +6,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("hstrlen")

core/src/main/java/dev/keva/core/command/impl/hash/HVals.java

@@ -7,10 +7,9 @@
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.BulkReply;
 import dev.keva.protocol.resp.reply.MultiBulkReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 import dev.keva.util.hashbytes.BytesKey;
 import dev.keva.util.hashbytes.BytesValue;
-import org.apache.commons.lang3.SerializationUtils;
 
 import java.util.HashMap;
 import java.util.Map;

core/src/main/java/dev/keva/core/command/impl/hash/HashBase.java

@@ -1,6 +1,6 @@
 package dev.keva.core.command.impl.hash;
 
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 import dev.keva.util.hashbytes.BytesKey;
 import dev.keva.util.hashbytes.BytesValue;
 import org.apache.commons.lang3.SerializationUtils;

core/src/main/java/dev/keva/core/command/impl/list/LIndex.java

@@ -6,7 +6,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.BulkReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 import dev.keva.util.hashbytes.BytesValue;
 
 import java.util.LinkedList;

core/src/main/java/dev/keva/core/command/impl/list/LLen.java

@@ -6,7 +6,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 import dev.keva.util.hashbytes.BytesValue;
 
 import java.util.LinkedList;

core/src/main/java/dev/keva/core/command/impl/list/LPop.java

@@ -9,7 +9,7 @@
 import dev.keva.protocol.resp.reply.BulkReply;
 import dev.keva.protocol.resp.reply.MultiBulkReply;
 import dev.keva.protocol.resp.reply.Reply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("lpop")

core/src/main/java/dev/keva/core/command/impl/list/LPush.java

@@ -7,7 +7,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 import java.util.Arrays;
 

core/src/main/java/dev/keva/core/command/impl/list/LRange.java

@@ -8,7 +8,7 @@
 import dev.keva.protocol.resp.reply.BulkReply;
 import dev.keva.protocol.resp.reply.MultiBulkReply;
 import dev.keva.protocol.resp.reply.Reply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("lrange")

core/src/main/java/dev/keva/core/command/impl/list/LRem.java

@@ -7,7 +7,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("lrem")

core/src/main/java/dev/keva/core/command/impl/list/LSet.java

@@ -7,7 +7,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.StatusReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("lset")

core/src/main/java/dev/keva/core/command/impl/list/ListBase.java

@@ -1,6 +1,6 @@
 package dev.keva.core.command.impl.list;
 
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 import dev.keva.util.hashbytes.BytesValue;
 import org.apache.commons.lang3.SerializationUtils;
 

core/src/main/java/dev/keva/core/command/impl/list/RPop.java

@@ -9,7 +9,7 @@
 import dev.keva.protocol.resp.reply.BulkReply;
 import dev.keva.protocol.resp.reply.MultiBulkReply;
 import dev.keva.protocol.resp.reply.Reply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("rpop")

core/src/main/java/dev/keva/core/command/impl/list/RPush.java

@@ -7,7 +7,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 import java.util.Arrays;
 

core/src/main/java/dev/keva/core/command/impl/server/FlushDB.java

@@ -6,7 +6,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.StatusReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("flushdb")

core/src/main/java/dev/keva/core/command/impl/set/SAdd.java

@@ -7,7 +7,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 import java.util.Arrays;
 

core/src/main/java/dev/keva/core/command/impl/set/SCard.java

@@ -6,7 +6,7 @@
 import dev.keva.ioc.annotation.Autowired;
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.IntegerReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("scard")

core/src/main/java/dev/keva/core/command/impl/set/SDiff.java

@@ -7,7 +7,7 @@
 import dev.keva.ioc.annotation.Component;
 import dev.keva.protocol.resp.reply.BulkReply;
 import dev.keva.protocol.resp.reply.MultiBulkReply;
-import dev.keva.store.KevaDatabase;
+import dev.keva.storage.KevaDatabase;
 
 @Component
 @CommandImpl("sdiff")