You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2014/02/13 16:06:47 UTC
couch commit: updated refs/heads/1994-merge-rcouch to 5cbf25f
Updated Branches:
refs/heads/1994-merge-rcouch 3f5184216 -> 5cbf25fe7
Throw cleaner error on MD5 mismatch during compaction
COUCHDB-2040
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/5cbf25fe
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/5cbf25fe
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/5cbf25fe
Branch: refs/heads/1994-merge-rcouch
Commit: 5cbf25fe7f20b87d2cb7f61339c21bf54c73cb0c
Parents: 3f51842
Author: Robert Newson <rn...@apache.org>
Authored: Wed Jan 29 21:47:58 2014 +0000
Committer: benoitc <bc...@gmail.com>
Committed: Thu Feb 13 16:03:40 2014 +0100
----------------------------------------------------------------------
src/couch_db_updater.erl | 17 +++++++++++------
1 file changed, 11 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/5cbf25fe/src/couch_db_updater.erl
----------------------------------------------------------------------
diff --git a/src/couch_db_updater.erl b/src/couch_db_updater.erl
index af7578e..947669c 100644
--- a/src/couch_db_updater.erl
+++ b/src/couch_db_updater.erl
@@ -824,14 +824,16 @@ copy_doc_attachments(#db{updater_fd = SrcFd} = SrcDb, SrcSp, DestFd) ->
end,
% copy the bin values
NewBinInfos = lists:map(
- fun({Name, Type, BinSp, AttLen, RevPos, Md5}) ->
+ fun({Name, Type, BinSp, AttLen, RevPos, ExpectedMd5}) ->
% 010 UPGRADE CODE
- {NewBinSp, AttLen, AttLen, Md5, _IdentityMd5} =
+ {NewBinSp, AttLen, AttLen, ActualMd5, _IdentityMd5} =
couch_stream:copy_to_new_stream(SrcFd, BinSp, DestFd),
- {Name, Type, NewBinSp, AttLen, AttLen, RevPos, Md5, identity};
- ({Name, Type, BinSp, AttLen, DiskLen, RevPos, Md5, Enc1}) ->
- {NewBinSp, AttLen, _, Md5, _IdentityMd5} =
+ check_md5(ExpectedMd5, ActualMd5),
+ {Name, Type, NewBinSp, AttLen, AttLen, RevPos, ExpectedMd5, identity};
+ ({Name, Type, BinSp, AttLen, DiskLen, RevPos, ExpectedMd5, Enc1}) ->
+ {NewBinSp, AttLen, _, ActualMd5, _IdentityMd5} =
couch_stream:copy_to_new_stream(SrcFd, BinSp, DestFd),
+ check_md5(ExpectedMd5, ActualMd5),
Enc = case Enc1 of
true ->
% 0110 UPGRADE CODE
@@ -842,10 +844,13 @@ copy_doc_attachments(#db{updater_fd = SrcFd} = SrcDb, SrcSp, DestFd) ->
_ ->
Enc1
end,
- {Name, Type, NewBinSp, AttLen, DiskLen, RevPos, Md5, Enc}
+ {Name, Type, NewBinSp, AttLen, DiskLen, RevPos, ExpectedMd5, Enc}
end, BinInfos),
{BodyData, NewBinInfos}.
+check_md5(Md5, Md5) -> ok;
+check_md5(_, _) -> throw(md5_mismatch).
+
copy_docs(Db, #db{updater_fd = DestFd} = NewDb, InfoBySeq0, Retry) ->
% COUCHDB-968, make sure we prune duplicates during compaction
InfoBySeq = lists:usort(fun(#doc_info{id=A}, #doc_info{id=B}) -> A =< B end,