First functional INCR command

pink/Makefile

@@ -63,11 +63,7 @@ ifeq ($(NO_PB),1)
   				$(filter-out $(VERSION_CC) $(wildcard $(SRC_DIR)/pb_*), $(wildcard $(SRC_DIR)/*.cc))
 endif
 
-
-ifndef SLASH_PATH
-  $(warning Warning: missing slash path, using default)
-  SLASH_PATH=$(CURDIR)/third/slash
-endif
+SLASH_PATH=$(CURDIR)/third/slash
 SLASH_INCLUDE_DIR=$(SLASH_PATH)
 SLASH_LIBRARY=$(SLASH_PATH)/slash/lib/libslash.a
 

pink/include/redis_conn.h

@@ -34,9 +34,9 @@ class RedisConn: public PinkConn {
             const int rbuf_max_len = REDIS_MAX_MESSAGE);
   virtual ~RedisConn();
 
-  virtual ReadStatus GetRequest();
-  virtual WriteStatus SendReply();
-  virtual int WriteResp(const std::string& resp);
+  virtual ReadStatus GetRequest() override;
+  virtual WriteStatus SendReply() override;
+  virtual int WriteResp(const std::string& resp) override;
 
   void TryResizeBuffer() override;
   void SetHandleType(const HandleType& handle_type);

pink/rondis/Makefile

@@ -14,10 +14,7 @@ endif
 
 all: rondis
 
-ifndef PINK_PATH
-  $(warning Warning: missing pink path, using default)
-  PINK_PATH=$(CURDIR)/../..
-endif
+PINK_PATH=$(CURDIR)/../..
 PINK_INCLUDE_DIR=$(PINK_PATH)
 PINK_LIBRARY=$(PINK_PATH)/pink/lib/libpink.a
 

pink/rondis/common.cc

@@ -5,39 +5,13 @@
 
 #include "common.h"
 
-/**
- * @brief Writes formatted data to a buffer.
- *
- * This function writes formatted data to the provided buffer using a format string
- * and a variable number of arguments, similar to printf. It ensures that the
- * formatted string does not exceed the specified buffer size.
- *
- * @param buffer A pointer to the buffer where the formatted string will be written.
- * @param bufferSize The size of the buffer.
- * @param format A format string that specifies how subsequent arguments are converted for output.
- * @param ... Additional arguments specifying the data to be formatted.
- * @return The number of characters written, excluding the null terminator. If the output
- *         is truncated due to the buffer size limit, the return value is the number of
- *         characters (excluding the null terminator) which would have been written if
- *         enough space had been available.
- */
-int write_formatted(char *buffer, int bufferSize, const char *format, ...)
-{
-    int len = 0;
-    va_list arguments;
-    va_start(arguments, format);
-    len = vsnprintf(buffer, bufferSize, format, arguments);
-    va_end(arguments);
-    return len;
-}
-
 void assign_ndb_err_to_response(
     std::string *response,
     const char *app_str,
     NdbError error)
 {
     char buf[512];
-    write_formatted(buf, sizeof(buf), "-ERR %s; NDB(%u) %s\r\n", app_str, error.code, error.message);
+    snprintf(buf, sizeof(buf), "-ERR %s; NDB(%u) %s\r\n", app_str, error.code, error.message);
     std::cout << buf;
     response->assign(buf);
 }
@@ -47,7 +21,7 @@ void assign_generic_err_to_response(
     const char *app_str)
 {
     char buf[512];
-    write_formatted(buf, sizeof(buf), "-ERR %s\r\n", app_str);
+    snprintf(buf, sizeof(buf), "-ERR %s\r\n", app_str);
     std::cout << buf;
     response->assign(buf);
 }

pink/rondis/common.h

@@ -1,6 +1,9 @@
 #include <ndbapi/NdbApi.hpp>
 #include <ndbapi/Ndb.hpp>
 
+#ifndef RONDIS_COMMON_H
+#define RONDIS_COMMON_H
+
 #define MAX_CONNECTIONS 2
 
 #define REDIS_DB_NAME "redis"
@@ -20,6 +23,8 @@ void assign_generic_err_to_response(std::string *response, const char *app_str);
 #define FAILED_CREATE_TXN_OBJECT "Failed to create transaction object"
 #define FAILED_EXEC_TXN "Failed to execute transaction"
 #define FAILED_READ_KEY "Failed to read key"
+#define FAILED_INCR_KEY "Failed to increment key, multi-row value"
+#define FAILED_INCR_KEY_MULTI_ROW "Failed to increment key, multi-row value"
 #define FAILED_GET_OP "Failed to get NdbOperation object"
 #define FAILED_DEFINE_OP "Failed to define RonDB operation"
 
@@ -28,3 +33,4 @@ void assign_generic_err_to_response(std::string *response, const char *app_str);
 #define REDIS_WRONG_NUMBER_OF_ARGS "wrong number of arguments for '%s' command"
 #define REDIS_NO_SUCH_KEY "$-1\r\n"
 #define REDIS_KEY_TOO_LARGE "key is too large (3000 bytes max)"
+#endif

pink/rondis/rondb.cc

@@ -140,6 +140,19 @@ int rondb_redis_handler(const pink::RedisCmdArgsType &argv,
                 assign_generic_err_to_response(response, error_message);
             }
         }
+        else if (argv[0] == "INCR")
+        {
+            if (argv.size() == 2)
+            {
+                rondb_incr_command(ndb, argv, response);
+            }
+            else
+            {
+                char error_message[256];
+                snprintf(error_message, sizeof(error_message), REDIS_WRONG_NUMBER_OF_ARGS, argv[0].c_str());
+                assign_generic_err_to_response(response, error_message);
+            }
+        }
         else
         {
             printf("Unsupported command: ");

pink/rondis/rondb.h

@@ -3,6 +3,9 @@
 #include <ndbapi/NdbApi.hpp>
 #include <ndbapi/Ndb.hpp>
 
+#ifndef RONDIS_RONDB_H
+#define RONDIS_RONDB_H
+
 extern std::vector<Ndb *> ndb_objects;
 
 int initialize_ndb_objects(const char *connect_string, int num_ndb_objects);
@@ -14,3 +17,4 @@ void rondb_end();
 int rondb_redis_handler(const pink::RedisCmdArgsType &argv,
                         std::string *response,
                         int fd);
+#endif

pink/rondis/rondis.cc

@@ -115,7 +115,7 @@ static void SignalSetup()
 int main(int argc, char *argv[])
 {
     int port = 6379;
-    char *connect_string = "localhost:13000";
+    const char *connect_string = "localhost:13000";
     int worker_threads = 2;
     if (argc != 4)
     {