remove keyinfo information

Author: hwware

src/server.c

@@ -886,18 +886,7 @@ void trackInstantaneousMetric(int metric, long long current_value, long long cur
     server.inst_metric[metric].last_sample_value = current_value;
 }
 
-size_t getStringValueMemoryUsage(robj *obj) {
-    size_t asize = 0;
-    if (obj->encoding == OBJ_ENCODING_INT) {
-        asize = sizeof(*obj);
-    } else if (obj->encoding == OBJ_ENCODING_RAW) {
-        asize = sdsAllocSize(obj->ptr) + sizeof(*obj);
-    } else if (obj->encoding == OBJ_ENCODING_EMBSTR) {
-        asize = zmalloc_size((void *)obj);
-    }
-    return asize;
-}
-
+/*
 void displayUpdate(int pre_value, int current_value) {
     serverLog(LL_WARNING, "This is for testing, previous item number is %d, and current item number is %d", pre_value,
               current_value);
@@ -909,6 +898,7 @@ void displayDataTypeArray(keysizeInfo *keysize_array, int length) {
         serverLog(LL_WARNING, "Item %lld and value is %lld", keysize_array[i].element_size, keysize_array[i].num);
     }
 }
+*/
 
 void updateKeySizeArray(serverDb *db, robj *dstkey) {
     robj *t_obj = lookupKeyWrite(db, dstkey);
@@ -2856,20 +2846,6 @@ serverDb *createDatabase(int id) {
     db->ready_keys = dictCreate(&objectKeyPointerValueDictType);
     db->watched_keys = dictCreate(&keylistDictType);
     db->id = id;
-    db->list_array_length = KEYSIZE_ARRAY_SIZE;
-    db->set_array_length = KEYSIZE_ARRAY_SIZE;
-    db->hash_array_length = KEYSIZE_ARRAY_SIZE;
-    db->zset_array_length = KEYSIZE_ARRAY_SIZE;
-    db->string_array_length = KEYSIZE_ARRAY_SIZE;
-    long long i = 1;
-    for (int count = 0; count < KEYSIZE_ARRAY_SIZE; count++) {
-        db->list_array[count].element_size = i;
-        db->set_array[count].element_size = i;
-        db->hash_array[count].element_size = i;
-        db->zset_array[count].element_size = i;
-        db->string_array[count].element_size = i;
-        i *= 2;
-    }
     resetDbExpiryState(db);
     return db;
 }

src/server.h

@@ -411,10 +411,6 @@ typedef struct bigkeyEntry {
     robj *key;
 } bigkeyEntry;
 
-/* Type of keyinfo */
-typedef enum { KEYINFO_TYPE_MANY_ELEMENTS = 0,
-               KEYINFO_TYPE_NUM } keyinfo_type;
-
 /* Replica replication state. Used in server.repl_state for replicas to remember
  * what to do next. */
 typedef enum {
@@ -876,12 +872,6 @@ typedef struct replBufBlock {
     char buf[];
 } replBufBlock;
 
-typedef struct keysizeInfo {
-    long long element_size;
-    long long num;
-} keysizeInfo;
-
-#define KEYSIZE_ARRAY_SIZE 32
 
 /* Database representation. There are multiple databases identified
  * by integers from 0 (the default database) up to the max configured
@@ -901,21 +891,6 @@ typedef struct serverDb {
         long long avg_ttl;    /* Average TTL, just for stats */
         unsigned long cursor; /* Cursor of the active expire cycle. */
     } expiry[ACTIVE_EXPIRY_TYPE_COUNT];
-    keysizeInfo list_array[KEYSIZE_ARRAY_SIZE];
-    int list_array_length;
-    unsigned long long list_number_of_keys;
-    keysizeInfo set_array[KEYSIZE_ARRAY_SIZE];
-    int set_array_length;
-    unsigned long long set_number_of_keys;
-    keysizeInfo hash_array[KEYSIZE_ARRAY_SIZE];
-    int hash_array_length;
-    unsigned long long hash_number_of_keys;
-    keysizeInfo zset_array[KEYSIZE_ARRAY_SIZE];
-    int zset_array_length;
-    unsigned long long zset_number_of_keys;
-    keysizeInfo string_array[KEYSIZE_ARRAY_SIZE];
-    int string_array_length;
-    unsigned long long string_number_of_keys;
 } serverDb;
 
 /* forward declaration for functions ctx */
@@ -3051,9 +3026,8 @@ void freeSetObject(robj *o);
 void freeZsetObject(robj *o);
 void freeHashObject(robj *o);
 void dismissObject(robj *o, size_t dump_size);
-size_t getStringValueMemoryUsage(robj *obj);
-void displayUpdate(int pre_value, int current_value);
-void displayDataTypeArray(keysizeInfo *keysize_array, int length);
+//void displayUpdate(int pre_value, int current_value);
+//void displayDataTypeArray(keysizeInfo *keysize_array, int length);
 void updateKeySizeArray(serverDb *db, robj *key);
 robj *createObject(int type, void *ptr);
 void initObjectLRUOrLFU(robj *o);

src/t_list.c

@@ -475,7 +475,6 @@ void pushGenericCommand(client *c, int where, int xx) {
         lobj = createListListpackObject();
         dbAdd(c->db, c->argv[1], &lobj);
         previous_element_number = 0;
-        c->db->list_number_of_keys++;
     } else {
         previous_element_number = listTypeLength(lobj);
     }