diff options
author | Russell Branca <chewbranca@apache.org> | 2021-09-03 14:16:44 -0700 |
---|---|---|
committer | Russell Branca <chewbranca@apache.org> | 2021-09-03 14:17:34 -0700 |
commit | 5ce3066d3c626fdf86ef54d2fcd965bc3132e4c5 (patch) | |
tree | c71275160dc62b99978764aa911f0d36bbf70daa | |
parent | bbe2e20a1388e67447f82c2be981de2ed115d11d (diff) | |
download | couchdb-5ce3066d3c626fdf86ef54d2fcd965bc3132e4c5.tar.gz |
Fix couch_mrview tests
-rw-r--r-- | src/couch_mrview/src/couch_mrview_compactor.erl | 5 | ||||
-rw-r--r-- | src/couch_mrview/src/couch_mrview_index.erl | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/couch_mrview/src/couch_mrview_compactor.erl b/src/couch_mrview/src/couch_mrview_compactor.erl index a28967c2c..f6b5e113b 100644 --- a/src/couch_mrview/src/couch_mrview_compactor.erl +++ b/src/couch_mrview/src/couch_mrview_compactor.erl @@ -14,6 +14,7 @@ -include_lib("couch/include/couch_db.hrl"). -include_lib("couch_mrview/include/couch_mrview.hrl"). +-include_lib("ioq/include/ioq.hrl"). -export([compact/3, swap_compacted/2, remove_compacted/1]). @@ -274,7 +275,7 @@ recompact_success_after_progress() -> timer:sleep(100), exit({updated, self(), State#mrst{update_seq = 2}}) end), - State = #mrst{fd=self(), update_seq=0}, + State = #mrst{fd=#ioq_file{fd=self()}, update_seq=0}, ?assertEqual({ok, State#mrst{update_seq = 2}}, recompact(State)) end). @@ -285,7 +286,7 @@ recompact_exceeded_retry_count() -> exit(error) end), ok = meck:expect(couch_log, warning, fun(_, _) -> ok end), - State = #mrst{fd=self(), db_name=foo, idx_name=bar}, + State = #mrst{fd=#ioq_file{fd=self()}, db_name=foo, idx_name=bar}, ExpectedError = {exceeded_recompact_retry_count, [{db_name, foo}, {idx_name, bar}]}, ?assertError(ExpectedError, recompact(State)) diff --git a/src/couch_mrview/src/couch_mrview_index.erl b/src/couch_mrview/src/couch_mrview_index.erl index 68f1d2322..582595cbd 100644 --- a/src/couch_mrview/src/couch_mrview_index.erl +++ b/src/couch_mrview/src/couch_mrview_index.erl @@ -165,7 +165,7 @@ close(State) -> % outstanding queries are done. shutdown(State) -> erlang:demonitor(State#mrst.fd_monitor, [flush]), - unlink(State#mrst.fd). + unlink(ioq:fd_pid(State#mrst.fd)). delete(#mrst{db_name=DbName, sig=Sig}=State) -> |