couchdb-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dav...@apache.org
Subject couch commit: updated refs/heads/windsor-merge to 71335c8
Date Thu, 07 Aug 2014 16:53:22 GMT
Repository: couchdb-couch
Updated Branches:
  refs/heads/windsor-merge 6e60cbe88 -> 71335c8d5


[WIP] Use couch_doc:to_path/1 correctly


Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch/commit/71335c8d
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch/tree/71335c8d
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch/diff/71335c8d

Branch: refs/heads/windsor-merge
Commit: 71335c8d5cc23f06353737d816285fc00c5e641c
Parents: 6e60cbe
Author: Paul J. Davis <paul.joseph.davis@gmail.com>
Authored: Thu Aug 7 11:52:45 2014 -0500
Committer: Paul J. Davis <paul.joseph.davis@gmail.com>
Committed: Thu Aug 7 11:52:45 2014 -0500

----------------------------------------------------------------------
 src/couch_db_updater.erl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/couchdb-couch/blob/71335c8d/src/couch_db_updater.erl
----------------------------------------------------------------------
diff --git a/src/couch_db_updater.erl b/src/couch_db_updater.erl
index 4a04833..504c21e 100644
--- a/src/couch_db_updater.erl
+++ b/src/couch_db_updater.erl
@@ -690,7 +690,7 @@ merge_rev_tree(OldInfo, NewDoc, Client, Limit, false)
 
             % Merge our modified new doc into the tree
             #full_doc_info{rev_tree=OldTree} = OldInfo,
-            NewTree0 = couch_db:doc_to_tree(NewDoc2),
+            NewTree0 = couch_doc:to_path(NewDoc2),
             case couch_key_tree:merge(OldTree, NewTree0, Limit) of
                 {NewTree1, new_leaf} ->
                     % We changed the revision id so inform the caller
@@ -712,7 +712,7 @@ merge_rev_tree(OldInfo, NewDoc, Client, Limit, false) ->
     % that the merge results in extending a branch.
 
     OldTree = OldInfo#full_doc_info.rev_tree,
-    NewTree0 = couch_db:doc_to_tree(NewDoc),
+    NewTree0 = couch_doc:to_path(NewDoc),
     NewDeleted = NewDoc#doc.deleted,
     case couch_key_tree:merge(OldTree, NewTree0, Limit) of
         {NewTree, new_leaf} when not NewDeleted ->
@@ -736,7 +736,7 @@ merge_rev_tree(OldInfo, NewDoc, _Client, Limit, 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_db:doc_to_tree(NewDoc),
+    NewTree0 = couch_doc:to_path(NewDoc),
     {NewTree, _} = couch_key_tree:merge(OldTree, NewTree0, Limit),
     OldInfo#full_doc_info{rev_tree = NewTree}.
 


Mime
View raw message