Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
2d1bb42c
Unverified
Commit
2d1bb42c
authored
May 27, 2024
by
debing.sun
Committed by
GitHub
May 27, 2024
Browse files
Update version references from 8.0 to 7.4 for upcoming release (#13294)
parent
6801a3ce
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/commands.def
View file @
2d1bb42c
...
...
@@ -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 */
...
...
src/commands/client-kill.json
View file @
2d1bb42c
...
...
@@ -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"
}
]
}
...
...
src/object.c
View file @
2d1bb42c
...
...
@@ -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
=
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment