diff --git a/src/commands.def b/src/commands.def index 8f1bdf50f..df8085bab 100644 --- a/src/commands.def +++ b/src/commands.def @@ -1177,7 +1177,7 @@ commandHistory CLIENT_KILL_History[] = { {"3.2.0","Added `master` type in for `TYPE` option."}, {"5.0.0","Replaced `slave` `TYPE` with `replica`. `slave` still supported for backward compatibility."}, {"6.2.0","`LADDR` option."}, -{"8.0.0","`MAXAGE` option."}, +{"7.4.0","`MAXAGE` option."}, }; #endif @@ -1214,7 +1214,7 @@ struct COMMAND_ARG CLIENT_KILL_filter_new_format_Subargs[] = { {MAKE_ARG("addr",ARG_TYPE_STRING,-1,"ADDR",NULL,NULL,CMD_ARG_OPTIONAL,0,NULL),.display_text="ip:port"}, {MAKE_ARG("laddr",ARG_TYPE_STRING,-1,"LADDR",NULL,"6.2.0",CMD_ARG_OPTIONAL,0,NULL),.display_text="ip:port"}, {MAKE_ARG("skipme",ARG_TYPE_ONEOF,-1,"SKIPME",NULL,NULL,CMD_ARG_OPTIONAL,2,NULL),.subargs=CLIENT_KILL_filter_new_format_skipme_Subargs}, -{MAKE_ARG("maxage",ARG_TYPE_INTEGER,-1,"MAXAGE",NULL,"8.0.0",CMD_ARG_OPTIONAL,0,NULL)}, +{MAKE_ARG("maxage",ARG_TYPE_INTEGER,-1,"MAXAGE",NULL,"7.4.0",CMD_ARG_OPTIONAL,0,NULL)}, }; /* CLIENT KILL filter argument table */ diff --git a/src/commands/client-kill.json b/src/commands/client-kill.json index 7efd80508..17f848cda 100644 --- a/src/commands/client-kill.json +++ b/src/commands/client-kill.json @@ -29,7 +29,7 @@ "`LADDR` option." ], [ - "8.0.0", + "7.4.0", "`MAXAGE` option." ] ], @@ -146,7 +146,7 @@ "name": "maxage", "type": "integer", "optional": true, - "since": "8.0.0" + "since": "7.4.0" } ] } diff --git a/src/object.c b/src/object.c index 7e16fc5c0..e76e7033c 100644 --- a/src/object.c +++ b/src/object.c @@ -1162,7 +1162,7 @@ struct redisMemOverhead *getMemoryOverheadData(void) { (float)server.cron_malloc_stats.process_rss / server.cron_malloc_stats.zmalloc_used; mh->total_frag_bytes = server.cron_malloc_stats.process_rss - server.cron_malloc_stats.zmalloc_used; - /* Starting with redis 8.0, the lua memory is part of the total memory usage + /* Starting with redis 7.4, the lua memory is part of the total memory usage * of redis, and that includes RSS and all other memory metrics. We only want * to deduct it from active defrag. */ size_t frag_smallbins_bytes =