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
2767f1c0
"tests/vscode:/vscode.git/clone" did not exist on "3d3e350b128afcb1e1f1865f7dc2423b2e6f4372"
Commit
2767f1c0
authored
Jul 02, 2010
by
Pieter Noordhuis
Browse files
fix aof and digest code to work with dual set encoding
parent
96ffb2fe
Changes
2
Show whitespace changes
Inline
Side-by-side
src/aof.c
View file @
2767f1c0
...
@@ -461,20 +461,30 @@ int rewriteAppendOnlyFile(char *filename) {
...
@@ -461,20 +461,30 @@ int rewriteAppendOnlyFile(char *filename) {
redisPanic
(
"Unknown list encoding"
);
redisPanic
(
"Unknown list encoding"
);
}
}
}
else
if
(
o
->
type
==
REDIS_SET
)
{
}
else
if
(
o
->
type
==
REDIS_SET
)
{
char
cmd
[]
=
"*3
\r\n
$4
\r\n
SADD
\r\n
"
;
/* Emit the SADDs needed to rebuild the set */
/* Emit the SADDs needed to rebuild the set */
dict
*
set
=
o
->
ptr
;
if
(
o
->
encoding
==
REDIS_ENCODING_INTSET
)
{
dictIterator
*
di
=
dictGetIterator
(
set
);
int
ii
=
0
;
long
long
llval
;
while
(
intsetGet
(
o
->
ptr
,
ii
++
,
&
llval
))
{
if
(
fwrite
(
cmd
,
sizeof
(
cmd
)
-
1
,
1
,
fp
)
==
0
)
goto
werr
;
if
(
fwriteBulkObject
(
fp
,
&
key
)
==
0
)
goto
werr
;
if
(
fwriteBulkLongLong
(
fp
,
llval
)
==
0
)
goto
werr
;
}
}
else
if
(
o
->
encoding
==
REDIS_ENCODING_HT
)
{
dictIterator
*
di
=
dictGetIterator
(
o
->
ptr
);
dictEntry
*
de
;
dictEntry
*
de
;
while
((
de
=
dictNext
(
di
))
!=
NULL
)
{
while
((
de
=
dictNext
(
di
))
!=
NULL
)
{
char
cmd
[]
=
"*3
\r\n
$4
\r\n
SADD
\r\n
"
;
robj
*
eleobj
=
dictGetEntryKey
(
de
);
robj
*
eleobj
=
dictGetEntryKey
(
de
);
if
(
fwrite
(
cmd
,
sizeof
(
cmd
)
-
1
,
1
,
fp
)
==
0
)
goto
werr
;
if
(
fwrite
(
cmd
,
sizeof
(
cmd
)
-
1
,
1
,
fp
)
==
0
)
goto
werr
;
if
(
fwriteBulkObject
(
fp
,
&
key
)
==
0
)
goto
werr
;
if
(
fwriteBulkObject
(
fp
,
&
key
)
==
0
)
goto
werr
;
if
(
fwriteBulkObject
(
fp
,
eleobj
)
==
0
)
goto
werr
;
if
(
fwriteBulkObject
(
fp
,
eleobj
)
==
0
)
goto
werr
;
}
}
dictReleaseIterator
(
di
);
dictReleaseIterator
(
di
);
}
else
{
redisPanic
(
"Unknown set encoding"
);
}
}
else
if
(
o
->
type
==
REDIS_ZSET
)
{
}
else
if
(
o
->
type
==
REDIS_ZSET
)
{
/* Emit the ZADDs needed to rebuild the sorted set */
/* Emit the ZADDs needed to rebuild the sorted set */
zset
*
zs
=
o
->
ptr
;
zset
*
zs
=
o
->
ptr
;
...
...
src/debug.c
View file @
2767f1c0
...
@@ -119,16 +119,13 @@ void computeDatasetDigest(unsigned char *final) {
...
@@ -119,16 +119,13 @@ void computeDatasetDigest(unsigned char *final) {
}
}
listTypeReleaseIterator
(
li
);
listTypeReleaseIterator
(
li
);
}
else
if
(
o
->
type
==
REDIS_SET
)
{
}
else
if
(
o
->
type
==
REDIS_SET
)
{
dict
*
set
=
o
->
ptr
;
setIterator
*
si
=
setTypeInitIterator
(
o
);
dictIterator
*
di
=
dictGetIterator
(
set
);
robj
*
ele
;
dictEntry
*
de
;
while
((
ele
=
setTypeNext
(
si
))
!=
NULL
)
{
xorObjectDigest
(
digest
,
ele
);
while
((
de
=
dictNext
(
di
))
!=
NULL
)
{
decrRefCount
(
ele
);
robj
*
eleobj
=
dictGetEntryKey
(
de
);
xorObjectDigest
(
digest
,
eleobj
);
}
}
dict
ReleaseIterator
(
d
i
);
setType
ReleaseIterator
(
s
i
);
}
else
if
(
o
->
type
==
REDIS_ZSET
)
{
}
else
if
(
o
->
type
==
REDIS_ZSET
)
{
zset
*
zs
=
o
->
ptr
;
zset
*
zs
=
o
->
ptr
;
dictIterator
*
di
=
dictGetIterator
(
zs
->
dict
);
dictIterator
*
di
=
dictGetIterator
(
zs
->
dict
);
...
...
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