You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by da...@apache.org on 2018/03/26 20:56:04 UTC

[couchdb] 33/33: Update index/mrview

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

davisp pushed a commit to branch COUCHDB-3326-clustered-purge-davisp-refactor
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 11eaffb3caa67562167b083f5864e342d54e6fb5
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Mon Mar 26 15:34:27 2018 -0500

    Update index/mrview
---
 src/couch_index/src/couch_index_updater.erl             | 3 +--
 src/couch_mrview/test/couch_mrview_purge_docs_tests.erl | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/couch_index/src/couch_index_updater.erl b/src/couch_index/src/couch_index_updater.erl
index 14f2c08..4856c1d 100644
--- a/src/couch_index/src/couch_index_updater.erl
+++ b/src/couch_index/src/couch_index_updater.erl
@@ -216,8 +216,7 @@ purge_index(Db, Mod, IdxState) ->
             {ok, IdxState};
         true ->
             FoldFun = fun({PurgeSeq, _UUId, Id, Revs}, Acc) ->
-                {ok, StateAcc} = Mod:purge(Db, PurgeSeq, [{Id, Revs}], Acc),
-                StateAcc
+                Mod:purge(Db, PurgeSeq, [{Id, Revs}], Acc)
             end,
             {ok, NewStateAcc} = couch_db:fold_purge_infos(
                 Db,
diff --git a/src/couch_mrview/test/couch_mrview_purge_docs_tests.erl b/src/couch_mrview/test/couch_mrview_purge_docs_tests.erl
index b4af2c5..643789c 100644
--- a/src/couch_mrview/test/couch_mrview_purge_docs_tests.erl
+++ b/src/couch_mrview/test/couch_mrview_purge_docs_tests.erl
@@ -264,7 +264,7 @@ is_compaction_running(DbName) ->
     couch_util:get_value(compact_running, DbInfo).
 
 fold_fun({_PSeq, _UUID, Id, Revs}, Acc) ->
-    [{Id, Revs} | Acc].
+    {ok, [{Id, Revs} | Acc]}.
 
 docid(I) ->
     list_to_binary(integer_to_list(I)).

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