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
3f973463
Commit
3f973463
authored
Apr 17, 2010
by
Pieter Noordhuis
Browse files
make sure that the resulting value in hincrby is encoded when possible
parent
edc2f63a
Changes
1
Hide whitespace changes
Inline
Side-by-side
redis.c
View file @
3f973463
...
@@ -2775,6 +2775,23 @@ static robj *createStringObject(char *ptr, size_t len) {
...
@@ -2775,6 +2775,23 @@ static robj *createStringObject(char *ptr, size_t len) {
return
createObject
(
REDIS_STRING
,
sdsnewlen
(
ptr
,
len
));
return
createObject
(
REDIS_STRING
,
sdsnewlen
(
ptr
,
len
));
}
}
static
robj
*
createStringObjectFromLongLong
(
long
long
value
)
{
robj
*
o
;
if
(
value
>=
0
&&
value
<
REDIS_SHARED_INTEGERS
)
{
incrRefCount
(
shared
.
integers
[
value
]);
o
=
shared
.
integers
[
value
];
}
else
{
o
=
createObject
(
REDIS_STRING
,
NULL
);
if
(
value
>=
LONG_MIN
&&
value
<=
LONG_MAX
)
{
o
->
encoding
=
REDIS_ENCODING_INT
;
o
->
ptr
=
(
void
*
)((
long
)
value
);
}
else
{
o
->
ptr
=
sdscatprintf
(
sdsempty
(),
"%lld"
,
value
);
}
}
return
o
;
}
static
robj
*
dupStringObject
(
robj
*
o
)
{
static
robj
*
dupStringObject
(
robj
*
o
)
{
assert
(
o
->
encoding
==
REDIS_ENCODING_RAW
);
assert
(
o
->
encoding
==
REDIS_ENCODING_RAW
);
return
createStringObject
(
o
->
ptr
,
sdslen
(
o
->
ptr
));
return
createStringObject
(
o
->
ptr
,
sdslen
(
o
->
ptr
));
...
@@ -6071,8 +6088,8 @@ static void hashTryConversion(robj *subject, robj **argv, int start, int end) {
...
@@ -6071,8 +6088,8 @@ static void hashTryConversion(robj *subject, robj **argv, int start, int end) {
/* Encode given objects in-place when the hash uses a dict. */
/* Encode given objects in-place when the hash uses a dict. */
static
void
hashTryObjectEncoding
(
robj
*
subject
,
robj
**
o1
,
robj
**
o2
)
{
static
void
hashTryObjectEncoding
(
robj
*
subject
,
robj
**
o1
,
robj
**
o2
)
{
if
(
subject
->
encoding
==
REDIS_ENCODING_HT
)
{
if
(
subject
->
encoding
==
REDIS_ENCODING_HT
)
{
*
o1
=
tryObjectEncoding
(
*
o1
);
if
(
o1
)
*
o1
=
tryObjectEncoding
(
*
o1
);
*
o2
=
tryObjectEncoding
(
*
o2
);
if
(
o2
)
*
o2
=
tryObjectEncoding
(
*
o2
);
}
}
}
}
...
@@ -6316,7 +6333,8 @@ static void hincrbyCommand(redisClient *c) {
...
@@ -6316,7 +6333,8 @@ static void hincrbyCommand(redisClient *c) {
}
}
value
+=
incr
;
value
+=
incr
;
new
=
createObject
(
REDIS_STRING
,
sdscatprintf
(
sdsempty
(),
"%lld"
,
value
));
new
=
createStringObjectFromLongLong
(
value
);
hashTryObjectEncoding
(
o
,
&
c
->
argv
[
2
],
NULL
);
hashSet
(
o
,
c
->
argv
[
2
],
new
);
hashSet
(
o
,
c
->
argv
[
2
],
new
);
decrRefCount
(
new
);
decrRefCount
(
new
);
addReplyLongLong
(
c
,
value
);
addReplyLongLong
(
c
,
value
);
...
...
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