[GitHub] kocolosk commented on a change in pull request #958: [WIP] Optimize doc updates

[GitBox <gi...@apache.org>]

kocolosk commented on a change in pull request #958: [WIP] Optimize doc updates
URL: https://github.com/apache/couchdb/pull/958#discussion_r148977428
 
 

 ##########
 File path: src/couch/src/couch_db_updater.erl
 ##########
 @@ -857,17 +864,23 @@ merge_rev_tree(OldInfo, NewDoc, Client, Limit, false) ->
             send_result(Client, NewDoc, conflict),
             OldInfo
     end;
-merge_rev_tree(OldInfo, NewDoc, _Client, Limit, true) ->
+merge_rev_tree(OldInfo, NewDoc, _Client, true) ->
     % We're merging in revisions without caring about
     % conflicts. Most likely this is a replication update.
     OldTree = OldInfo#full_doc_info.rev_tree,
     NewTree0 = couch_doc:to_path(NewDoc),
-    {NewTree, _} = couch_key_tree:merge(OldTree, NewTree0, Limit),
+    {NewTree, _} = couch_key_tree:merge(OldTree, NewTree0),
     OldInfo#full_doc_info{rev_tree = NewTree}.
 
-stem_full_doc_infos(#db{revs_limit=Limit}, DocInfos) ->
-    [Info#full_doc_info{rev_tree=couch_key_tree:stem(Tree, Limit)} ||
-            #full_doc_info{rev_tree=Tree}=Info <- DocInfos].
+stem_full_doc_info(#full_doc_info{rev_tree = Tree} = Info, Limit) ->
+    Stemmed = couch_key_tree:stem(Tree, Limit),
+    Info#full_doc_info{rev_tree = Stemmed}.
+
+full_stem_full_doc_infos(#db{revs_limit=Limit}, DocInfos) ->
 
 Review comment:
   OK so this function is exactly the same as the old `stem_full_doc_infos/2`, just renamed and reformatted. But now it's only used in compaction. Can you explain why the compactor still needs the full-fat version?

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services