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
97224de7
Commit
97224de7
authored
Apr 17, 2010
by
Pieter Noordhuis
Browse files
strip tryObjectEncoding from hashSet, to enable the arguments being encoded in-place
parent
c651fd9e
Changes
1
Hide whitespace changes
Inline
Side-by-side
redis.c
View file @
97224de7
...
@@ -6068,6 +6068,14 @@ static void hashTryConversion(robj *subject, robj **argv, int start, int end) {
...
@@ -6068,6 +6068,14 @@ static void hashTryConversion(robj *subject, robj **argv, int start, int end) {
}
}
}
}
/* Encode given objects in-place when the hash uses a dict. */
static
void
hashTryObjectEncoding
(
robj
*
subject
,
robj
**
o1
,
robj
**
o2
)
{
if
(
subject
->
encoding
==
REDIS_ENCODING_HT
)
{
*
o1
=
tryObjectEncoding
(
*
o1
);
*
o2
=
tryObjectEncoding
(
*
o2
);
}
}
/* Get the value from a hash identified by key. Returns either a string
/* Get the value from a hash identified by key. Returns either a string
* object or NULL if the value cannot be found. The refcount of the object
* object or NULL if the value cannot be found. The refcount of the object
* is always increased by 1 when the value was found. */
* is always increased by 1 when the value was found. */
...
@@ -6126,7 +6134,6 @@ static int hashSet(robj *o, robj *key, robj *value) {
...
@@ -6126,7 +6134,6 @@ static int hashSet(robj *o, robj *key, robj *value) {
if
(
zipmapLen
(
o
->
ptr
)
>
server
.
hash_max_zipmap_entries
)
if
(
zipmapLen
(
o
->
ptr
)
>
server
.
hash_max_zipmap_entries
)
convertToRealHash
(
o
);
convertToRealHash
(
o
);
}
else
{
}
else
{
value
=
tryObjectEncoding
(
value
);
if
(
dictReplace
(
o
->
ptr
,
key
,
value
))
{
if
(
dictReplace
(
o
->
ptr
,
key
,
value
))
{
/* Insert */
/* Insert */
incrRefCount
(
key
);
incrRefCount
(
key
);
...
@@ -6250,6 +6257,7 @@ static void hsetCommand(redisClient *c) {
...
@@ -6250,6 +6257,7 @@ static void hsetCommand(redisClient *c) {
if
((
o
=
hashLookupWriteOrCreate
(
c
,
c
->
argv
[
1
]))
==
NULL
)
return
;
if
((
o
=
hashLookupWriteOrCreate
(
c
,
c
->
argv
[
1
]))
==
NULL
)
return
;
hashTryConversion
(
o
,
c
->
argv
,
2
,
3
);
hashTryConversion
(
o
,
c
->
argv
,
2
,
3
);
hashTryObjectEncoding
(
o
,
&
c
->
argv
[
2
],
&
c
->
argv
[
3
]);
update
=
hashSet
(
o
,
c
->
argv
[
2
],
c
->
argv
[
3
]);
update
=
hashSet
(
o
,
c
->
argv
[
2
],
c
->
argv
[
3
]);
addReply
(
c
,
update
?
shared
.
czero
:
shared
.
cone
);
addReply
(
c
,
update
?
shared
.
czero
:
shared
.
cone
);
server
.
dirty
++
;
server
.
dirty
++
;
...
@@ -6263,6 +6271,7 @@ static void hsetnxCommand(redisClient *c) {
...
@@ -6263,6 +6271,7 @@ static void hsetnxCommand(redisClient *c) {
if
(
hashExists
(
o
,
c
->
argv
[
2
]))
{
if
(
hashExists
(
o
,
c
->
argv
[
2
]))
{
addReply
(
c
,
shared
.
czero
);
addReply
(
c
,
shared
.
czero
);
}
else
{
}
else
{
hashTryObjectEncoding
(
o
,
&
c
->
argv
[
2
],
&
c
->
argv
[
3
]);
hashSet
(
o
,
c
->
argv
[
2
],
c
->
argv
[
3
]);
hashSet
(
o
,
c
->
argv
[
2
],
c
->
argv
[
3
]);
addReply
(
c
,
shared
.
cone
);
addReply
(
c
,
shared
.
cone
);
server
.
dirty
++
;
server
.
dirty
++
;
...
@@ -6281,6 +6290,7 @@ static void hmsetCommand(redisClient *c) {
...
@@ -6281,6 +6290,7 @@ static void hmsetCommand(redisClient *c) {
if
((
o
=
hashLookupWriteOrCreate
(
c
,
c
->
argv
[
1
]))
==
NULL
)
return
;
if
((
o
=
hashLookupWriteOrCreate
(
c
,
c
->
argv
[
1
]))
==
NULL
)
return
;
hashTryConversion
(
o
,
c
->
argv
,
2
,
c
->
argc
-
1
);
hashTryConversion
(
o
,
c
->
argv
,
2
,
c
->
argc
-
1
);
for
(
i
=
2
;
i
<
c
->
argc
;
i
+=
2
)
{
for
(
i
=
2
;
i
<
c
->
argc
;
i
+=
2
)
{
hashTryObjectEncoding
(
o
,
&
c
->
argv
[
i
],
&
c
->
argv
[
i
+
1
]);
hashSet
(
o
,
c
->
argv
[
i
],
c
->
argv
[
i
+
1
]);
hashSet
(
o
,
c
->
argv
[
i
],
c
->
argv
[
i
+
1
]);
}
}
addReply
(
c
,
shared
.
ok
);
addReply
(
c
,
shared
.
ok
);
...
...
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