Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 4B838200C38 for ; Wed, 15 Mar 2017 23:49:30 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 4A014160B78; Wed, 15 Mar 2017 22:49:30 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 40DCB160B60 for ; Wed, 15 Mar 2017 23:49:29 +0100 (CET) Received: (qmail 26234 invoked by uid 500); 15 Mar 2017 22:49:28 -0000 Mailing-List: contact commits-help@couchdb.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@couchdb.apache.org Delivered-To: mailing list commits@couchdb.apache.org Received: (qmail 26209 invoked by uid 99); 15 Mar 2017 22:49:28 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 15 Mar 2017 22:49:28 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 524ABDFE1E; Wed, 15 Mar 2017 22:49:28 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: davisp@apache.org To: commits@couchdb.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: couch-mrview commit: updated refs/heads/COUCHDB-3326-clustered-purge to 923ef02 [Forced Update!] Date: Wed, 15 Mar 2017 22:49:28 +0000 (UTC) archived-at: Wed, 15 Mar 2017 22:49:30 -0000 Repository: couchdb-couch-mrview Updated Branches: refs/heads/COUCHDB-3326-clustered-purge 85afe396b -> 923ef021a (forced update) Update couch_mrview to use new purge API COUCHDB-3326 Project: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/commit/923ef021 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/tree/923ef021 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/diff/923ef021 Branch: refs/heads/COUCHDB-3326-clustered-purge Commit: 923ef021a31feadaf5987bc48db6217016101390 Parents: e204e51 Author: Mayya Sharipova Authored: Mon Aug 15 09:26:48 2016 -0400 Committer: Paul J. Davis Committed: Wed Mar 15 17:49:20 2017 -0500 ---------------------------------------------------------------------- src/couch_mrview_cleanup.erl | 18 ++- src/couch_mrview_index.erl | 61 ++++++++++ src/couch_mrview_util.erl | 22 ++++ test/couch_mrview_purge_docs_fabric_tests.erl | 93 +++++++++++++++ test/couch_mrview_purge_docs_tests.erl | 125 +++++++++++++++++++++ 5 files changed, 318 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/923ef021/src/couch_mrview_cleanup.erl ---------------------------------------------------------------------- diff --git a/src/couch_mrview_cleanup.erl b/src/couch_mrview_cleanup.erl index 380376d..93c9387 100644 --- a/src/couch_mrview_cleanup.erl +++ b/src/couch_mrview_cleanup.erl @@ -41,7 +41,23 @@ run(Db) -> lists:foreach(fun(FN) -> couch_log:debug("Deleting stale view file: ~s", [FN]), - couch_file:delete(RootDir, FN, [sync]) + couch_file:delete(RootDir, FN, [sync]), + Sig = couch_mrview_util:get_signature_from_filename(FN), + if length(Sig) < 16 -> ok; true -> + case re:run(Sig,"^[a-fA-F0-9]+$",[{capture, none}]) of + match -> + DocId = couch_mrview_util:get_local_purge_doc_id(Sig), + case couch_db:open_doc(Db, DocId, []) of + {ok, LocalPurgeDoc} -> + couch_db:update_doc(Db, + LocalPurgeDoc#doc{deleted=true}, [?ADMIN_CTX]); + {not_found, _} -> + ok + end; + _ -> + ok + end + end end, ToDelete), ok. http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/923ef021/src/couch_mrview_index.erl ---------------------------------------------------------------------- diff --git a/src/couch_mrview_index.erl b/src/couch_mrview_index.erl index 95698bc..cfc858f 100644 --- a/src/couch_mrview_index.erl +++ b/src/couch_mrview_index.erl @@ -18,6 +18,7 @@ -export([start_update/3, purge/4, process_doc/3, finish_update/1, commit/1]). -export([compact/3, swap_compacted/2]). -export([index_file_exists/1]). +-export([update_local_purge_doc/2, verify_index_exists/1]). -include_lib("couch/include/couch_db.hrl"). -include_lib("couch_mrview/include/couch_mrview.hrl"). @@ -134,14 +135,17 @@ open(Db, State) -> {ok, {OldSig, Header}} -> % Matching view signatures. NewSt = couch_mrview_util:init_state(Db, Fd, State, Header), + maybe_create_local_purge_doc(Db, NewSt), {ok, NewSt}; % end of upgrade code for <= 1.2.x {ok, {Sig, Header}} -> % Matching view signatures. NewSt = couch_mrview_util:init_state(Db, Fd, State, Header), + maybe_create_local_purge_doc(Db, NewSt), {ok, NewSt}; _ -> NewSt = couch_mrview_util:reset_index(Db, Fd, State), + maybe_create_local_purge_doc(Db, NewSt), {ok, NewSt} end; {error, Reason} = Error -> @@ -204,3 +208,60 @@ index_file_exists(State) -> } = State, IndexFName = couch_mrview_util:index_file(DbName, Sig), filelib:is_file(IndexFName). + + +update_local_purge_doc(Db, State) -> + Sig = couch_index_util:hexsig(get(signature, State)), + Doc = couch_doc:from_json_obj({[ + {<<"_id">>, couch_mrview_util:get_local_purge_doc_id(Sig)}, + {<<"purge_seq">>, get(purge_seq, State)}, + {<<"timestamp_utc">>, list_to_binary(couch_util:utc_string())}, + {<<"verify_module">>, <<"couch_mrview_index">>}, + {<<"verify_function">>, <<"verify_index_exists">>}, + {<<"verify_options">>, {[ + {<<"dbname">>, get(db_name, State)}, + {<<"ddoc_id">>, get(idx_name, State)}, + {<<"signature">>, Sig} + ]}}, + {<<"type">>, <<"mrview">>} + ]}), + couch_db:update_doc(Db, Doc, []). + + +verify_index_exists(Options) -> + ShardDbName = couch_mrview_util:get_value_from_options(<<"dbname">>, Options), + DDocId = couch_mrview_util:get_value_from_options(<<"ddoc_id">>, Options), + SigInLocal = couch_mrview_util:get_value_from_options(<<"signature">>, Options), + case couch_db:open_int(ShardDbName, []) of + {ok, Db} -> + try + DbName = mem3:dbname(couch_db:name(Db)), + case ddoc_cache:open(DbName, DDocId) of + {ok, DDoc} -> + {ok, IdxState} = couch_mrview_util:ddoc_to_mrst(ShardDbName, DDoc), + couch_index_util:hexsig(IdxState#mrst.sig) == SigInLocal; + _Else -> + false + end + catch E:T -> + Stack = erlang:get_stacktrace(), + couch_log:error("Error occurs when verifying existence of ~s/~s :: ~p ~p", + [ShardDbName, DDocId, {E, T}, Stack]), + false + after + catch couch_db:close(Db) + end; + _ -> + false + end. + + +maybe_create_local_purge_doc(Db, State) -> + Sig = couch_index_util:hexsig(get(signature, State)), + LocalPurgeDocId = couch_mrview_util:get_local_purge_doc_id(Sig), + case couch_db:open_doc(Db, LocalPurgeDocId, []) of + {not_found, _Reason} -> + update_local_purge_doc(Db, State); + {ok, _LocalPurgeDoc} -> + ok + end. http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/923ef021/src/couch_mrview_util.erl ---------------------------------------------------------------------- diff --git a/src/couch_mrview_util.erl b/src/couch_mrview_util.erl index 2e8ef4c..f227d33 100644 --- a/src/couch_mrview_util.erl +++ b/src/couch_mrview_util.erl @@ -13,6 +13,8 @@ -module(couch_mrview_util). -export([get_view/4, get_view_index_pid/4]). +-export([get_local_purge_doc_id/1, get_value_from_options/2]). +-export([get_signature_from_filename/1]). -export([ddoc_to_mrst/2, init_state/4, reset_index/3]). -export([make_header/1]). -export([index_file/2, compaction_file/2, open_file/1]). @@ -39,6 +41,26 @@ -include_lib("couch_mrview/include/couch_mrview.hrl"). +get_local_purge_doc_id(Sig) -> + list_to_binary(?LOCAL_DOC_PREFIX ++ "purge-mrview-" ++ Sig). + + +get_value_from_options(Key, Options) -> + case couch_util:get_value(Key, Options) of + undefined -> + Reason = binary_to_list(Key) ++ " must exist in Options.", + throw({bad_request, Reason}); + Value -> Value + end. + + +get_signature_from_filename(FileName) -> + FilePathList = filename:split(FileName), + [PureFN] = lists:nthtail(length(FilePathList) - 1, FilePathList), + PureFNExt = filename:extension(PureFN), + filename:basename(PureFN, PureFNExt). + + get_view(Db, DDoc, ViewName, Args0) -> {ok, Pid, Args2} = get_view_index_pid(Db, DDoc, ViewName, Args0), DbUpdateSeq = couch_util:with_db(Db, fun(WDb) -> http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/923ef021/test/couch_mrview_purge_docs_fabric_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_mrview_purge_docs_fabric_tests.erl b/test/couch_mrview_purge_docs_fabric_tests.erl new file mode 100644 index 0000000..8ee3f92 --- /dev/null +++ b/test/couch_mrview_purge_docs_fabric_tests.erl @@ -0,0 +1,93 @@ +% Licensed under the Apache License, Version 2.0 (the "License"); you may not +% use this file except in compliance with the License. You may obtain a copy of +% the License at +% +% http://www.apache.org/licenses/LICENSE-2.0 +% +% Unless required by applicable law or agreed to in writing, software +% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +% License for the specific language governing permissions and limitations under +% the License. + +-module(couch_mrview_purge_docs_fabric_tests). + +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). +-include_lib("couch_mrview/include/couch_mrview.hrl"). + +-define(TIMEOUT, 1000). + + +setup() -> + DbName = ?tempdb(), + ok = fabric:create_db(DbName, [?ADMIN_CTX]), + DbName. + + +teardown(DbName) -> + ok = fabric:delete_db(DbName, [?ADMIN_CTX]). + + +view_purge_fabric_test_() -> + { + "Map views", + { + setup, + fun() -> test_util:start_couch([fabric, mem3]) end, + fun test_util:stop_couch/1, + { + foreach, + fun setup/0, fun teardown/1, + [ + fun test_purge_verify_index/1 + ] + } + } + }. + + +test_purge_verify_index(DbName) -> + ?_test(begin + Docs1 = couch_mrview_test_util:make_docs(5), + {ok, _} = fabric:update_docs(DbName, Docs1, [?ADMIN_CTX]), + {ok, _} = fabric:update_doc(DbName, couch_mrview_test_util:ddoc(map), [?ADMIN_CTX]), + + purge_docs(DbName, [<<"1">>]), + + Result2 = fabric:query_view(DbName, <<"bar">>, <<"baz">>, #mrargs{}), + Expect2 = {ok, [ + {meta, [{total, 4}, {offset, 0}]}, + {row, [{id, <<"2">>}, {key, 2}, {value, 2}]}, + {row, [{id, <<"3">>}, {key, 3}, {value, 3}]}, + {row, [{id, <<"4">>}, {key, 4}, {value, 4}]}, + {row, [{id, <<"5">>}, {key, 5}, {value, 5}]} + ]}, + ?assertEqual(Expect2, Result2), + + {ok, DDoc} = fabric:open_doc(DbName, <<"_design/bar">>, []), + {ok, IdxState} = couch_mrview_util:ddoc_to_mrst(DbName, DDoc), + Sig = IdxState#mrst.sig, + HexSig = list_to_binary(couch_index_util:hexsig(Sig)), + DocId = couch_mrview_util:get_local_purge_doc_id(HexSig), + {ok, LocPurgeDoc} = fabric:open_doc(DbName, DocId, []), + {Props} = couch_doc:to_json_obj(LocPurgeDoc,[]), + {Options} = couch_util:get_value(<<"verify_options">>, Props), + ?assertEqual(true, couch_mrview_index:verify_index_exists(Options)), + + ok + end). + +get_rev(#full_doc_info{} = FDI) -> + #doc_info{ + revs = [#rev_info{} = PrevRev | _] + } = couch_doc:to_doc_info(FDI), + PrevRev#rev_info.rev. + + +purge_docs(DbName, DocIds) -> + lists:foreach(fun(DocId) -> + FDI = fabric:get_full_doc_info(DbName, DocId, []), + Rev = get_rev(FDI), + {ok, {_, [{ok, _}]}} = fabric:purge_docs(DbName, [{DocId, [Rev]}], []) + end, DocIds). http://git-wip-us.apache.org/repos/asf/couchdb-couch-mrview/blob/923ef021/test/couch_mrview_purge_docs_tests.erl ---------------------------------------------------------------------- diff --git a/test/couch_mrview_purge_docs_tests.erl b/test/couch_mrview_purge_docs_tests.erl new file mode 100644 index 0000000..f7c207c --- /dev/null +++ b/test/couch_mrview_purge_docs_tests.erl @@ -0,0 +1,125 @@ +% Licensed under the Apache License, Version 2.0 (the "License"); you may not +% use this file except in compliance with the License. You may obtain a copy of +% the License at +% +% http://www.apache.org/licenses/LICENSE-2.0 +% +% Unless required by applicable law or agreed to in writing, software +% distributed under the License is distributed on an "AS IS" BASIS, WITHOUT +% WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the +% License for the specific language governing permissions and limitations under +% the License. + +-module(couch_mrview_purge_docs_tests). + +-include_lib("couch/include/couch_eunit.hrl"). +-include_lib("couch/include/couch_db.hrl"). +-include_lib("couch_mrview/include/couch_mrview.hrl"). + +-define(TIMEOUT, 1000). + + +setup() -> + {ok, Db} = couch_mrview_test_util:init_db(?tempdb(), map, 5), + Db. + +teardown(Db) -> + couch_db:close(Db), + couch_server:delete(Db#db.name, [?ADMIN_CTX]), + ok. + +view_purge_test_() -> + { + "Map views", + { + setup, + fun test_util:start_couch/0, fun test_util:stop_couch/1, + { + foreach, + fun setup/0, fun teardown/1, + [ + fun test_purge_single/1, + fun test_purge_multiple/1 + ] + } + } + }. + + +test_purge_single(Db) -> + ?_test(begin + Result = run_query(Db, []), + Expect = {ok, [ + {meta, [{total, 5}, {offset, 0}]}, + {row, [{id, <<"1">>}, {key, 1}, {value, 1}]}, + {row, [{id, <<"2">>}, {key, 2}, {value, 2}]}, + {row, [{id, <<"3">>}, {key, 3}, {value, 3}]}, + {row, [{id, <<"4">>}, {key, 4}, {value, 4}]}, + {row, [{id, <<"5">>}, {key, 5}, {value, 5}]} + ]}, + ?assertEqual(Expect, Result), + + FDI = couch_db:get_full_doc_info(Db, <<"1">>), + Rev = get_rev(FDI), + {ok, {_, _}} = couch_db:purge_docs(Db, [{<<"UUID1">>, <<"1">>, [Rev]}]), + {ok, Db2} = couch_db:reopen(Db), + + Result2 = run_query(Db2, []), + Expect2 = {ok, [ + {meta, [{total, 4}, {offset, 0}]}, + {row, [{id, <<"2">>}, {key, 2}, {value, 2}]}, + {row, [{id, <<"3">>}, {key, 3}, {value, 3}]}, + {row, [{id, <<"4">>}, {key, 4}, {value, 4}]}, + {row, [{id, <<"5">>}, {key, 5}, {value, 5}]} + ]}, + ?assertEqual(Expect2, Result2), + + ok + end). + + +test_purge_multiple(Db) -> + ?_test(begin + Result = run_query(Db, []), + Expect = {ok, [ + {meta, [{total, 5}, {offset, 0}]}, + {row, [{id, <<"1">>}, {key, 1}, {value, 1}]}, + {row, [{id, <<"2">>}, {key, 2}, {value, 2}]}, + {row, [{id, <<"3">>}, {key, 3}, {value, 3}]}, + {row, [{id, <<"4">>}, {key, 4}, {value, 4}]}, + {row, [{id, <<"5">>}, {key, 5}, {value, 5}]} + ]}, + ?assertEqual(Expect, Result), + + FDI1 = couch_db:get_full_doc_info(Db, <<"1">>), Rev1 = get_rev(FDI1), + FDI2 = couch_db:get_full_doc_info(Db, <<"2">>), Rev2 = get_rev(FDI2), + FDI5 = couch_db:get_full_doc_info(Db, <<"5">>), Rev5 = get_rev(FDI5), + + IdsRevs = [ + {<<"UUID1">>, <<"1">>, [Rev1]}, + {<<"UUID2">>, <<"2">>, [Rev2]}, + {<<"UUID5">>, <<"5">>, [Rev5]} + ], + {ok, {_, _}} = couch_db:purge_docs(Db, IdsRevs), + {ok, Db2} = couch_db:reopen(Db), + + Result2 = run_query(Db2, []), + Expect2 = {ok, [ + {meta, [{total, 2}, {offset, 0}]}, + {row, [{id, <<"3">>}, {key, 3}, {value, 3}]}, + {row, [{id, <<"4">>}, {key, 4}, {value, 4}]} + ]}, + ?assertEqual(Expect2, Result2), + + ok + end). + +run_query(Db, Opts) -> + couch_mrview:query_view(Db, <<"_design/bar">>, <<"baz">>, Opts). + + +get_rev(#full_doc_info{} = FDI) -> + #doc_info{ + revs = [#rev_info{} = PrevRev | _] + } = couch_doc:to_doc_info(FDI), + PrevRev#rev_info.rev.