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
6ce2ed87
Unverified
Commit
6ce2ed87
authored
Jun 15, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Jun 15, 2020
Browse files
Merge pull request #7396 from MeirShpilraien/fix_dict_scan_module_api
Fix RM_ScanKey module api not to return int encoded strings
parents
10553988
a89bf734
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/module.c
View file @
6ce2ed87
...
...
@@ -6708,7 +6708,7 @@ int RM_ScanKey(RedisModuleKey *key, RedisModuleScanCursor *cursor, RedisModuleSc
int pos = 0;
int64_t ll;
while(intsetGet(o->ptr,pos++,&ll)) {
robj *field = create
StringObjectF
rom
L
ong
L
ong(ll);
robj *field = create
Object(OBJ_STRING,sdsf
rom
l
ong
l
ong(ll)
)
;
fn(key, field, NULL, privdata);
decrRefCount(field);
}
...
...
@@ -6724,12 +6724,12 @@ int RM_ScanKey(RedisModuleKey *key, RedisModuleScanCursor *cursor, RedisModuleSc
ziplistGet(p,&vstr,&vlen,&vll);
robj *field = (vstr != NULL) ?
createStringObject((char*)vstr,vlen) :
create
StringObjectF
rom
L
ong
L
ong(vll);
create
Object(OBJ_STRING,sdsf
rom
l
ong
l
ong(vll)
)
;
p = ziplistNext(o->ptr,p);
ziplistGet(p,&vstr,&vlen,&vll);
robj *value = (vstr != NULL) ?
createStringObject((char*)vstr,vlen) :
create
StringObjectF
rom
L
ong
L
ong(vll);
create
Object(OBJ_STRING,sdsf
rom
l
ong
l
ong(vll)
)
;
fn(key, field, value, privdata);
p = ziplistNext(o->ptr,p);
decrRefCount(field);
...
...
tests/modules/scan.c
View file @
6ce2ed87
...
...
@@ -55,11 +55,23 @@ void scan_key_callback(RedisModuleKey *key, RedisModuleString* field, RedisModul
REDISMODULE_NOT_USED
(
key
);
scan_key_pd
*
pd
=
privdata
;
RedisModule_ReplyWithArray
(
pd
->
ctx
,
2
);
RedisModule_ReplyWithString
(
pd
->
ctx
,
field
);
if
(
value
)
RedisModule_ReplyWithString
(
pd
->
ctx
,
value
);
else
size_t
fieldCStrLen
;
// The implementation of RedisModuleString is robj with lots of encodings.
// We want to make sure the robj that passes to this callback in
// String encoded, this is why we use RedisModule_StringPtrLen and
// RedisModule_ReplyWithStringBuffer instead of directly use
// RedisModule_ReplyWithString.
const
char
*
fieldCStr
=
RedisModule_StringPtrLen
(
field
,
&
fieldCStrLen
);
RedisModule_ReplyWithStringBuffer
(
pd
->
ctx
,
fieldCStr
,
fieldCStrLen
);
if
(
value
){
size_t
valueCStrLen
;
const
char
*
valueCStr
=
RedisModule_StringPtrLen
(
value
,
&
valueCStrLen
);
RedisModule_ReplyWithStringBuffer
(
pd
->
ctx
,
valueCStr
,
valueCStrLen
);
}
else
{
RedisModule_ReplyWithNull
(
pd
->
ctx
);
}
pd
->
nreplies
++
;
}
...
...
tests/unit/moduleapi/scan.tcl
View file @
6ce2ed87
...
...
@@ -16,6 +16,11 @@ start_server {tags {"modules"}} {
r hmset hh f1 v1 f2 v2
lsort
[
r scan.scan_key hh
]
}
{{
f1 v1
}
{
f2 v2
}}
test
{
Module scan hash dict with int value
}
{
r hmset hh1 f1 1
lsort
[
r scan.scan_key hh1
]
}
{{
f1 1
}}
test
{
Module scan hash dict
}
{
r config set hash-max-ziplist-entries 2
...
...
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