draft: implement solution to allow running commands in downcase and u…

CMakeLists.txt

@@ -14,7 +14,7 @@ if(APPLE)
   add_executable(fkvs-server src/memory.c src/counter.c src/client.c src/core/list.c src/config.c src/networking/networking.c src/server.c src/core/hashtable.c src/commands/common/command_registry.c src/commands/server/server_command_handlers.c src/io/event_dispatcher_kqueue.c)
   target_compile_definitions(fkvs-server PRIVATE SERVER)
 
-  add_executable(fkvs-benchmark src/fkvs-benchmark.c src/client.c src/core/list.c src/networking/networking.c src/commands/common/command_parser.c src/commands/client/client_command_handlers.c)
+  add_executable(fkvs-benchmark src/string_utils.c src/fkvs-benchmark.c src/client.c src/core/list.c src/networking/networking.c src/commands/common/command_parser.c src/commands/client/client_command_handlers.c)
   target_compile_definitions(fkvs-benchmark PRIVATE CLI)
 elseif(LINUX)
   find_library(LIBURING liburing)
@@ -28,18 +28,21 @@ elseif(LINUX)
     target_compile_definitions(fkvs-server PRIVATE SERVER)
   endif()
 
-  add_executable(fkvs-benchmark src/fkvs-benchmark.c src/client.c src/core/list.c src/networking/networking.c src/commands/common/command_parser.c src/commands/client/client_command_handlers.c)
+  add_executable(fkvs-benchmark src/string_utils.c src/fkvs-benchmark.c src/client.c src/core/list.c src/networking/networking.c src/commands/common/command_parser.c src/commands/client/client_command_handlers.c)
   target_compile_definitions(fkvs-benchmark PRIVATE CLI)
 endif()
 
 # Add test executable
 add_executable(test_counter tests/test_counter.c src/counter.c)
-target_link_libraries(test_counter PRIVATE Threads::Threads)
+add_executable(test_string_utils tests/test_string_utils.c src/string_utils.c)
+target_link_libraries(test_counter)
+target_link_libraries(test_string_utils)
 
 # Enable testing
 enable_testing()
 add_test(NAME CounterTest COMMAND test_counter)
-add_executable(fkvs-cli src/fkvs-cli.c src/config.c src/commands/common/command_parser.c src/commands/client/client_command_handlers.c)
+add_test(NAME StringUtilsTest COMMAND test_string_utils)
+add_executable(fkvs-cli src/string_utils.c src/fkvs-cli.c src/config.c src/commands/common/command_parser.c src/commands/client/client_command_handlers.c)
   target_link_libraries(fkvs-benchmark PRIVATE Threads::Threads)
   target_link_libraries(fkvs-cli PUBLIC linenoise)
   target_compile_definitions(fkvs-cli PRIVATE CLI)

src/commands/client/client_command_handlers.c

@@ -1,11 +1,10 @@
 #include "../../commands/client/client_command_handlers.h"
-#include "../../keygen.h"
-#include "../../utils.h"
 #include "../../client.h"
-#include "../../commands/common/command_parser.h"
 #include "../../commands/common/command_defs.h"
-
-#include <assert.h>
+#include "../../commands/common/command_parser.h"
+#include "../../keygen.h"
+#include "../../string_utils.h"
+#include "../../utils.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -15,7 +14,7 @@
 
 void cmd_get(const command_args_t args, void (*response_cb)(client_t *client))
 {
-    if (strncmp(args.cmd, "GET ", 4) != 0) {
+    if (strncasecmp(args.cmd, "GET ", 4) != 0) {
         return;
     }
 
@@ -35,18 +34,14 @@ void cmd_get(const command_args_t args, void (*response_cb)(client_t *client))
         return;
     }
 
-    assert(cmd_len != 0);
-    assert(args.client->fd != -1);
-    assert(binary_cmd != NULL);
-
     send(args.client->fd, binary_cmd, cmd_len, 0);
     free(binary_cmd);
     response_cb(args.client);
 }
 
 void cmd_set(const command_args_t args, void (*response_cb)(client_t *client))
 {
-    if (strncmp(args.cmd, "SET ", 4) != 0) {
+    if (strncasecmp(args.cmd, "SET ", 4) != 0) {
         return;
     }
 
@@ -67,18 +62,14 @@ void cmd_set(const command_args_t args, void (*response_cb)(client_t *client))
         return;
     }
 
-    assert(cmd_len != 0);
-    assert(args.client->fd != -1);
-    assert(binary_cmd != NULL);
-
     send(args.client->fd, binary_cmd, cmd_len, 0);
     free(binary_cmd);
     response_cb(args.client);
 }
 
 void cmd_incr(const command_args_t args, void (*response_cb)(client_t *client))
 {
-    if (strncmp(args.cmd, "INCR ", 4) != 0) {
+    if (strncasecmp(args.cmd, "INCR ", 4) != 0) {
         return;
     }
 
@@ -98,10 +89,6 @@ void cmd_incr(const command_args_t args, void (*response_cb)(client_t *client))
         return;
     }
 
-    assert(cmd_len != 0);
-    assert(args.client->fd != -1);
-    assert(binary_cmd != NULL);
-
     send(args.client->fd, binary_cmd, cmd_len, 0);
     free(binary_cmd);
     response_cb(args.client);
@@ -110,7 +97,7 @@ void cmd_incr(const command_args_t args, void (*response_cb)(client_t *client))
 void cmd_incr_by(const command_args_t args,
                  void (*response_cb)(client_t *client))
 {
-    if (strncmp(args.cmd, "INCRBY ", 7) != 0) {
+    if (strncasecmp(args.cmd, "INCRBY ", 7) != 0) {
         return;
     }
 
@@ -131,80 +118,62 @@ void cmd_incr_by(const command_args_t args,
         return;
     }
 
-    assert(cmd_len != 0);
-    assert(args.client->fd != -1);
-    assert(binary_cmd != NULL);
-
     send(args.client->fd, binary_cmd, cmd_len, 0);
     free(binary_cmd);
     response_cb(args.client);
 }
 
 void cmd_ping(const command_args_t args, void (*response_cb)(client_t *client))
 {
-    if (strncmp(args.cmd, "PING ", 5) != 0 && strncmp(args.cmd, "PING", 4) != 0) {
+    if (strncasecmp(args.cmd, "PING ", 5) != 0) {
         return;
     }
 
     size_t cmd_len;
-
     char value[VALUE_LEN];
-    if (sscanf(args.cmd, "PING \"%127[^\"]\"s", value) == 1) {
+    if (sscanf(to_upper(args.cmd), "PING \"%127[^\"]\"s", value) == 1) {
 
-    } else if (strcmp(args.cmd, "PING") == 0) {
-      // TODO: Find a cleaner alternative for this.
-      value[0] = 'P';
-      value[1] = 'O';
-      value[2] = 'N';
-      value[3] = 'G';
-      value[4] = '\0';
-    } else if (sscanf(args.cmd, "PING %127s", value) == 1) {
+    } else if (sscanf(to_upper(args.cmd), "PING") == 1) {
+
+    } else if (sscanf(to_upper(args.cmd), "PING %127s", value) == 1) {
 
     } else {
         printf("(error) ERR wrong number of arguments for 'ping' command\n");
         printf("(info) Usage: PING or PING <key> \n");
         return;
     }
 
-    assert(ARRAY_SIZE(value) == VALUE_LEN);
     unsigned char *binary_cmd = construct_ping_command(value, &cmd_len);
     if (binary_cmd == NULL) {
         fprintf(stderr, "Failed to construct PING command\n");
         return;
     }
 
-    assert(cmd_len != 0);
-    assert(args.client->fd != -1);
-    assert(binary_cmd != NULL);
-
     send(args.client->fd, binary_cmd, cmd_len, 0);
     free(binary_cmd);
     response_cb(args.client);
 }
 
 void cmd_info(const command_args_t args, void (*response_cb)(client_t *client))
 {
-    if (strncmp(args.cmd, "INFO", 4) != 0) {
+    if (strncasecmp(args.cmd, "INFO", 4) != 0) {
         return;
     }
 
     size_t cmd_len;
-    unsigned char *binary_cmd = construct_info_command(&cmd_len);
-    if (!binary_cmd) {
+    unsigned char *info_cmd = construct_info_command(&cmd_len);
+    if (!info_cmd) {
         fprintf(stderr, "Failed to construct INFO command\n");
         return;
     }
-    assert(cmd_len != 0);
-    assert(args.client->fd != -1);
-    assert(binary_cmd != NULL);
-    send(args.client->fd, binary_cmd, cmd_len, 0);
-    free(binary_cmd);
+    send(args.client->fd, info_cmd, cmd_len, 0);
+    free(info_cmd);
     response_cb(args.client);
 }
 
 void cmd_decr(const command_args_t args, void (*response_cb)(client_t *client))
 {
-    if (strncmp(args.cmd, "DECR ", 4) != 0) {
+    if (strncasecmp(args.cmd, "DECR ", 4) != 0) {
         return;
     }
 
@@ -224,10 +193,6 @@ void cmd_decr(const command_args_t args, void (*response_cb)(client_t *client))
         return;
     }
 
-    assert(cmd_len != 0);
-    assert(args.client->fd != -1);
-    assert(binary_cmd != NULL);
-
     send(args.client->fd, binary_cmd, cmd_len, 0);
     free(binary_cmd);
     response_cb(args.client);
@@ -241,10 +206,9 @@ void cmd_decr(const command_args_t args, void (*response_cb)(client_t *client))
 void cmd_unknown(const command_args_t args,
                  void (*response_cb)(client_t *client))
 {
-    if (strncmp(args.cmd, "INCR ", 5) && strncmp(args.cmd, "INCRBY ", 6) &&
-        strncmp(args.cmd, "GET ", 4) && strncmp(args.cmd, "SET ", 4) &&
-        strncmp(args.cmd, "PING ", 5) && strncmp(args.cmd, "PING", 4)
-        && strncmp(args.cmd, "DECR ", 5) && strncmp(args.cmd, "INFO", 5)) {
+    if (strncasecmp(args.cmd, "INCR ", 5) == 0 && strncasecmp(args.cmd, "INCRBY ", 6) == 0 &&
+        strncasecmp(args.cmd, "GET ", 4) == 0 && strncasecmp(args.cmd, "SET ", 4) == 0 &&
+        strncasecmp(args.cmd, "PING ", 5) == 0 && strncasecmp(args.cmd, "DECR ", 5) == 0 && strncasecmp(args.cmd, "INFO", 5) == 0) {
         printf("Unknown command \n");
     }
 }
@@ -296,6 +260,7 @@ void execute_command_benchmark(const char *cmd, client_t *client,
         response_cb(args.client);
     } else if (!strcasecmp(cmd, "ping")) {
         unsigned char *binary_cmd = construct_ping_command("", &cmd_len);
+
         send(args.client->fd, binary_cmd, cmd_len, 0);
         free(binary_cmd);
         response_cb(args.client);

src/fkvs-cli.c

@@ -3,7 +3,9 @@
 #include "commands/client/client_command_handlers.h"
 #include "config.h"
 #include "networking/networking.c"
+#include "string_utils.h"
 #include "utils.h"
+#include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

src/string_utils.c

@@ -0,0 +1,13 @@
+#include "string_utils.h"
+#include <ctype.h>
+#include <stdlib.h>
+#include <string.h>
+
+char *to_upper(const char *string) {
+  char *result = malloc(strlen(string) + 1);
+  for (int i = 0; i < strlen(string); ++i) {
+    result[i] = toupper(string[i]);
+  }
+  result[strlen(string)] = '\0';
+  return result;
+}

src/string_utils.h

@@ -0,0 +1,6 @@
+#ifndef STRING_UTILS_H
+#define STRING_UTILS_H
+
+char *to_upper(const char *string);
+
+#endif // STRING_UTILS_H

tests/test_string_utils.c

@@ -0,0 +1,19 @@
+#include "../src/string_utils.h"
+
+#include <assert.h>
+#include <string.h>
+
+void test_string_utils_to_upper() {
+    const char *string = "set";
+  assert(strcmp(to_upper(string), "SET") == 0);
+
+  const char *ping = "ping ";
+  assert(strcmp(to_upper(ping), "PING ") == 0);
+
+  const char *world = "WORLD";
+  assert(strcmp(to_upper(world), "WORLD") == 0);
+}
+
+int main(int argc, char *argv[]) {
+  test_string_utils_to_upper();
+}