[couchdb] branch fix-pse-fold-local-docs updated (ec6a89d -> 20d764f)

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davisp pushed a change to branch fix-pse-fold-local-docs
in repository https://gitbox.apache.org/repos/asf/couchdb.git.


    omit ec6a89d  Merge branch 'master' into fix-pse-fold-local-docs
    omit 19f3fa5  Merge branch 'master' into fix-pse-fold-local-docs
    omit a94be90  This fixes couch_bt_engine:fold_local_docs/4
     new 20d764f  This fixes couch_bt_engine:fold_local_docs/4

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (ec6a89d)
            \
             N -- N -- N   refs/heads/fix-pse-fold-local-docs (20d764f)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:

-- 
To stop receiving notification emails like this one, please contact
davisp@apache.org.

[couchdb] 01/01: This fixes couch_bt_engine:fold_local_docs/4

[da...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

davisp pushed a commit to branch fix-pse-fold-local-docs
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 20d764f5c42f32ef789f4ce6502975a754ee8e66
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Sat Mar 3 15:32:19 2018 -0600

    This fixes couch_bt_engine:fold_local_docs/4
    
    Somehow managed to fix without getting it into the PSE PR that was
    merged the other day.
---
 src/couch/src/couch_bt_engine.erl | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/couch/src/couch_bt_engine.erl b/src/couch/src/couch_bt_engine.erl
index 347c931..9406897 100644
--- a/src/couch/src/couch_bt_engine.erl
+++ b/src/couch/src/couch_bt_engine.erl
@@ -464,7 +464,10 @@ fold_docs(St, UserFun, UserAcc, Options) ->
 
 
 fold_local_docs(St, UserFun, UserAcc, Options) ->
-    fold_docs_int(St, St#st.local_tree, UserFun, UserAcc, Options).
+    case fold_docs_int(St, St#st.local_tree, UserFun, UserAcc, Options) of
+        {ok, _Reds, FinalAcc} -> {ok, null, FinalAcc};
+        {ok, FinalAcc} -> {ok, FinalAcc}
+    end.
 
 
 fold_changes(St, SinceSeq, UserFun, UserAcc, Options) ->

-- 
To stop receiving notification emails like this one, please contact
davisp@apache.org.