You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2014/08/28 14:11:59 UTC
[23/50] couch commit: updated refs/heads/master to 9d0ac7d
Add doc ID for last merged key tree to proc dict
This is for debugging purposes, ie. for operators to get the ID of a
heavily conflicted document which is taking a lot of time to merge.
BugzID: 28940
Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/62f41e1e
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/62f41e1e
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/62f41e1e
Branch: refs/heads/master
Commit: 62f41e1edd95b145368a4b1043bd110da502673a
Parents: 3d58af9
Author: Benjamin Bastian <be...@gmail.com>
Authored: Mon Mar 10 10:29:36 2014 -0400
Committer: Robert Newson <rn...@apache.org>
Committed: Thu Aug 28 13:00:01 2014 +0100
----------------------------------------------------------------------
src/couch_db_updater.erl | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/62f41e1e/src/couch_db_updater.erl
----------------------------------------------------------------------
diff --git a/src/couch_db_updater.erl b/src/couch_db_updater.erl
index 88fa3b3..504c21e 100644
--- a/src/couch_db_updater.erl
+++ b/src/couch_db_updater.erl
@@ -629,6 +629,7 @@ merge_rev_trees(_Limit, _Merge, [], [], AccNewInfos, AccRemoveSeqs, AccSeq) ->
{ok, lists:reverse(AccNewInfos), AccRemoveSeqs, AccSeq};
merge_rev_trees(Limit, MergeConflicts, [NewDocs|RestDocsList],
[OldDocInfo|RestOldInfo], AccNewInfos, AccRemoveSeqs, AccSeq) ->
+ erlang:put(last_id_merged, OldDocInfo#full_doc_info.id), % for debugging
NewDocInfo0 = lists:foldl(fun({Client, NewDoc}, OldInfoAcc) ->
merge_rev_tree(OldInfoAcc, NewDoc, Client, Limit, MergeConflicts)
end, OldDocInfo, NewDocs),