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
1dd36347
Commit
1dd36347
authored
Sep 20, 2019
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
630638dc
f135d629
Changes
4
Show whitespace changes
Inline
Side-by-side
src/hyperloglog.c
View file @
1dd36347
...
...
@@ -1242,7 +1242,7 @@ void pfcountCommand(client *c) {
if
(
o
==
NULL
)
continue
;
/* Assume empty HLL for non existing var.*/
if
(
isHLLObjectOrReply
(
c
,
o
)
!=
C_OK
)
return
;
/* Merge with this HLL with our 'max' H
H
L by setting max[i]
/* Merge with this HLL with our 'max' H
L
L by setting max[i]
* to MAX(max[i],hll[i]). */
if
(
hllMerge
(
registers
,
o
)
==
C_ERR
)
{
addReplySds
(
c
,
sdsnew
(
invalid_hll_err
));
...
...
@@ -1329,7 +1329,7 @@ void pfmergeCommand(client *c) {
hdr
=
o
->
ptr
;
if
(
hdr
->
encoding
==
HLL_DENSE
)
use_dense
=
1
;
/* Merge with this HLL with our 'max' H
H
L by setting max[i]
/* Merge with this HLL with our 'max' H
L
L by setting max[i]
* to MAX(max[i],hll[i]). */
if
(
hllMerge
(
max
,
o
)
==
C_ERR
)
{
addReplySds
(
c
,
sdsnew
(
invalid_hll_err
));
...
...
src/module.c
View file @
1dd36347
...
...
@@ -2389,7 +2389,7 @@ int RM_HashSet(RedisModuleKey *key, int flags, ...) {
*
* REDISMODULE_HASH_EXISTS: instead of setting the value of the field
* expecting a RedisModuleString pointer to pointer, the function just
* reports if the field e
s
ists or not and expects an integer pointer
* reports if the field e
x
ists or not and expects an integer pointer
* as the second element of each pair.
*
* Example of REDISMODULE_HASH_CFIELD:
...
...
@@ -3288,7 +3288,7 @@ RedisModuleString *RM_LoadString(RedisModuleIO *io) {
* RedisModule_Realloc() or RedisModule_Free().
*
* The size of the string is stored at '*lenptr' if not NULL.
* The returned string is not automatically NULL termi
a
nted, it is loaded
* The returned string is not automatically NULL termin
a
ted, it is loaded
* exactly as it was stored inisde the RDB file. */
char
*
RM_LoadStringBuffer
(
RedisModuleIO
*
io
,
size_t
*
lenptr
)
{
return
moduleLoadString
(
io
,
1
,
lenptr
);
...
...
src/object.c
View file @
1dd36347
...
...
@@ -1440,7 +1440,7 @@ NULL
#if defined(USE_JEMALLOC)
sds
info
=
sdsempty
();
je_malloc_stats_print
(
inputCatSds
,
&
info
,
NULL
);
addReplyVerbatim
(
c
,
info
,
sdslen
(
info
),
"txt"
)
addReplyVerbatim
(
c
,
info
,
sdslen
(
info
),
"txt"
)
;
sdsfree
(
info
);
#else
addReplyBulkCString
(
c
,
"Stats not supported for the current allocator"
);
...
...
src/rdb.c
View file @
1dd36347
...
...
@@ -260,7 +260,7 @@ int rdbEncodeInteger(long long value, unsigned char *enc) {
/* Loads an integer-encoded object with the specified encoding type "enctype".
* The returned value changes according to the flags, see
* rdbGeneri
n
cLoadStringObject() for more info. */
* rdbGenericLoadStringObject() for more info. */
void
*
rdbLoadIntegerObject
(
rio
*
rdb
,
int
enctype
,
int
flags
,
size_t
*
lenptr
)
{
int
plain
=
flags
&
RDB_LOAD_PLAIN
;
int
sds
=
flags
&
RDB_LOAD_SDS
;
...
...
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