This is an automated email from the ASF dual-hosted git repository. jan pushed a commit to branch rebase/access-2023 in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit b091807a1fd57986cc8e7c4d2532de0294e2f6bf Author: Jan Lehnardt <[email protected]> AuthorDate: Sun Jun 18 10:51:20 2023 +0200 chore: clean up after renaming commit --- src/couch/src/couch_db.erl | 4 ++-- src/couch/src/couch_db_updater.erl | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/couch/src/couch_db.erl b/src/couch/src/couch_db.erl index a3cc65531..6da5d9925 100644 --- a/src/couch/src/couch_db.erl +++ b/src/couch/src/couch_db.erl @@ -1621,7 +1621,7 @@ write_and_commit( ReplicatedChanges = lists:member(?REPLICATED_CHANGES, Options), MRef = erlang:monitor(process, Pid), try - Pid ! {update_docs, self(), DocBuckets, LocalDocs, MergeConflicts, Ctx}, + Pid ! {update_docs, self(), DocBuckets, LocalDocs, ReplicatedChanges, Ctx}, case collect_results_with_metrics(Pid, MRef, []) of {ok, Results} -> {ok, Results}; @@ -1636,7 +1636,7 @@ write_and_commit( % We only retry once DocBuckets3 = prepare_doc_summaries(Db2, DocBuckets2), close(Db2), - Pid ! {update_docs, self(), DocBuckets3, LocalDocs, MergeConflicts, Ctx}, + Pid ! {update_docs, self(), DocBuckets3, LocalDocs, ReplicatedChanges, Ctx}, case collect_results_with_metrics(Pid, MRef, []) of {ok, Results} -> {ok, Results}; retry -> throw({update_error, compaction_retry}) diff --git a/src/couch/src/couch_db_updater.erl b/src/couch/src/couch_db_updater.erl index cab27cc47..c548435fd 100644 --- a/src/couch/src/couch_db_updater.erl +++ b/src/couch/src/couch_db_updater.erl @@ -170,7 +170,7 @@ handle_cast(Msg, #db{name = Name} = Db) -> {stop, Msg, Db}. handle_info( - {update_docs, Client, GroupedDocs, LocalDocs, MergeConflicts, UserCtx}, + {update_docs, Client, GroupedDocs, LocalDocs, ReplicatedChanges, UserCtx}, Db ) -> GroupedDocs2 = sort_and_tag_grouped_docs(Client, GroupedDocs), @@ -186,7 +186,7 @@ handle_info( Clients = [Client] end, LocalDocs2 = [{Client, NRDoc} || NRDoc <- LocalDocs], - try update_docs_int(Db, GroupedDocs3, LocalDocs2, MergeConflicts, UserCtx) of + try update_docs_int(Db, GroupedDocs3, LocalDocs2, ReplicatedChanges, UserCtx) of {ok, Db2, UpdatedDDocIds} -> ok = couch_server:db_updated(Db2), case {couch_db:get_update_seq(Db), couch_db:get_update_seq(Db2)} of
