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
0110e46f
Commit
0110e46f
authored
Dec 11, 2018
by
antirez
Browse files
Merge branch 'unstable' of github.com:/antirez/redis into unstable
parents
a31ca8d7
f77edf42
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/db.c
View file @
0110e46f
...
@@ -212,7 +212,7 @@ void dbOverwrite(redisDb *db, robj *key, robj *val) {
...
@@ -212,7 +212,7 @@ void dbOverwrite(redisDb *db, robj *key, robj *val) {
* 2) clients WATCHing for the destination key notified.
* 2) clients WATCHing for the destination key notified.
* 3) The expire time of the key is reset (the key is made persistent).
* 3) The expire time of the key is reset (the key is made persistent).
*
*
* All the new keys in the database should be creted via this interface. */
* All the new keys in the database should be cre
a
ted via this interface. */
void
setKey
(
redisDb
*
db
,
robj
*
key
,
robj
*
val
)
{
void
setKey
(
redisDb
*
db
,
robj
*
key
,
robj
*
val
)
{
if
(
lookupKeyWrite
(
db
,
key
)
==
NULL
)
{
if
(
lookupKeyWrite
(
db
,
key
)
==
NULL
)
{
dbAdd
(
db
,
key
,
val
);
dbAdd
(
db
,
key
,
val
);
...
...
src/sds.c
View file @
0110e46f
...
@@ -695,7 +695,7 @@ sds sdscatfmt(sds s, char const *fmt, ...) {
...
@@ -695,7 +695,7 @@ sds sdscatfmt(sds s, char const *fmt, ...) {
* s = sdstrim(s,"Aa. :");
* s = sdstrim(s,"Aa. :");
* printf("%s\n", s);
* printf("%s\n", s);
*
*
* Output will be just "Hello
World".
* Output will be just "HelloWorld".
*/
*/
sds
sdstrim
(
sds
s
,
const
char
*
cset
)
{
sds
sdstrim
(
sds
s
,
const
char
*
cset
)
{
char
*
start
,
*
end
,
*
sp
,
*
ep
;
char
*
start
,
*
end
,
*
sp
,
*
ep
;
...
...
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