rename listpackttl to listpackex

redis · May 2, 2024 · 6c6c6a4 · 6c6c6a4
1 parent d0b523c
commit 6c6c6a4
Show file tree

Hide file tree

Showing 5 changed files with 112 additions and 111 deletions.
diff --git a/src/db.c b/src/db.c
@@ -1233,7 +1233,7 @@ void scanGenericCommand(client *c, robj *o, unsigned long long cursor) {
             p = lpNext(o->ptr, p);
         }
         cursor = 0;
-    } else if (o->type == OBJ_HASH && o->encoding == OBJ_ENCODING_LISTPACK_TTL) {
+    } else if (o->type == OBJ_HASH && o->encoding == OBJ_ENCODING_LISTPACK_EX) {
         int64_t len;
         long long expireAt;
         unsigned char *lp = hashTypeListpackGetLp(o);

diff --git a/src/object.c b/src/object.c
@@ -929,7 +929,7 @@ char *strEncoding(int encoding) {
     case OBJ_ENCODING_HT: return "hashtable";
     case OBJ_ENCODING_QUICKLIST: return "quicklist";
     case OBJ_ENCODING_LISTPACK: return "listpack";
-    case OBJ_ENCODING_LISTPACK_TTL: return "listpack_ttl";
+    case OBJ_ENCODING_LISTPACK_EX: return "listpackex";
     case OBJ_ENCODING_INTSET: return "intset";
     case OBJ_ENCODING_SKIPLIST: return "skiplist";
     case OBJ_ENCODING_EMBSTR: return "embstr";
@@ -1041,7 +1041,7 @@ size_t objectComputeSize(robj *key, robj *o, size_t sample_size, int dbid) {
         }
     } else if (o->type == OBJ_HASH) {
         if (o->encoding == OBJ_ENCODING_LISTPACK ||
-            o->encoding == OBJ_ENCODING_LISTPACK_TTL)
+            o->encoding == OBJ_ENCODING_LISTPACK_EX)
         {
             asize = hashTypeListpackMemUsage(o);
         } else if (o->encoding == OBJ_ENCODING_HT) {

diff --git a/src/server.h b/src/server.h
@@ -886,7 +886,7 @@ struct RedisModuleDigest {
 #define OBJ_ENCODING_QUICKLIST 9 /* Encoded as linked list of listpacks */
 #define OBJ_ENCODING_STREAM 10 /* Encoded as a radix tree of listpacks */
 #define OBJ_ENCODING_LISTPACK 11 /* Encoded as a listpack */
-#define OBJ_ENCODING_LISTPACK_TTL 12 /* Encoded as a listpack with TTL metadata */
+#define OBJ_ENCODING_LISTPACK_EX 12 /* Encoded as listpack, extended with metadata */
 
 #define LRU_BITS 24
 #define LRU_CLOCK_MAX ((1<<LRU_BITS)-1) /* Max value of obj->lru */
@@ -3151,9 +3151,9 @@ void setTypeConvert(robj *subject, int enc);
 int setTypeConvertAndExpand(robj *setobj, int enc, unsigned long cap, int panic);
 robj *setTypeDup(robj *o);
 
-/* Data structure for OBJ_ENCODING_LISTPACK_TTL. It contains listpack and
- * metadata fields for hash field expiration.*/
-typedef struct listpackTTL {
+/* Data structure for OBJ_ENCODING_LISTPACK_EX for hash. It contains listpack
+ * and metadata fields for hash field expiration.*/
+typedef struct listpackEx {
     ExpireMeta meta;  /* To be used in order to register the hash in the
                          global ebuckets (i.e. db->hexpires) with next,
                          minimum, hash-field to expire. */
@@ -3163,7 +3163,7 @@ typedef struct listpackTTL {
                          needed. */
     void *lp;         /* listpack that contains 'key-value-ttl' tuples which
                          are ordered by ttl. */
-} listpackTTL;
+} listpackEx;
 
 /* Hash data type */
 #define HASH_SET_TAKE_FIELD (1<<0)