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
7df9b141
Commit
7df9b141
authored
Dec 12, 2011
by
antirez
Browse files
Sorted Set type AOF rewrite using variadic ZADD.
parent
8d875ccb
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/aof.c
View file @
7df9b141
...
@@ -526,6 +526,75 @@ int rewriteSetObject(rio *r, robj *key, robj *o) {
...
@@ -526,6 +526,75 @@ int rewriteSetObject(rio *r, robj *key, robj *o) {
return
1
;
return
1
;
}
}
/* Emit the commands needed to rebuild a sorted set object.
* The function returns 0 on error, 1 on success. */
int
rewriteSortedSetObject
(
rio
*
r
,
robj
*
key
,
robj
*
o
)
{
long
long
count
=
0
,
items
=
zsetLength
(
o
);
if
(
o
->
encoding
==
REDIS_ENCODING_ZIPLIST
)
{
unsigned
char
*
zl
=
o
->
ptr
;
unsigned
char
*
eptr
,
*
sptr
;
unsigned
char
*
vstr
;
unsigned
int
vlen
;
long
long
vll
;
double
score
;
eptr
=
ziplistIndex
(
zl
,
0
);
redisAssert
(
eptr
!=
NULL
);
sptr
=
ziplistNext
(
zl
,
eptr
);
redisAssert
(
sptr
!=
NULL
);
while
(
eptr
!=
NULL
)
{
redisAssert
(
ziplistGet
(
eptr
,
&
vstr
,
&
vlen
,
&
vll
));
score
=
zzlGetScore
(
sptr
);
if
(
count
==
0
)
{
int
cmd_items
=
(
items
>
REDIS_AOFREWRITE_ITEMS_PER_CMD
)
?
REDIS_AOFREWRITE_ITEMS_PER_CMD
:
items
;
if
(
rioWriteBulkCount
(
r
,
'*'
,
2
+
cmd_items
*
2
)
==
0
)
return
0
;
if
(
rioWriteBulkString
(
r
,
"ZADD"
,
4
)
==
0
)
return
0
;
if
(
rioWriteBulkObject
(
r
,
key
)
==
0
)
return
0
;
}
if
(
rioWriteBulkDouble
(
r
,
score
)
==
0
)
return
0
;
if
(
vstr
!=
NULL
)
{
if
(
rioWriteBulkString
(
r
,(
char
*
)
vstr
,
vlen
)
==
0
)
return
0
;
}
else
{
if
(
rioWriteBulkLongLong
(
r
,
vll
)
==
0
)
return
0
;
}
zzlNext
(
zl
,
&
eptr
,
&
sptr
);
if
(
++
count
==
REDIS_AOFREWRITE_ITEMS_PER_CMD
)
count
=
0
;
items
--
;
}
}
else
if
(
o
->
encoding
==
REDIS_ENCODING_SKIPLIST
)
{
zset
*
zs
=
o
->
ptr
;
dictIterator
*
di
=
dictGetIterator
(
zs
->
dict
);
dictEntry
*
de
;
while
((
de
=
dictNext
(
di
))
!=
NULL
)
{
robj
*
eleobj
=
dictGetKey
(
de
);
double
*
score
=
dictGetVal
(
de
);
if
(
count
==
0
)
{
int
cmd_items
=
(
items
>
REDIS_AOFREWRITE_ITEMS_PER_CMD
)
?
REDIS_AOFREWRITE_ITEMS_PER_CMD
:
items
;
if
(
rioWriteBulkCount
(
r
,
'*'
,
2
+
cmd_items
*
2
)
==
0
)
return
0
;
if
(
rioWriteBulkString
(
r
,
"ZADD"
,
4
)
==
0
)
return
0
;
if
(
rioWriteBulkObject
(
r
,
key
)
==
0
)
return
0
;
}
if
(
rioWriteBulkDouble
(
r
,
*
score
)
==
0
)
return
0
;
if
(
rioWriteBulkObject
(
r
,
eleobj
)
==
0
)
return
0
;
if
(
++
count
==
REDIS_AOFREWRITE_ITEMS_PER_CMD
)
count
=
0
;
items
--
;
}
dictReleaseIterator
(
di
);
}
else
{
redisPanic
(
"Unknown sorted zset encoding"
);
}
return
1
;
}
/* Write a sequence of commands able to fully rebuild the dataset into
/* Write a sequence of commands able to fully rebuild the dataset into
* "filename". Used both by REWRITEAOF and BGREWRITEAOF.
* "filename". Used both by REWRITEAOF and BGREWRITEAOF.
*
*
...
@@ -592,56 +661,7 @@ int rewriteAppendOnlyFile(char *filename) {
...
@@ -592,56 +661,7 @@ int rewriteAppendOnlyFile(char *filename) {
}
else
if
(
o
->
type
==
REDIS_SET
)
{
}
else
if
(
o
->
type
==
REDIS_SET
)
{
if
(
rewriteSetObject
(
&
aof
,
&
key
,
o
)
==
0
)
goto
werr
;
if
(
rewriteSetObject
(
&
aof
,
&
key
,
o
)
==
0
)
goto
werr
;
}
else
if
(
o
->
type
==
REDIS_ZSET
)
{
}
else
if
(
o
->
type
==
REDIS_ZSET
)
{
/* Emit the ZADDs needed to rebuild the sorted set */
if
(
rewriteSortedSetObject
(
&
aof
,
&
key
,
o
)
==
0
)
goto
werr
;
char
cmd
[]
=
"*4
\r\n
$4
\r\n
ZADD
\r\n
"
;
if
(
o
->
encoding
==
REDIS_ENCODING_ZIPLIST
)
{
unsigned
char
*
zl
=
o
->
ptr
;
unsigned
char
*
eptr
,
*
sptr
;
unsigned
char
*
vstr
;
unsigned
int
vlen
;
long
long
vll
;
double
score
;
eptr
=
ziplistIndex
(
zl
,
0
);
redisAssert
(
eptr
!=
NULL
);
sptr
=
ziplistNext
(
zl
,
eptr
);
redisAssert
(
sptr
!=
NULL
);
while
(
eptr
!=
NULL
)
{
redisAssert
(
ziplistGet
(
eptr
,
&
vstr
,
&
vlen
,
&
vll
));
score
=
zzlGetScore
(
sptr
);
if
(
rioWrite
(
&
aof
,
cmd
,
sizeof
(
cmd
)
-
1
)
==
0
)
goto
werr
;
if
(
rioWriteBulkObject
(
&
aof
,
&
key
)
==
0
)
goto
werr
;
if
(
rioWriteBulkDouble
(
&
aof
,
score
)
==
0
)
goto
werr
;
if
(
vstr
!=
NULL
)
{
if
(
rioWriteBulkString
(
&
aof
,(
char
*
)
vstr
,
vlen
)
==
0
)
goto
werr
;
}
else
{
if
(
rioWriteBulkLongLong
(
&
aof
,
vll
)
==
0
)
goto
werr
;
}
zzlNext
(
zl
,
&
eptr
,
&
sptr
);
}
}
else
if
(
o
->
encoding
==
REDIS_ENCODING_SKIPLIST
)
{
zset
*
zs
=
o
->
ptr
;
dictIterator
*
di
=
dictGetIterator
(
zs
->
dict
);
dictEntry
*
de
;
while
((
de
=
dictNext
(
di
))
!=
NULL
)
{
robj
*
eleobj
=
dictGetKey
(
de
);
double
*
score
=
dictGetVal
(
de
);
if
(
rioWrite
(
&
aof
,
cmd
,
sizeof
(
cmd
)
-
1
)
==
0
)
goto
werr
;
if
(
rioWriteBulkObject
(
&
aof
,
&
key
)
==
0
)
goto
werr
;
if
(
rioWriteBulkDouble
(
&
aof
,
*
score
)
==
0
)
goto
werr
;
if
(
rioWriteBulkObject
(
&
aof
,
eleobj
)
==
0
)
goto
werr
;
}
dictReleaseIterator
(
di
);
}
else
{
redisPanic
(
"Unknown sorted set encoding"
);
}
}
else
if
(
o
->
type
==
REDIS_HASH
)
{
}
else
if
(
o
->
type
==
REDIS_HASH
)
{
char
cmd
[]
=
"*4
\r\n
$4
\r\n
HSET
\r\n
"
;
char
cmd
[]
=
"*4
\r\n
$4
\r\n
HSET
\r\n
"
;
...
...
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