This is an automated email from the ASF dual-hosted git repository. nickva pushed a commit to branch purge-deleted-flag in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 037989f009cbb23400ca3138bceaa1db29f1a068 Author: Nick Vatamaniuc <[email protected]> AuthorDate: Tue Nov 3 13:59:27 2026 -0500 Recompute deleted flag properly after purging When purging a live revision and there is another deleted one, the deleted one should become the new winning revision and it should be reflected in the document stats (deleted doc count +1 and doc count -1). This was not happening before since we forgot to recompute the `deleted` FDI flag based on the latest rev tree. Make sure to also repair existing FDIs on compaction so users don't have to anything except recompact. Fix: #6199 --- src/chttpd/test/eunit/chttpd_purge_tests.erl | 34 +++++++++ src/couch/src/couch_bt_engine_compactor.erl | 4 ++ src/couch/src/couch_db_updater.erl | 3 +- src/couch_pse_tests/src/cpse_test_purge_docs.erl | 89 ++++++++++++++++++++++++ 4 files changed, 129 insertions(+), 1 deletion(-) diff --git a/src/chttpd/test/eunit/chttpd_purge_tests.erl b/src/chttpd/test/eunit/chttpd_purge_tests.erl index 3b91571ee..65fc99a28 100644 --- a/src/chttpd/test/eunit/chttpd_purge_tests.erl +++ b/src/chttpd/test/eunit/chttpd_purge_tests.erl @@ -51,6 +51,7 @@ purge_test_() -> ?TDEF_FE(t_ok_purge_request), ?TDEF_FE(t_accepted_purge_request), ?TDEF_FE(t_partial_purge_request), + ?TDEF_FE(t_purge_winning_with_a_deleted_remaining), ?TDEF_FE(t_mixed_purge_request), ?TDEF_FE(t_over_many_ids_or_revs_purge_request), ?TDEF_FE(t_purged_infos_limit_only_get_put_allowed), @@ -111,6 +112,39 @@ t_partial_purge_request(DbUrl) -> ?assertEqual(<<"updated">>, Content), ?assert(Status2 =:= 200). +t_purge_winning_with_a_deleted_remaining(DbUrl) -> + % a---b : live + % \__c : deleted + % + % If we purge the live 2-b version, expect doc count to drop and deleted + % doc count to increase (since 2-c is now the winning rev and it's + % deleted). + Docs = #{ + ~"new_edits" => false, + ~"docs" => [ + #{ + ~"_id" => ~"doc", + ~"_revisions" => #{~"start" => 2, ~"ids" => [~"b", ~"a"]}, + ~"v" => 1 + }, + #{ + ~"_id" => ~"doc", + ~"_deleted" => true, + ~"_revisions" => #{~"start" => 2, ~"ids" => [~"c", ~"a"]} + } + ] + }, + {201, _} = req(post, url(DbUrl, "_bulk_docs"), Docs), + ?assertMatch({200, #{~"doc_count" := 1, ~"doc_del_count" := 0}}, req(get, DbUrl)), + {Status, _} = req(post, url(DbUrl, "_purge"), #{~"doc" => [~"2-b"]}), + ?assert(Status =:= 201 orelse Status =:= 202), + ?assertMatch({404, #{~"reason" := ~"deleted"}}, req(get, url(DbUrl, "doc"))), + ?assertMatch({200, #{~"doc_count" := 0, ~"doc_del_count" := 1}}, req(get, DbUrl)), + ?assertMatch({200, #{~"total_rows" := 0, ~"rows" := []}}, req(get, url(DbUrl, "_all_docs"))), + % can re-create a doc (note: we magically re-graft it on a previous deleted rev, so rev will be 3) + ?assertMatch({201, #{~"rev" := <<"3-", _/binary>>}}, req(put, url(DbUrl, "doc"), #{~"v" => 2})), + ?assertMatch({200, #{~"doc_count" := 1, ~"doc_del_count" := 0}}, req(get, DbUrl)). + t_mixed_purge_request(DbUrl) -> Doc1IdRevs = create_and_update_doc(DbUrl, "doc1"), [Rev1] = maps:get(?l2b("doc1"), Doc1IdRevs), diff --git a/src/couch/src/couch_bt_engine_compactor.erl b/src/couch/src/couch_bt_engine_compactor.erl index e57a40f73..66ac5ea14 100644 --- a/src/couch/src/couch_bt_engine_compactor.erl +++ b/src/couch/src/couch_bt_engine_compactor.erl @@ -472,8 +472,12 @@ copy_docs(St, #st{} = NewSt, MixedInfos, Retry) -> NewActiveSize = FinalAS + TotalAttSize, NewExternalSize = FinalES + TotalAttSize, ?COMP_EVENT(seq_copy), + % In 3.5.3 and before we didn't always update the deleted flag + % properly (see issue #6199) so recompute the flag based on the rev + % tree tree in order to repair it. Info#full_doc_info{ rev_tree = NewRevTree, + deleted = couch_doc:is_deleted(NewRevTree), sizes = #size_info{ active = NewActiveSize, external = NewExternalSize diff --git a/src/couch/src/couch_db_updater.erl b/src/couch/src/couch_db_updater.erl index 58bbe6ece..5312e189a 100644 --- a/src/couch/src/couch_db_updater.erl +++ b/src/couch/src/couch_db_updater.erl @@ -935,7 +935,8 @@ apply_purge_reqs([Req | RestReqs], IdFDIs, USeq, Replies) -> FDI1 = FDI0#full_doc_info{ update_seq = NewUpdateSeq, - rev_tree = NewTree2 + rev_tree = NewTree2, + deleted = couch_doc:is_deleted(NewTree2) }, {FDI1, Removed, NewUpdateSeq} end; diff --git a/src/couch_pse_tests/src/cpse_test_purge_docs.erl b/src/couch_pse_tests/src/cpse_test_purge_docs.erl index f6fe86d6c..4860c9aac 100644 --- a/src/couch_pse_tests/src/cpse_test_purge_docs.erl +++ b/src/couch_pse_tests/src/cpse_test_purge_docs.erl @@ -268,6 +268,66 @@ cpse_purge_partial_revs(DbName) -> {purge_infos, PurgeInfos} ]). +cpse_purge_winning_with_a_deleted_remaining(DbName) -> + % Delete the live one. The deleted one becomes live and doc counts to + % reflect that, too + Id = ~"cabbage", + {WinRev, _DelRev} = one_live_one_deleted(DbName, Id), + cpse_util:assert_db_props(?MODULE, ?LINE, DbName, [ + {doc_count, 1}, + {del_doc_count, 0}, + {update_seq, 1}, + {changes, 1} + ]), + PurgeInfos = [{cpse_util:uuid(), Id, [WinRev]}], + {ok, [{ok, PRevs}]} = cpse_util:purge(DbName, PurgeInfos), + ?assertEqual([WinRev], PRevs), + ?assertMatch(#full_doc_info{deleted = true}, fdi(DbName, Id)), + cpse_util:assert_db_props(?MODULE, ?LINE, DbName, [ + {doc_count, 0}, + {del_doc_count, 1}, + {update_seq, 2}, + {changes, 1}, + {purge_seq, 1}, + {purge_infos, PurgeInfos} + ]). + +cpse_purge_deleted_conflict_leaf(DbName) -> + % Purging deleted conflicts keeps the winning live one as is + Id = ~"tomato", + {_WinRev, DelRev} = one_live_one_deleted(DbName, Id), + PurgeInfos = [{cpse_util:uuid(), Id, [DelRev]}], + {ok, [{ok, PRevs}]} = cpse_util:purge(DbName, PurgeInfos), + ?assertEqual([DelRev], PRevs), + ?assertMatch(#full_doc_info{deleted = false}, fdi(DbName, Id)), + cpse_util:assert_db_props(?MODULE, ?LINE, DbName, [ + {doc_count, 1}, + {del_doc_count, 0}, + {update_seq, 2}, + {changes, 1}, + {purge_seq, 1}, + {purge_infos, PurgeInfos} + ]). + +cpse_purge_winning_and_then_deleted(DbName) -> + % Clean everything, first the live one, then the deleted one + % FDI should be gone + Id = ~"potato", + {LiveRev, DelRev} = one_live_one_deleted(DbName, Id), + PurgeInfos1 = [{cpse_util:uuid(), Id, [LiveRev]}], + {ok, [{ok, [LiveRev]}]} = cpse_util:purge(DbName, PurgeInfos1), + PurgeInfos2 = [{cpse_util:uuid(), Id, [DelRev]}], + {ok, [{ok, [DelRev]}]} = cpse_util:purge(DbName, PurgeInfos2), + ?assertEqual(not_found, fdi(DbName, Id)), + cpse_util:assert_db_props(?MODULE, ?LINE, DbName, [ + {doc_count, 0}, + {del_doc_count, 0}, + {update_seq, 3}, + {changes, 0}, + {purge_seq, 2}, + {purge_infos, PurgeInfos1 ++ PurgeInfos2} + ]). + cpse_purge_missing_docid(DbName) -> {ok, [Rev1, _Rev2]} = cpse_util:save_docs(DbName, [ {[{'_id', foo1}, {vsn, 1}]}, @@ -460,3 +520,32 @@ cpse_purge_repeated_uuid(DbName) -> fold_all_infos(Info, Acc) -> {ok, [Info | Acc]}. + +one_live_one_deleted(DbName, DocId) -> + % a---b : live + % \__c : deleted + Win = + {[ + {'_id', DocId}, + {'_revisions', {[{start, 2}, {ids, [~"b", ~"a"]}]}}, + {vsn, 1} + ]}, + Del = + {[ + {'_id', DocId}, + {'_deleted', true}, + {'_revisions', {[{start, 2}, {ids, [~"c", ~"a"]}]}} + ]}, + Docs = [Win, Del], + {ok, [WinRev, DelRev]} = cpse_util:save_docs(DbName, Docs, [?REPLICATED_CHANGES]), + ?assertEqual({2, ~"b"}, WinRev), + ?assertEqual({2, ~"c"}, DelRev), + {WinRev, DelRev}. + +fdi(DbName, DocId) -> + {ok, Db} = couch_db:open_int(DbName, []), + try + couch_db:get_full_doc_info(Db, DocId) + after + couch_db:close(Db) + end.
