Support hash: Plain, Listpack, Ziplist, Zipmap

redis · Jul 31, 2023 · 91b1566 · 91b1566
1 parent 3d1acab
commit 91b1566
Show file tree

Hide file tree

Showing 30 changed files with 1,496 additions and 226 deletions.
diff --git a/api/librdb-api.h b/api/librdb-api.h
@@ -61,11 +61,15 @@ typedef enum RdbRes {
     RDB_ERR_NOT_SUPPORTED_RDB_ENCODING_TYPE,
     RDB_ERR_UNKNOWN_RDB_ENCODING_TYPE,
     RDB_ERR_QUICK_LIST_INTEG_CHECK,
-    RDB_ERR_ZIP_LIST_INTEG_CHECK,
+    RDB_ERR_LIST_ZL_INTEG_CHECK,
+    RDB_ERR_HASH_LP_INTEG_CHECK,
+    RDB_ERR_HASH_ZM_INTEG_CHECK,
+    RDB_ERR_SSTYPE_INTEG_CHECK,
     RDB_ERR_STRING_INVALID_STATE,
+    RDB_ERR_PLAIN_HASH_INVALID_STATE,
     RDB_ERR_PLAIN_LIST_INVALID_STATE,
     RDB_ERR_QUICK_LIST_INVALID_STATE,
-    RDB_ERR_ZIP_LIST_INVALID_STATE,
+    RDB_ERR_SSTYPE_INVALID_STATE,
     RDB_ERR_INVALID_BULK_ALLOC_TYPE,
     RDB_ERR_INVALID_BULK_CLONE_REQUEST,
     RDB_ERR_INVALID_BULK_LENGTH_REQUEST,
@@ -193,12 +197,18 @@ typedef struct RdbHandlersRawCallbacks {
 typedef struct RdbHandlersStructCallbacks {
     HANDLERS_COMMON_CALLBACKS
     RdbRes (*handleStringValue)(RdbParser *p, void *userData, RdbBulk str);
-    RdbRes (*handleListLP)(RdbParser *p, void *userData, RdbBulk listLP);
+    /* list */
+    RdbRes (*handleListPlain)(RdbParser *p, void *userData, RdbBulk node);
     RdbRes (*handleListZL)(RdbParser *p, void *userData, RdbBulk listZL);
-    RdbRes (*handleListNode)(RdbParser *p, void *userData, RdbBulk node);
+    RdbRes (*handleListLP)(RdbParser *p, void *userData, RdbBulk listLP);
+    /* hash */
+    RdbRes (*handleHashPlain)(RdbParser *p, void *userData, RdbBulk field, RdbBulk value, uint64_t totalNumElm);
+    RdbRes (*handleHashZL)(RdbParser *p, void *userData, RdbBulk listZL);
+    RdbRes (*handleHashLP)(RdbParser *p, void *userData, RdbBulk hashLp);
+    RdbRes (*handleHashZM)(RdbParser *p, void *userData, RdbBulk hashZM);
+
 
-    /*** TODO: RdbHandlersStructCallbacks: handlerHashListPack, handleSetIntset, handleZsetListPack, handleFunction ***/
-    RdbRes (*handlerHashLP)(RdbParser *p, void *userData, RdbBulk hashLp);
+    /*** TODO: RdbHandlersStructCallbacks: handleSetIntset, handleZsetListPack, handleFunction ***/
     RdbRes (*handleSetIntset)(RdbParser *p, void *userData, RdbBulk intSet);
     RdbRes (*handleSetLP)(RdbParser *p, void *userData, RdbBulk setLP);
     RdbRes (*handleSetZL)(RdbParser *p, void *userData, RdbBulk setZL);
@@ -213,9 +223,9 @@ typedef struct RdbHandlersDataCallbacks {
     HANDLERS_COMMON_CALLBACKS
     RdbRes (*handleStringValue)(RdbParser *p, void *userData, RdbBulk str);
     RdbRes (*handleListElement)(RdbParser *p, void *userData, RdbBulk str);
+    RdbRes (*handleHashElement)(RdbParser *p, void *userData, RdbBulk field, RdbBulk value, uint64_t totalNumElm);
 
-    /*** TODO: RdbHandlersDataCallbacks: handleHashElement, handleSetElement, handleZsetElement ***/
-    RdbRes (*handleHashElement)(RdbParser *p, void *userData, RdbBulk field, RdbBulk elm, uint64_t totalNumElm);
+    /*** TODO: RdbHandlersDataCallbacks: handleSetElement, handleZsetElement ***/
     RdbRes (*handleSetElement)(RdbParser *p, void *userData, RdbBulk elm, uint64_t totalNumElm);
     RdbRes (*handleZsetElement)(RdbParser *p, void *userData, RdbBulk elm, double score, uint64_t totalNumElm);
 

diff --git a/api/librdb-ext-api.h b/api/librdb-ext-api.h
@@ -97,8 +97,8 @@ typedef struct RdbxToRespConf {
     /* TODO: support the option of expire, del, select db */
 
     /* If supportRestore, then data-types will be translated to RESTORE with
-     * raw data instead of data-types commands. This is a performance, version
-     * (specific) aligned, optimization */
+     * raw data instead of data-types commands. This is a performance optimization
+     * that requires to be version aligned. */
     int supportRestore;
 
     /* TODO: support rdb2resp del key before write */