Fixed default value

Signed-off-by: otheng03 <[email protected]>

Author: otheng03

src/config.c

@@ -3338,7 +3338,7 @@ standardConfig static_configs[] = {
     createLongLongConfig("commandlog-execution-slower-than", "slowlog-log-slower-than", MODIFIABLE_CONFIG, -1, LLONG_MAX, server.commandlog[COMMANDLOG_TYPE_SLOW].threshold, 10000, INTEGER_CONFIG, NULL, NULL),
     createLongLongConfig("commandlog-request-larger-than", NULL, MODIFIABLE_CONFIG, -1, LLONG_MAX, server.commandlog[COMMANDLOG_TYPE_LARGE_REQUEST].threshold, 1024 * 1024, INTEGER_CONFIG, NULL, NULL),
     createLongLongConfig("commandlog-reply-larger-than", NULL, MODIFIABLE_CONFIG, -1, LLONG_MAX, server.commandlog[COMMANDLOG_TYPE_LARGE_REPLY].threshold, 1024 * 1024, INTEGER_CONFIG, NULL, NULL),
-    createLongLongConfig("keyinfo-num-elements-larger-than", NULL, MODIFIABLE_CONFIG, -1, LLONG_MAX, server.keyinfo[KEYINFO_TYPE_MANY_ELEMENTS].threshold, 1, INTEGER_CONFIG, NULL, NULL),
+    createLongLongConfig("keyinfo-num-elements-larger-than", NULL, MODIFIABLE_CONFIG, -1, LLONG_MAX, server.keyinfo[KEYINFO_TYPE_MANY_ELEMENTS].threshold, 1024, INTEGER_CONFIG, NULL, NULL),
     createLongLongConfig("keyinfo-large-num-elements-max-len", NULL, MODIFIABLE_CONFIG, 0, LLONG_MAX, server.keyinfo[KEYINFO_TYPE_MANY_ELEMENTS].max_len, 128, INTEGER_CONFIG, NULL, updateKeyinfoLargeNumElementsMaxLen),
     createLongLongConfig("latency-monitor-threshold", NULL, MODIFIABLE_CONFIG, 0, LLONG_MAX, server.latency_monitor_threshold, 0, INTEGER_CONFIG, NULL, NULL),
     createLongLongConfig("proto-max-bulk-len", NULL, DEBUG_CONFIG | MODIFIABLE_CONFIG, 1024 * 1024, LONG_MAX, server.proto_max_bulk_len, 512ll * 1024 * 1024, MEMORY_CONFIG, NULL, NULL), /* Bulk request max size */

src/keyinfo.c

@@ -10,8 +10,6 @@ void keyinfoInit(void) {
     for (int i = 0; i < KEYINFO_TYPE_NUM; i++) {
         server.keyinfo[i].entries_max_len = server.keyinfo[i].max_len;
         server.keyinfo[i].entries = zcalloc(sizeof(keyinfoEntry) * server.keyinfo[i].entries_max_len);
-        /* TODO : Since the bucket size is fixed, the entry_id can be retrieved from the bucket index. */
-        server.keyinfo[i].entry_id = 0;
     }
 }
 
@@ -28,7 +26,6 @@ void keyinfoResize(int type) {
         keyinfoEntry *entry = &server.keyinfo[type].entries[i];
         if (entry->key != NULL) {
             unsigned int idx = getIndex(entry->key, new_len);
-            entriesResized[idx].id = entry->id;
             entriesResized[idx].key = entry->key;
             entriesResized[idx].value = entry->value;
             entriesResized[idx].time = entry->time;
@@ -39,6 +36,7 @@ void keyinfoResize(int type) {
     server.keyinfo[type].entries = entriesResized;
     server.keyinfo[type].entries_max_len = new_len;
 }
+
 void keyinfoUpdateEntryIfNeeded(robj *keyobj, long long value, int type) {
     if (server.keyinfo[type].threshold < 0 || server.keyinfo[type].max_len == 0) return; /* keyinfo disabled */
 
@@ -52,19 +50,12 @@ void keyinfoUpdateEntryIfNeeded(robj *keyobj, long long value, int type) {
         return;
     }
 
-    if (entry->key != NULL && equalStringObjects(entry->key, keyobj)) {
-        entry->value = value;
-        entry->time = time(NULL);
-        return;
-    }
-
     incrRefCount(keyobj);
     /* If the entry is already set, free the entry */
     if (entry->key != NULL) {
         keyinfoFreeEntry(entry);
     }
 
-    entry->id = server.keyinfo[type].entry_id++;
     entry->key = keyobj;
     entry->value = value;
     entry->time = time(NULL);
@@ -147,7 +138,7 @@ void keyinfoCommand(client *c) {
             keyinfoEntry *entry = &server.keyinfo[type].entries[i];
             if (entry->key != NULL) {
                 addReplyArrayLen(c, 4);
-                addReplyLongLong(c, entry->id);
+                addReplyLongLong(c, i);
                 addReplyBulkCBuffer(c, entry->key->ptr, sdslen(entry->key->ptr));
                 addReplyLongLong(c, entry->value);
                 addReplyLongLong(c, entry->time);

src/keyinfo.h

@@ -5,7 +5,6 @@
 
 /* This structure defines an entry inside the bigkey log bucket */
 typedef struct keyinfoEntry {
-    long long id;
     robj *key;
     long long value;
     time_t time;

src/server.h

@@ -409,7 +409,6 @@ typedef enum {
 typedef struct keyinfo {
     long long entries_max_len;
     keyinfoEntry *entries;
-    long long entry_id;
     long long threshold;
     long long max_len;
 } keyinfo;

tests/unit/keyinfo.tcl

@@ -9,17 +9,17 @@ start_server {tags {"keyinfo"} overrides {keyinfo-num-elements-larger-than 2 key
 
         r hset key-id0 f1 v1  f2 v2 f3 v3
         set e [lindex [r keyinfo get -1 many-elements] 0]
-        assert_equal [expr {[lindex $e 0] == 0}] 1
+        assert_equal [expr {[lindex $e 0] == 89}] 1
         r hset key-id0 f4 v4
         set e [lindex [r keyinfo get -1 many-elements] 0]
-        assert_equal [expr {[lindex $e 0] == 0}] 1
+        assert_equal [expr {[lindex $e 0] == 89}] 1
 
         r set key-id1 12345
         set e [lindex [r keyinfo get -1 many-elements] 1]
-        assert_equal [expr {[lindex $e 0] == 1}] 1
+        assert_equal [expr {[lindex $e 0] == 120}] 1
         r set key-id1 123456
         set e [lindex [r keyinfo get -1 many-elements] 1]z
-        assert_equal [expr {[lindex $e 0] == 1}] 1
+        assert_equal [expr {[lindex $e 0] == 120}] 1
     }
 
     test {KEYINFO - If the string length exceeds keyinfo-num-elements-larger-than, it must be recorded in keyinfo} {

valkey.conf

@@ -2087,7 +2087,7 @@ commandlog-large-reply-max-len 128
 # a significantly large number of elements (e.g., lists, hashes, sets, etc.).
 # This option is useful when you want to find only those keys that
 # have a very large number of elements.
-keyinfo-num-elements-larger-than 1
+keyinfo-num-elements-larger-than 1024
 
 # Defines the size of the bucket for storing keyinfo entries.
 # The buckets are managed as a hash bucket, meaning that each key is mapped to a