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 2017/02/01 17:47:36 UTC

couch-index commit: updated refs/heads/COUCHDB-3287-pluggable-storage-engines to 1424c46

Repository: couchdb-couch-index
Updated Branches:
  refs/heads/COUCHDB-3287-pluggable-storage-engines [created] 1424c46c7


Update API for use with pluggable storage engines


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

Branch: refs/heads/COUCHDB-3287-pluggable-storage-engines
Commit: 1424c46c72de0dc71765f92389bccdf7701552ca
Parents: f0a6854
Author: Paul J. Davis <pa...@gmail.com>
Authored: Wed Feb 10 18:14:07 2016 -0600
Committer: Paul J. Davis <pa...@gmail.com>
Committed: Wed Feb 1 10:20:27 2017 -0600

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


http://git-wip-us.apache.org/repos/asf/couchdb-couch-index/blob/1424c46c/src/couch_index_updater.erl
----------------------------------------------------------------------
diff --git a/src/couch_index_updater.erl b/src/couch_index_updater.erl
index ad48f40..bf31460 100644
--- a/src/couch_index_updater.erl
+++ b/src/couch_index_updater.erl
@@ -166,7 +166,7 @@ update(Idx, Mod, IdxState) ->
             end
         end,
 
-        Proc = fun(DocInfo, _, {IdxStateAcc, _}) ->
+        Proc = fun(DocInfo, {IdxStateAcc, _}) ->
             case CommittedOnly and (GetSeq(DocInfo) > DbCommittedSeq) of
                 true ->
                     {stop, {IdxStateAcc, false}};
@@ -180,7 +180,7 @@ update(Idx, Mod, IdxState) ->
 
         {ok, InitIdxState} = Mod:start_update(Idx, PurgedIdxState, NumChanges),
         Acc0 = {InitIdxState, true},
-        {ok, _, Acc} = couch_db:enum_docs_since(Db, CurrSeq, Proc, Acc0, []),
+        {ok, Acc} = couch_db:fold_changes(Db, CurrSeq, Proc, Acc0, []),
         {ProcIdxSt, SendLast} = Acc,
 
         % If we didn't bail due to hitting the last committed seq we need
@@ -198,7 +198,7 @@ update(Idx, Mod, IdxState) ->
 
 
 purge_index(Db, Mod, IdxState) ->
-    DbPurgeSeq = couch_db:get_purge_seq(Db),
+    {ok, DbPurgeSeq} = couch_db:get_purge_seq(Db),
     IdxPurgeSeq = Mod:get(purge_seq, IdxState),
     if
         DbPurgeSeq == IdxPurgeSeq ->