mirrors
/
redis
mirror of https://mirror.osredm.com/root/redis.git
2
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update version references from 8.0 to 7.4 for upcoming release (#13294)

This commit is contained in:
debing.sun 2024-05-27 16:47:23 +08:00 committed by GitHub
parent 6801a3cec8
commit 2d1bb42cba
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/commands.def
View File

@ -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 */

4
src/commands/client-kill.json
View File

@ -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"
}
]
}

2
src/object.c
View File

@ -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 =