RONDB-768: Added support for HSET, HGET, HINCR and rewrite of SET handling, removed FOREIGN KEY

Author: mikaelronstrom

pink/rondis/common.cc

@@ -25,3 +25,19 @@ void assign_generic_err_to_response(
     std::cout << buf;
     response->assign(buf);
 }
+
+void set_length(char *buf, Uint32 key_len)
+{
+    Uint8 *ptr = (Uint8 *)buf;
+    ptr[0] = (Uint8)(key_len & 255);
+    ptr[1] = (Uint8)(key_len >> 8);
+}
+
+Uint32 get_length(char *buf)
+{
+    Uint8 *ptr = (Uint8 *)buf;
+    Uint8 low = ptr[0];
+    Uint8 high = ptr[1];
+    Uint32 len32 = Uint32(low) + Uint32(256) * Uint32(high);
+    return len32;
+}

pink/rondis/common.h

@@ -8,14 +8,16 @@
 
 #define REDIS_DB_NAME "redis"
 
-#define FOREIGN_KEY_RESTRICT_ERROR 256
+#define RESTRICT_VALUE_ROWS_ERROR 6000
 
 #define RONDB_INTERNAL_ERROR 2
 #define READ_ERROR 626
 
 int write_formatted(char *buffer, int bufferSize, const char *format, ...);
 void assign_ndb_err_to_response(std::string *response, const char *app_str, NdbError error);
 void assign_generic_err_to_response(std::string *response, const char *app_str);
+void set_length(char* buf, Uint32 key_len);
+Uint32 get_length(char* buf);
 
 // NDB API error messages
 #define FAILED_GET_DICT "Failed to get NdbDict"
@@ -24,6 +26,7 @@ void assign_generic_err_to_response(std::string *response, const char *app_str);
 #define FAILED_EXEC_TXN "Failed to execute transaction"
 #define FAILED_READ_KEY "Failed to read key"
 #define FAILED_INCR_KEY "Failed to increment key"
+#define FAILED_HSET_KEY "Failed to find key"
 #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"

pink/rondis/rondb.cc

@@ -197,6 +197,45 @@ int rondb_redis_handler(const pink::RedisCmdArgsType &argv,
                 assign_generic_err_to_response(response, error_message);
             }
         }
+        else if (strcasecmp(command, "HGET") == 0)
+        {
+            if (argv.size() == 3)
+            {
+                rondb_hget_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 if (strcasecmp(command, "HSET") == 0)
+        {
+            if (argv.size() == 4)
+            {
+                rondb_hset_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 if (strcasecmp(command, "HINCR") == 0)
+        {
+            if (argv.size() == 3)
+            {
+                rondb_hincr_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
         {
             unsupported_command(argv, response);
@@ -209,7 +248,8 @@ int rondb_redis_handler(const pink::RedisCmdArgsType &argv,
                 If this limit is reached, the Ndb object will not create any new ones.
                 Hence, better to catch these cases early.
             */
-            print_args(argv);
+            printf("Failed to stop transaction\n");
+            //print_args(argv);
             printf("Number of transactions started: %lld\n", ndb->getClientStat(ndb->TransStartCount));
             printf("Number of transactions closed: %lld\n", ndb->getClientStat(ndb->TransCloseCount));
             exit(1);

pink/rondis/sql/HSET_key.sql

@@ -0,0 +1,7 @@
+CREATE TABLE hset_keys(
+    redis_key VARBINARY(3000) NOT NULL,
+    redis_key_id INT UNSIGNED NOT NULL AUTO_INCREMENT,
+    PRIMARY KEY (redis_key) USING HASH,
+    UNIQUE KEY (redis_key_id) USING HASH
+) ENGINE NDB,
+COMMENT = "NDB_TABLE=PARTITION_BALANCE=RP_BY_LDM_X_8";

pink/rondis/sql/STRING_key.sql

@@ -1,6 +1,7 @@
-CREATE TABLE redis.string_keys(
+CREATE TABLE string_keys(
     -- Redis actually supports a max key size of 512MiB,
     -- but we choose not to support that here
+    redis_key_id BIGINT UNSIGNED NOT NULL,
     redis_key VARBINARY(3000) NOT NULL,
     -- This is to save space when referencing the key in the value table
     rondb_key BIGINT UNSIGNED AUTO_INCREMENT NULL,
@@ -14,10 +15,10 @@ CREATE TABLE redis.string_keys(
     num_rows INT UNSIGNED NOT NULL,
     value_start VARBINARY(26500) NOT NULL,
     -- Redis supports get/set of seconds/milliseconds
-    expiry_date INT UNSIGNED,
+    expiry_date INT UNSIGNED NOT NULL,
     -- Easier to sort and delete keys this way
     KEY expiry_index(expiry_date),
-    PRIMARY KEY (redis_key) USING HASH,
+    PRIMARY KEY (redis_key_id, redis_key) USING HASH,
     UNIQUE KEY (rondb_key) USING HASH
 ) ENGINE NDB -- Each CHAR will use 1 byte
 CHARSET = latin1 COMMENT = "NDB_TABLE=PARTITION_BALANCE=FOR_RP_BY_LDM_X_8";

pink/rondis/sql/STRING_value.sql

@@ -1,8 +1,7 @@
-CREATE TABLE redis.string_values(
+CREATE TABLE string_values(
     rondb_key BIGINT UNSIGNED NOT NULL,
     ordinal INT UNSIGNED NOT NULL,
     value VARBINARY(29500) NOT NULL,
-    PRIMARY KEY (rondb_key, ordinal),
-    FOREIGN KEY (rondb_key) REFERENCES redis.string_keys(rondb_key) ON UPDATE RESTRICT ON DELETE CASCADE
+    PRIMARY KEY (rondb_key, ordinal)
 ) ENGINE NDB,
-COMMENT = "NDB_TABLE=PARTITION_BALANCE=RP_BY_LDM_X_8" PARTITION BY KEY (rondb_key);
+COMMENT = "NDB_TABLE=PARTITION_BALANCE=RP_BY_LDM_X_8";