Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
redis
Commits
022f0944
Commit
022f0944
authored
Apr 24, 2020
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
8a7f255c
e83d5b64
Changes
3
Show whitespace changes
Inline
Side-by-side
src/bio.c
View file @
022f0944
...
...
@@ -266,7 +266,7 @@ void bioKillThreads(void) {
int
err
,
j
;
for
(
j
=
0
;
j
<
BIO_NUM_OPS
;
j
++
)
{
if
(
pthread_cancel
(
bio_threads
[
j
])
==
0
)
{
if
(
bio_threads
[
j
]
&&
pthread_cancel
(
bio_threads
[
j
])
==
0
)
{
if
((
err
=
pthread_join
(
bio_threads
[
j
],
NULL
))
!=
0
)
{
serverLog
(
LL_WARNING
,
"Bio thread for job type #%d can be joined: %s"
,
...
...
src/server.c
View file @
022f0944
...
...
@@ -4037,7 +4037,7 @@ sds genRedisInfoString(const char *section) {
size_t zmalloc_used = zmalloc_used_memory();
size_t total_system_mem = server.system_memory_size;
const char *evict_policy = evictPolicyToString();
long long memory_lua = (long long)lua_gc(server.lua,LUA_GCCOUNT,0)*1024;
long long memory_lua =
server.lua ?
(long long)lua_gc(server.lua,LUA_GCCOUNT,0)*1024
: 0
;
struct redisMemOverhead *mh = getMemoryOverheadData();
/* Peak memory is updated from time to time by serverCron() so it
...
...
tests/unit/type/stream.tcl
View file @
022f0944
...
...
@@ -414,7 +414,7 @@ start_server {tags {"stream"} overrides {appendonly yes stream-node-max-entries
}
}
start_server
{
tags
{
"xsetid"
}}
{
start_server
{
tags
{
"
stream
xsetid"
}}
{
test
{
XADD can CREATE an empty stream
}
{
r XADD mystream MAXLEN 0 * a b
assert
{[
dict get
[
r xinfo stream mystream
]
length
]
== 0
}
...
...
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