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
73316758
Unverified
Commit
73316758
authored
Apr 27, 2020
by
Salvatore Sanfilippo
Committed by
GitHub
Apr 27, 2020
Browse files
Merge pull request #7152 from oranagra/dict_find_static_robj
allow dictFind using static robj
parents
911a2d6c
09a5c078
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/server.c
View file @
73316758
...
@@ -1219,11 +1219,16 @@ int dictEncObjKeyCompare(void *privdata, const void *key1,
...
@@ -1219,11 +1219,16 @@ int dictEncObjKeyCompare(void *privdata, const void *key1,
o2
->
encoding
==
OBJ_ENCODING_INT
)
o2
->
encoding
==
OBJ_ENCODING_INT
)
return
o1
->
ptr
==
o2
->
ptr
;
return
o1
->
ptr
==
o2
->
ptr
;
o1
=
getDecodedObject
(
o1
);
/* due to OBJ_STATIC_REFCOUNT, we rather not call sdsEncodedObject unnecessarily */
o2
=
getDecodedObject
(
o2
);
if
(
!
sdsEncodedObject
(
o1
))
o1
=
getDecodedObject
(
o1
);
if
(
!
sdsEncodedObject
(
o2
))
o2
=
getDecodedObject
(
o2
);
cmp
=
dictSdsKeyCompare
(
privdata
,
o1
->
ptr
,
o2
->
ptr
);
cmp
=
dictSdsKeyCompare
(
privdata
,
o1
->
ptr
,
o2
->
ptr
);
decrRefCount
(
o1
);
if
(
o1
!=
key1
)
decrRefCount
(
o2
);
decrRefCount
(
o1
);
if
(
o2
!=
key2
)
decrRefCount
(
o2
);
return
cmp
;
return
cmp
;
}
}
...
...
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