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
cb72d0f1
Commit
cb72d0f1
authored
Aug 21, 2010
by
Pieter Noordhuis
Browse files
Rename iterator to setTypeIterator for consistency
parent
029e5577
Changes
4
Show whitespace changes
Inline
Side-by-side
src/debug.c
View file @
cb72d0f1
...
@@ -119,7 +119,7 @@ void computeDatasetDigest(unsigned char *final) {
...
@@ -119,7 +119,7 @@ void computeDatasetDigest(unsigned char *final) {
}
}
listTypeReleaseIterator
(
li
);
listTypeReleaseIterator
(
li
);
}
else
if
(
o
->
type
==
REDIS_SET
)
{
}
else
if
(
o
->
type
==
REDIS_SET
)
{
setIterator
*
si
=
setTypeInitIterator
(
o
);
set
Type
Iterator
*
si
=
setTypeInitIterator
(
o
);
robj
*
ele
;
robj
*
ele
;
while
((
ele
=
setTypeNext
(
si
))
!=
NULL
)
{
while
((
ele
=
setTypeNext
(
si
))
!=
NULL
)
{
xorObjectDigest
(
digest
,
ele
);
xorObjectDigest
(
digest
,
ele
);
...
...
src/redis.h
View file @
cb72d0f1
...
@@ -545,7 +545,7 @@ typedef struct {
...
@@ -545,7 +545,7 @@ typedef struct {
int
encoding
;
int
encoding
;
int
ii
;
/* intset iterator */
int
ii
;
/* intset iterator */
dictIterator
*
di
;
dictIterator
*
di
;
}
setIterator
;
}
set
Type
Iterator
;
/* Structure to hold hash iteration abstration. Note that iteration over
/* Structure to hold hash iteration abstration. Note that iteration over
* hashes involves both fields and values. Because it is possible that
* hashes involves both fields and values. Because it is possible that
...
@@ -734,9 +734,9 @@ robj *setTypeCreate(robj *value);
...
@@ -734,9 +734,9 @@ robj *setTypeCreate(robj *value);
int
setTypeAdd
(
robj
*
subject
,
robj
*
value
);
int
setTypeAdd
(
robj
*
subject
,
robj
*
value
);
int
setTypeRemove
(
robj
*
subject
,
robj
*
value
);
int
setTypeRemove
(
robj
*
subject
,
robj
*
value
);
int
setTypeIsMember
(
robj
*
subject
,
robj
*
value
);
int
setTypeIsMember
(
robj
*
subject
,
robj
*
value
);
setIterator
*
setTypeInitIterator
(
robj
*
subject
);
set
Type
Iterator
*
setTypeInitIterator
(
robj
*
subject
);
void
setTypeReleaseIterator
(
setIterator
*
si
);
void
setTypeReleaseIterator
(
set
Type
Iterator
*
si
);
robj
*
setTypeNext
(
setIterator
*
si
);
robj
*
setTypeNext
(
set
Type
Iterator
*
si
);
robj
*
setTypeRandomElement
(
robj
*
subject
);
robj
*
setTypeRandomElement
(
robj
*
subject
);
unsigned
long
setTypeSize
(
robj
*
subject
);
unsigned
long
setTypeSize
(
robj
*
subject
);
void
setTypeConvert
(
robj
*
subject
,
int
enc
);
void
setTypeConvert
(
robj
*
subject
,
int
enc
);
...
...
src/sort.c
View file @
cb72d0f1
...
@@ -220,7 +220,7 @@ void sortCommand(redisClient *c) {
...
@@ -220,7 +220,7 @@ void sortCommand(redisClient *c) {
}
}
listTypeReleaseIterator
(
li
);
listTypeReleaseIterator
(
li
);
}
else
if
(
sortval
->
type
==
REDIS_SET
)
{
}
else
if
(
sortval
->
type
==
REDIS_SET
)
{
setIterator
*
si
=
setTypeInitIterator
(
sortval
);
set
Type
Iterator
*
si
=
setTypeInitIterator
(
sortval
);
robj
*
ele
;
robj
*
ele
;
while
((
ele
=
setTypeNext
(
si
))
!=
NULL
)
{
while
((
ele
=
setTypeNext
(
si
))
!=
NULL
)
{
vector
[
j
].
obj
=
ele
;
vector
[
j
].
obj
=
ele
;
...
...
src/t_set.c
View file @
cb72d0f1
...
@@ -80,8 +80,8 @@ int setTypeIsMember(robj *subject, robj *value) {
...
@@ -80,8 +80,8 @@ int setTypeIsMember(robj *subject, robj *value) {
return
0
;
return
0
;
}
}
setIterator
*
setTypeInitIterator
(
robj
*
subject
)
{
set
Type
Iterator
*
setTypeInitIterator
(
robj
*
subject
)
{
setIterator
*
si
=
zmalloc
(
sizeof
(
setIterator
));
set
Type
Iterator
*
si
=
zmalloc
(
sizeof
(
setIterator
));
si
->
subject
=
subject
;
si
->
subject
=
subject
;
si
->
encoding
=
subject
->
encoding
;
si
->
encoding
=
subject
->
encoding
;
if
(
si
->
encoding
==
REDIS_ENCODING_HT
)
{
if
(
si
->
encoding
==
REDIS_ENCODING_HT
)
{
...
@@ -94,7 +94,7 @@ setIterator *setTypeInitIterator(robj *subject) {
...
@@ -94,7 +94,7 @@ setIterator *setTypeInitIterator(robj *subject) {
return
si
;
return
si
;
}
}
void
setTypeReleaseIterator
(
setIterator
*
si
)
{
void
setTypeReleaseIterator
(
set
Type
Iterator
*
si
)
{
if
(
si
->
encoding
==
REDIS_ENCODING_HT
)
if
(
si
->
encoding
==
REDIS_ENCODING_HT
)
dictReleaseIterator
(
si
->
di
);
dictReleaseIterator
(
si
->
di
);
zfree
(
si
);
zfree
(
si
);
...
@@ -103,7 +103,7 @@ void setTypeReleaseIterator(setIterator *si) {
...
@@ -103,7 +103,7 @@ void setTypeReleaseIterator(setIterator *si) {
/* Move to the next entry in the set. Returns the object at the current
/* Move to the next entry in the set. Returns the object at the current
* position, or NULL when the end is reached. This object will have its
* position, or NULL when the end is reached. This object will have its
* refcount incremented, so the caller needs to take care of this. */
* refcount incremented, so the caller needs to take care of this. */
robj
*
setTypeNext
(
setIterator
*
si
)
{
robj
*
setTypeNext
(
set
Type
Iterator
*
si
)
{
robj
*
ret
=
NULL
;
robj
*
ret
=
NULL
;
if
(
si
->
encoding
==
REDIS_ENCODING_HT
)
{
if
(
si
->
encoding
==
REDIS_ENCODING_HT
)
{
dictEntry
*
de
=
dictNext
(
si
->
di
);
dictEntry
*
de
=
dictNext
(
si
->
di
);
...
@@ -151,7 +151,7 @@ unsigned long setTypeSize(robj *subject) {
...
@@ -151,7 +151,7 @@ unsigned long setTypeSize(robj *subject) {
* to a hashtable) is presized to hold the number of elements in the original
* to a hashtable) is presized to hold the number of elements in the original
* set. */
* set. */
void
setTypeConvert
(
robj
*
subject
,
int
enc
)
{
void
setTypeConvert
(
robj
*
subject
,
int
enc
)
{
setIterator
*
si
;
set
Type
Iterator
*
si
;
robj
*
element
;
robj
*
element
;
redisAssert
(
subject
->
type
==
REDIS_SET
);
redisAssert
(
subject
->
type
==
REDIS_SET
);
...
@@ -319,7 +319,7 @@ int qsortCompareSetsByCardinality(const void *s1, const void *s2) {
...
@@ -319,7 +319,7 @@ int qsortCompareSetsByCardinality(const void *s1, const void *s2) {
void
sinterGenericCommand
(
redisClient
*
c
,
robj
**
setkeys
,
unsigned
long
setnum
,
robj
*
dstkey
)
{
void
sinterGenericCommand
(
redisClient
*
c
,
robj
**
setkeys
,
unsigned
long
setnum
,
robj
*
dstkey
)
{
robj
**
sets
=
zmalloc
(
sizeof
(
robj
*
)
*
setnum
);
robj
**
sets
=
zmalloc
(
sizeof
(
robj
*
)
*
setnum
);
setIterator
*
si
;
set
Type
Iterator
*
si
;
robj
*
ele
,
*
lenobj
=
NULL
,
*
dstset
=
NULL
;
robj
*
ele
,
*
lenobj
=
NULL
,
*
dstset
=
NULL
;
unsigned
long
j
,
cardinality
=
0
;
unsigned
long
j
,
cardinality
=
0
;
...
@@ -419,7 +419,7 @@ void sinterstoreCommand(redisClient *c) {
...
@@ -419,7 +419,7 @@ void sinterstoreCommand(redisClient *c) {
void
sunionDiffGenericCommand
(
redisClient
*
c
,
robj
**
setkeys
,
int
setnum
,
robj
*
dstkey
,
int
op
)
{
void
sunionDiffGenericCommand
(
redisClient
*
c
,
robj
**
setkeys
,
int
setnum
,
robj
*
dstkey
,
int
op
)
{
robj
**
sets
=
zmalloc
(
sizeof
(
robj
*
)
*
setnum
);
robj
**
sets
=
zmalloc
(
sizeof
(
robj
*
)
*
setnum
);
setIterator
*
si
;
set
Type
Iterator
*
si
;
robj
*
ele
,
*
dstset
=
NULL
;
robj
*
ele
,
*
dstset
=
NULL
;
int
j
,
cardinality
=
0
;
int
j
,
cardinality
=
0
;
...
...
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