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
ec7e1389
Commit
ec7e1389
authored
Aug 26, 2010
by
antirez
Browse files
test for intset integer encodability test and some small refactoring
parent
23c64fe5
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/redis.h
View file @
ec7e1389
...
@@ -769,6 +769,8 @@ int stringmatch(const char *pattern, const char *string, int nocase);
...
@@ -769,6 +769,8 @@ int stringmatch(const char *pattern, const char *string, int nocase);
long
long
memtoll
(
const
char
*
p
,
int
*
err
);
long
long
memtoll
(
const
char
*
p
,
int
*
err
);
int
ll2string
(
char
*
s
,
size_t
len
,
long
long
value
);
int
ll2string
(
char
*
s
,
size_t
len
,
long
long
value
);
int
isStringRepresentableAsLong
(
sds
s
,
long
*
longval
);
int
isStringRepresentableAsLong
(
sds
s
,
long
*
longval
);
int
isStringRepresentableAsLongLong
(
sds
s
,
long
long
*
longval
);
int
isObjectRepresentableAsLongLong
(
robj
*
o
,
long
long
*
llongval
);
/* Configuration */
/* Configuration */
void
loadServerConfig
(
char
*
filename
);
void
loadServerConfig
(
char
*
filename
);
...
...
src/t_set.c
View file @
ec7e1389
...
@@ -8,7 +8,7 @@
...
@@ -8,7 +8,7 @@
* an integer-encodable value, an intset will be returned. Otherwise a regular
* an integer-encodable value, an intset will be returned. Otherwise a regular
* hash table. */
* hash table. */
robj
*
setTypeCreate
(
robj
*
value
)
{
robj
*
setTypeCreate
(
robj
*
value
)
{
if
(
getLongLongFromObject
(
value
,
NULL
)
==
REDIS_OK
)
if
(
isObjectRepresentableAsLongLong
(
value
,
NULL
)
==
REDIS_OK
)
return
createIntsetObject
();
return
createIntsetObject
();
return
createSetObject
();
return
createSetObject
();
}
}
...
@@ -21,7 +21,7 @@ int setTypeAdd(robj *subject, robj *value) {
...
@@ -21,7 +21,7 @@ int setTypeAdd(robj *subject, robj *value) {
return
1
;
return
1
;
}
}
}
else
if
(
subject
->
encoding
==
REDIS_ENCODING_INTSET
)
{
}
else
if
(
subject
->
encoding
==
REDIS_ENCODING_INTSET
)
{
if
(
getLongLongFromObject
(
value
,
&
llval
)
==
REDIS_OK
)
{
if
(
isObjectRepresentableAsLongLong
(
value
,
&
llval
)
==
REDIS_OK
)
{
uint8_t
success
=
0
;
uint8_t
success
=
0
;
subject
->
ptr
=
intsetAdd
(
subject
->
ptr
,
llval
,
&
success
);
subject
->
ptr
=
intsetAdd
(
subject
->
ptr
,
llval
,
&
success
);
if
(
success
)
{
if
(
success
)
{
...
@@ -55,7 +55,7 @@ int setTypeRemove(robj *subject, robj *value) {
...
@@ -55,7 +55,7 @@ int setTypeRemove(robj *subject, robj *value) {
return
1
;
return
1
;
}
}
}
else
if
(
subject
->
encoding
==
REDIS_ENCODING_INTSET
)
{
}
else
if
(
subject
->
encoding
==
REDIS_ENCODING_INTSET
)
{
if
(
getLongLongFromObject
(
value
,
&
llval
)
==
REDIS_OK
)
{
if
(
isObjectRepresentableAsLongLong
(
value
,
&
llval
)
==
REDIS_OK
)
{
uint8_t
success
;
uint8_t
success
;
subject
->
ptr
=
intsetRemove
(
subject
->
ptr
,
llval
,
&
success
);
subject
->
ptr
=
intsetRemove
(
subject
->
ptr
,
llval
,
&
success
);
if
(
success
)
return
1
;
if
(
success
)
return
1
;
...
@@ -71,7 +71,7 @@ int setTypeIsMember(robj *subject, robj *value) {
...
@@ -71,7 +71,7 @@ int setTypeIsMember(robj *subject, robj *value) {
if
(
subject
->
encoding
==
REDIS_ENCODING_HT
)
{
if
(
subject
->
encoding
==
REDIS_ENCODING_HT
)
{
return
dictFind
((
dict
*
)
subject
->
ptr
,
value
)
!=
NULL
;
return
dictFind
((
dict
*
)
subject
->
ptr
,
value
)
!=
NULL
;
}
else
if
(
subject
->
encoding
==
REDIS_ENCODING_INTSET
)
{
}
else
if
(
subject
->
encoding
==
REDIS_ENCODING_INTSET
)
{
if
(
getLongLongFromObject
(
value
,
&
llval
)
==
REDIS_OK
)
{
if
(
isObjectRepresentableAsLongLong
(
value
,
&
llval
)
==
REDIS_OK
)
{
return
intsetFind
((
intset
*
)
subject
->
ptr
,
llval
);
return
intsetFind
((
intset
*
)
subject
->
ptr
,
llval
);
}
}
}
else
{
}
else
{
...
...
src/util.c
View file @
ec7e1389
...
@@ -200,24 +200,44 @@ int ll2string(char *s, size_t len, long long value) {
...
@@ -200,24 +200,44 @@ int ll2string(char *s, size_t len, long long value) {
return
l
;
return
l
;
}
}
/* Check if the
nul-terminated
string 's' can be represented by a long
/* Check if the
sds
string 's' can be represented by a long
long
* (that is, is a number that fits into long without any other space or
* (that is, is a number that fits into long without any other space or
* character before or after the digits).
* character before or after the digits, so that converting this number
* back to a string will result in the same bytes as the original string).
*
*
* If so, the function returns REDIS_OK and *longval is set to the value
* If so, the function returns REDIS_OK and *
l
longval is set to the value
* of the number. Otherwise REDIS_ERR is returned */
* of the number. Otherwise REDIS_ERR is returned */
int
isStringRepresentableAsLong
(
sds
s
,
long
*
longval
)
{
int
isStringRepresentableAsLong
Long
(
sds
s
,
long
long
*
l
longval
)
{
char
buf
[
32
],
*
endptr
;
char
buf
[
32
],
*
endptr
;
long
value
;
long
long
value
;
int
slen
;
int
slen
;
value
=
strtol
(
s
,
&
endptr
,
10
);
value
=
strtol
l
(
s
,
&
endptr
,
10
);
if
(
endptr
[
0
]
!=
'\0'
)
return
REDIS_ERR
;
if
(
endptr
[
0
]
!=
'\0'
)
return
REDIS_ERR
;
slen
=
ll2string
(
buf
,
32
,
value
);
slen
=
ll2string
(
buf
,
32
,
value
);
/* If the number converted back into a string is not identical
/* If the number converted back into a string is not identical
* then it's not possible to encode the string as integer */
* then it's not possible to encode the string as integer */
if
(
sdslen
(
s
)
!=
(
unsigned
)
slen
||
memcmp
(
buf
,
s
,
slen
))
return
REDIS_ERR
;
if
(
sdslen
(
s
)
!=
(
unsigned
)
slen
||
memcmp
(
buf
,
s
,
slen
))
return
REDIS_ERR
;
if
(
longval
)
*
longval
=
value
;
if
(
llongval
)
*
llongval
=
value
;
return
REDIS_OK
;
}
int
isStringRepresentableAsLong
(
sds
s
,
long
*
longval
)
{
long
long
ll
;
if
(
isStringRepresentableAsLongLong
(
s
,
&
ll
)
==
REDIS_ERR
)
return
REDIS_ERR
;
if
(
ll
<
LONG_MIN
||
ll
>
LONG_MAX
)
return
REDIS_ERR
;
*
longval
=
(
long
)
ll
;
return
REDIS_OK
;
return
REDIS_OK
;
}
}
int
isObjectRepresentableAsLongLong
(
robj
*
o
,
long
long
*
llongval
)
{
redisAssert
(
o
->
type
==
REDIS_STRING
);
if
(
o
->
encoding
==
REDIS_ENCODING_INT
)
{
if
(
llongval
)
*
llongval
=
(
long
)
o
->
ptr
;
return
REDIS_OK
;
}
else
{
return
isStringRepresentableAsLongLong
(
o
->
ptr
,
llongval
);
}
}
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