fix set bug

mleleszi · Jun 12, 2024 · 99f4cf4 · 99f4cf4
1 parent 9d0c95b
commit 99f4cf4
Show file tree

Hide file tree

Showing 3 changed files with 28 additions and 4 deletions.
diff --git a/src/controller.cpp b/src/controller.cpp
@@ -53,20 +53,19 @@ RedisType::RedisValue Controller::handlePing(const std::vector<RedisType::BulkSt
 RedisType::RedisValue Controller::handleSet(const std::vector<RedisType::BulkString> &command) {
     if (command.size() != 3) { return RedisType::SimpleError("ERR wrong number of arguments for 'set' command"); }
 
-    auto key = extractStringFromBytes(*command[1].data, 0, (*command[0].data).size());
-    auto val = extractStringFromBytes(*command[2].data, 0, (*command[0].data).size());
+    auto key = extractStringFromBytes(*command[1].data, 0, (*command[1].data).size());
+    auto val = extractStringFromBytes(*command[2].data, 0, (*command[2].data).size());
 
     dataStore.set(key, val);
 
     return RedisType::SimpleString("OK");
 }
 
 // TODO: WORKS INCORRECTLY FOR INTEGERS
-// TODO: set and get works incorrectly when ends with number??
 RedisType::RedisValue Controller::handleGet(const std::vector<RedisType::BulkString> &command) {
     if (command.size() != 2) { return RedisType::SimpleError("ERR wrong number of arguments for 'get' command"); }
 
-    auto key = extractStringFromBytes(*command[1].data, 0, (*command[0].data).size());
+    auto key = extractStringFromBytes(*command[1].data, 0, (*command[1].data).size());
 
     auto valueOpt = dataStore.get(key);
 

diff --git a/src/tcp_server.cpp b/src/tcp_server.cpp
@@ -25,6 +25,7 @@ TCPServer::TCPServer(const Controller &controller) : controller{controller} {
     }
 }
 
+// TODO: why can it start if the port is already taken?
 [[noreturn]] void TCPServer::start(const std::string &address = "0.0.0.0", int port = 6379) {
     struct sockaddr_in server_addr {};
     server_addr.sin_family = AF_INET;

diff --git a/tests/controller_test.cpp b/tests/controller_test.cpp
@@ -143,3 +143,27 @@ TEST(ControllerTests, HandleGET) {
 
     ASSERT_EQ(bulkData, stringToByteVector("val"));
 }
+
+TEST(ControllerTests, HandleGETEndWithNum) {
+    Controller controller;
+
+    std::vector<RedisType::BulkString> setCommand{
+            RedisType::BulkString("SET"),
+            RedisType::BulkString("key2"),
+            RedisType::BulkString("val2"),
+    };
+
+    controller.handleCommand(setCommand);
+
+    std::vector<RedisType::BulkString> getCommand{
+            RedisType::BulkString("GET"),
+            RedisType::BulkString("key2"),
+    };
+
+    auto result = controller.handleCommand(getCommand);
+
+    ASSERT_TRUE(std::holds_alternative<RedisType::BulkString>(result));
+    auto bulkData = *std::get<RedisType::BulkString>(result).data;
+
+    ASSERT_EQ(bulkData, stringToByteVector("val2"));
+}