From 794e8285fd28dcefacddc8dafc4f78718f8fc3de Mon Sep 17 00:00:00 2001 From: Warrick <1016weicheng@gmail.com> Date: Thu, 9 Apr 2026 19:26:11 +0800 Subject: [PATCH] [fix] modify RDB_TYPE_BITMAP from 26 to 192 --- src/rdb.h | 4 ++-- src/redis-check-rdb.c | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/rdb.h b/src/rdb.h index 57fd897cfe0..7da227f1b09 100644 --- a/src/rdb.h +++ b/src/rdb.h @@ -80,12 +80,12 @@ #define RDB_TYPE_HASH_LISTPACK_EX 25 /* Hash LP with HFEs. Attach min TTL at start */ /* NOTE: WHEN ADDING NEW RDB TYPE, UPDATE rdbIsObjectType(), and rdb_type_string[] */ #ifdef ENABLE_SWAP -#define RDB_TYPE_BITMAP 26 +#define RDB_TYPE_BITMAP 192 #endif /* Test if a type is an object type. */ #ifdef ENABLE_SWAP -#define rdbIsObjectType(t) (((t) >= 0 && (t) <= 7) || ((t) >= 9 && (t) <= 26)) +#define rdbIsObjectType(t) (((t) >= 0 && (t) <= 7) || ((t) >= 9 && (t) <= 25) || (t) == RDB_TYPE_BITMAP) #else #define rdbIsObjectType(t) (((t) >= 0 && (t) <= 7) || ((t) >= 9 && (t) <= 25)) #endif diff --git a/src/redis-check-rdb.c b/src/redis-check-rdb.c index e070fad9a05..0cf92595157 100644 --- a/src/redis-check-rdb.c +++ b/src/redis-check-rdb.c @@ -118,6 +118,9 @@ void rdbCheckError(const char *fmt, ...) { if (rdbstate.key_type != -1) printf("[additional info] Reading type %d (%s)\n", rdbstate.key_type, +#ifdef ENABLE_SWAP + (rdbstate.key_type == RDB_TYPE_BITMAP) ? "bitmap" : +#endif ((unsigned)rdbstate.key_type < sizeof(rdb_type_string)/sizeof(char*)) ? rdb_type_string[rdbstate.key_type] : "unknown");