You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ji...@apache.org on 2025/10/07 19:54:11 UTC
(couchdb) 02/02: Remove `erlang:` prefix from `erlang:error()`
This is an automated email from the ASF dual-hosted git repository.
jiahuili430 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 12b40b8f1ba974af64c40a02eca080f98ac3677e
Author: Jiahui Li <li...@gmail.com>
AuthorDate: Tue Oct 7 13:42:15 2025 -0500
Remove `erlang:` prefix from `erlang:error()`
---
src/chttpd/src/chttpd_db.erl | 2 +-
src/chttpd/src/chttpd_misc.erl | 2 +-
src/config/test/config_tests.erl | 20 ++++++++++----------
src/couch/include/couch_eunit.hrl | 2 +-
src/couch/src/couch_att.erl | 2 +-
src/couch/src/couch_base32.erl | 2 +-
src/couch/src/couch_bt_engine.erl | 2 +-
src/couch/src/couch_bt_engine_compactor.erl | 2 +-
src/couch/src/couch_bt_engine_header.erl | 2 +-
src/couch/src/couch_db.erl | 6 +++---
src/couch/src/couch_doc.erl | 2 +-
src/couch/src/couch_file.erl | 6 +++---
src/couch/src/couch_multidb_changes.erl | 2 +-
src/couch/src/couch_server.erl | 2 +-
src/couch/src/couch_util.erl | 2 +-
.../eunit/couch_bt_engine_compactor_ev_tests.erl | 2 +-
.../test/eunit/couch_bt_engine_compactor_tests.erl | 4 ++--
src/couch/test/eunit/couch_changes_tests.erl | 6 +++---
src/couch/test/eunit/couch_server_tests.erl | 4 ++--
src/couch/test/eunit/couch_task_status_tests.erl | 2 +-
src/couch/test/eunit/couch_work_queue_tests.erl | 4 ++--
src/couch/test/eunit/couchdb_attachments_tests.erl | 2 +-
.../test/eunit/couchdb_file_compression_tests.erl | 2 +-
src/couch/test/eunit/couchdb_os_proc_pool.erl | 2 +-
.../test/eunit/couchdb_update_conflicts_tests.erl | 4 ++--
src/couch/test/eunit/couchdb_vhosts_tests.erl | 22 +++++++++++-----------
src/couch/test/eunit/couchdb_views_tests.erl | 8 ++++----
src/couch_event/src/couch_event_listener.erl | 12 ++++++------
src/couch_event/src/couch_event_listener_mfa.erl | 2 +-
src/couch_index/src/couch_index.erl | 2 +-
src/couch_log/src/couch_log_trunc_io.erl | 6 +++---
src/couch_log/src/couch_log_trunc_io_fmt.erl | 4 ++--
.../test/eunit/couch_log_config_listener_test.erl | 2 +-
src/couch_log/test/eunit/couch_log_server_test.erl | 2 +-
src/couch_log/test/eunit/couch_log_test_util.erl | 4 ++--
src/couch_mrview/src/couch_mrview_compactor.erl | 2 +-
.../test/eunit/couch_mrview_compact_tests.erl | 6 +++---
.../test/eunit/couch_mrview_ddoc_updated_tests.erl | 2 +-
.../eunit/couch_mrview_purge_docs_fabric_tests.erl | 2 +-
.../test/eunit/couch_mrview_purge_docs_tests.erl | 2 +-
.../test/eunit/couch_prometheus_e2e_tests.erl | 2 +-
src/couch_pse_tests/src/cpse_test_ref_counting.erl | 8 ++++----
src/couch_pse_tests/src/cpse_util.erl | 12 ++++++------
.../src/couch_replicator_api_wrap.erl | 6 +++---
.../test/eunit/couch_replicator_compact_tests.erl | 20 ++++++++++----------
.../couch_replicator_error_reporting_tests.erl | 2 +-
.../eunit/couch_replicator_httpc_pool_tests.erl | 2 +-
...ch_replicator_retain_stats_between_job_runs.erl | 4 ++--
src/custodian/src/custodian_util.erl | 2 +-
src/ddoc_cache/src/ddoc_cache_entry.erl | 2 +-
.../test/eunit/ddoc_cache_open_error_test.erl | 2 +-
src/ddoc_cache/test/eunit/ddoc_cache_open_test.erl | 2 +-
.../test/eunit/ddoc_cache_remove_test.erl | 2 +-
src/ets_lru/test/ets_lru_test.erl | 2 +-
src/fabric/src/fabric.erl | 6 +++---
src/fabric/src/fabric_db_create.erl | 2 +-
src/fabric/src/fabric_db_delete.erl | 2 +-
src/fabric/src/fabric_db_update_listener.erl | 4 ++--
src/fabric/src/fabric_rpc.erl | 2 +-
src/fabric/src/fabric_util.erl | 4 ++--
src/mango/src/mango_selector.erl | 2 +-
src/mango/src/mango_selector_text.erl | 2 +-
src/mango/src/mango_util.erl | 2 +-
src/mem3/src/mem3.erl | 4 ++--
src/mem3/src/mem3_reshard_job.erl | 8 ++++----
src/mem3/src/mem3_rpc.erl | 6 +++---
src/mem3/src/mem3_shards.erl | 2 +-
.../test/eunit/mem3_reshard_changes_feed_test.erl | 2 +-
src/rexi/src/rexi.erl | 2 +-
src/rexi/src/rexi_server_mon.erl | 2 +-
src/weatherreport/src/weatherreport_getopt.erl | 2 +-
71 files changed, 144 insertions(+), 144 deletions(-)
diff --git a/src/chttpd/src/chttpd_db.erl b/src/chttpd/src/chttpd_db.erl
index ff97e7935..832bb492b 100644
--- a/src/chttpd/src/chttpd_db.erl
+++ b/src/chttpd/src/chttpd_db.erl
@@ -1580,7 +1580,7 @@ update_doc(Db, DocId, #doc{deleted = Deleted, body = DocBody} = Doc, Options) ->
{'DOWN', Ref, _, _, {exit_throw, Reason}} ->
throw(Reason);
{'DOWN', Ref, _, _, {exit_error, Reason}} ->
- erlang:error(Reason);
+ error(Reason);
{'DOWN', Ref, _, _, {exit_exit, Reason}} ->
erlang:exit(Reason)
end,
diff --git a/src/chttpd/src/chttpd_misc.erl b/src/chttpd/src/chttpd_misc.erl
index d0bf363f3..a9c81c4d7 100644
--- a/src/chttpd/src/chttpd_misc.erl
+++ b/src/chttpd/src/chttpd_misc.erl
@@ -252,7 +252,7 @@ replicate({Props} = PostBody, Ctx) ->
]),
case rpc:call(Node, couch_replicator, replicate, [PostBody, Ctx]) of
{badrpc, Reason} ->
- erlang:error(Reason);
+ error(Reason);
Res ->
Res
end
diff --git a/src/config/test/config_tests.erl b/src/config/test/config_tests.erl
index 1775e4f39..3f1500553 100644
--- a/src/config/test/config_tests.erl
+++ b/src/config/test/config_tests.erl
@@ -708,7 +708,7 @@ should_remove_handler_when_pid_exits({_Apps, Pid}) ->
receive
{'DOWN', PidRef, _, _, _} -> ok
after ?TIMEOUT ->
- erlang:error({timeout, config_listener_death})
+ error({timeout, config_listener_death})
end,
% Wait for the config_listener_mon process to
@@ -716,7 +716,7 @@ should_remove_handler_when_pid_exits({_Apps, Pid}) ->
receive
{'DOWN', MonRef, _, _, normal} -> ok
after ?TIMEOUT ->
- erlang:error({timeout, config_listener_mon_death})
+ error({timeout, config_listener_mon_death})
end,
?assertEqual(0, n_handlers())
@@ -742,7 +742,7 @@ should_stop_monitor_on_error({_Apps, Pid}) ->
receive
{'DOWN', MonRef, _, _, shutdown} -> ok
after ?TIMEOUT ->
- erlang:error({timeout, config_listener_mon_shutdown})
+ error({timeout, config_listener_mon_shutdown})
end,
?assertEqual(0, n_handlers())
@@ -792,7 +792,7 @@ should_unsubscribe_when_subscriber_gone(_Subscription, {_Apps, Pid}) ->
receive
{'DOWN', MonRef, _, _, _} -> ok
after ?TIMEOUT ->
- erlang:error({timeout, config_notifier_shutdown})
+ error({timeout, config_notifier_shutdown})
end,
?assertNot(is_process_alive(Pid)),
@@ -1023,7 +1023,7 @@ spawn_config_listener() ->
receive
registered -> ok
after ?TIMEOUT ->
- erlang:error({timeout, config_handler_register})
+ error({timeout, config_handler_register})
end,
Pid.
@@ -1037,7 +1037,7 @@ spawn_config_notifier(Subscription) ->
receive
registered -> ok
after ?TIMEOUT ->
- erlang:error({timeout, config_handler_register})
+ error({timeout, config_handler_register})
end,
Pid.
@@ -1050,7 +1050,7 @@ loop(undefined) ->
{get_msg, _, _} = Msg ->
loop(Msg);
Msg ->
- erlang:error({invalid_message, Msg})
+ error({invalid_message, Msg})
end;
loop({get_msg, From, Ref}) ->
receive
@@ -1059,7 +1059,7 @@ loop({get_msg, From, Ref}) ->
{config_change, _, _, _, _} = Msg ->
From ! {Ref, Msg};
Msg ->
- erlang:error({invalid_message, Msg})
+ error({invalid_message, Msg})
end,
loop(undefined);
loop({config_msg, _} = Msg) ->
@@ -1067,7 +1067,7 @@ loop({config_msg, _} = Msg) ->
{get_msg, From, Ref} ->
From ! {Ref, Msg};
Msg ->
- erlang:error({invalid_message, Msg})
+ error({invalid_message, Msg})
end,
loop(undefined).
@@ -1077,7 +1077,7 @@ getmsg(Pid) ->
receive
{Ref, {config_msg, Msg}} -> Msg
after ?TIMEOUT ->
- erlang:error({timeout, config_msg})
+ error({timeout, config_msg})
end.
n_handlers() ->
diff --git a/src/couch/include/couch_eunit.hrl b/src/couch/include/couch_eunit.hrl
index 3ffa0506f..2c10e257d 100644
--- a/src/couch/include/couch_eunit.hrl
+++ b/src/couch/include/couch_eunit.hrl
@@ -68,7 +68,7 @@
((fun (__X) ->
case (Expr) of
__V when __V == __X -> ok;
- __Y -> erlang:error({assertEquiv_failed,
+ __Y -> error({assertEquiv_failed,
[{module, ?MODULE},
{line, ?LINE},
{expression, (??Expr)},
diff --git a/src/couch/src/couch_att.erl b/src/couch/src/couch_att.erl
index da771cf10..55a6dcd43 100644
--- a/src/couch/src/couch_att.erl
+++ b/src/couch/src/couch_att.erl
@@ -781,7 +781,7 @@ open_stream(StreamSrc, Data) ->
true ->
StreamSrc(Data);
false ->
- erlang:error({invalid_stream_source, StreamSrc})
+ error({invalid_stream_source, StreamSrc})
end
end.
diff --git a/src/couch/src/couch_base32.erl b/src/couch/src/couch_base32.erl
index 776fe773d..03267ced0 100644
--- a/src/couch/src/couch_base32.erl
+++ b/src/couch/src/couch_base32.erl
@@ -150,7 +150,7 @@ decode(Encoded, ByteOffset, Acc) ->
find_in_set(Char) ->
case binary:match(?SET, Char) of
nomatch ->
- erlang:error(not_base32);
+ error(not_base32);
{Offset, _} ->
Offset
end.
diff --git a/src/couch/src/couch_bt_engine.erl b/src/couch/src/couch_bt_engine.erl
index 99c87f990..4c30f0c73 100644
--- a/src/couch/src/couch_bt_engine.erl
+++ b/src/couch/src/couch_bt_engine.erl
@@ -616,7 +616,7 @@ fold_purge_infos(St, StartSeq0, UserFun, UserAcc, Options) ->
% automatically.
if
MinSeq =< StartSeq -> ok;
- true -> erlang:error({invalid_start_purge_seq, StartSeq0, MinSeq})
+ true -> error({invalid_start_purge_seq, StartSeq0, MinSeq})
end,
Wrapper = fun(Info, _Reds, UAcc) ->
UserFun(Info, UAcc)
diff --git a/src/couch/src/couch_bt_engine_compactor.erl b/src/couch/src/couch_bt_engine_compactor.erl
index 65aa76254..65f0ac90b 100644
--- a/src/couch/src/couch_bt_engine_compactor.erl
+++ b/src/couch/src/couch_bt_engine_compactor.erl
@@ -697,7 +697,7 @@ merge_lookups([#doc_info{} = DI | RestInfos], [{ok, FDI} | RestLookups]) ->
% Assert we've matched our lookups
if
DI#doc_info.id == FDI#full_doc_info.id -> ok;
- true -> erlang:error({mismatched_doc_infos, DI#doc_info.id})
+ true -> error({mismatched_doc_infos, DI#doc_info.id})
end,
[FDI | merge_lookups(RestInfos, RestLookups)];
merge_lookups([FDI | RestInfos], Lookups) ->
diff --git a/src/couch/src/couch_bt_engine_header.erl b/src/couch/src/couch_bt_engine_header.erl
index ec9a4322b..4cc1c2fb6 100644
--- a/src/couch/src/couch_bt_engine_header.erl
+++ b/src/couch/src/couch_bt_engine_header.erl
@@ -221,7 +221,7 @@ upgrade_tuple(Old) when is_tuple(Old) ->
{_, New} = lists:foldl(FoldFun, {1, #db_header{}}, OldKVs),
if
is_record(New, db_header) -> ok;
- true -> erlang:error({invalid_header_extension, {Old, New}})
+ true -> error({invalid_header_extension, {Old, New}})
end,
New.
diff --git a/src/couch/src/couch_db.erl b/src/couch/src/couch_db.erl
index 54201d13c..10849abbb 100644
--- a/src/couch/src/couch_db.erl
+++ b/src/couch/src/couch_db.erl
@@ -1023,7 +1023,7 @@ load_validation_funs(#db{main_pid = Pid, name = <<"shards/", _/binary>>} = Db) -
Funs;
{'DOWN', Ref, _, _, {database_does_not_exist, _StackTrace}} ->
ok = couch_server:close_db_if_idle(Db#db.name),
- erlang:error(database_does_not_exist);
+ error(database_does_not_exist);
{'DOWN', Ref, _, _, Reason} ->
couch_log:error("could not load validation funs ~p", [Reason]),
throw(internal_server_error)
@@ -1802,12 +1802,12 @@ validate_epochs(Epochs) ->
%% Assert uniqueness.
case length(Epochs) == length(lists:ukeysort(2, Epochs)) of
true -> ok;
- false -> erlang:error(duplicate_epoch)
+ false -> error(duplicate_epoch)
end,
%% Assert order.
case Epochs == lists:sort(fun({_, A}, {_, B}) -> B =< A end, Epochs) of
true -> ok;
- false -> erlang:error({epoch_order, Epochs})
+ false -> error({epoch_order, Epochs})
end.
is_prefix(Pattern, Subject) ->
diff --git a/src/couch/src/couch_doc.erl b/src/couch/src/couch_doc.erl
index d72aad0d0..6f60b15b6 100644
--- a/src/couch/src/couch_doc.erl
+++ b/src/couch/src/couch_doc.erl
@@ -568,7 +568,7 @@ restart_open_doc_revs(Parser, Ref, NewRef) ->
unlink(Parser),
exit(Parser, kill),
flush_parser_messages(Ref),
- erlang:error({restart_open_doc_revs, NewRef}).
+ error({restart_open_doc_revs, NewRef}).
flush_parser_messages(Ref) ->
receive
diff --git a/src/couch/src/couch_file.erl b/src/couch/src/couch_file.erl
index 3b52aa467..2d0920f7e 100644
--- a/src/couch/src/couch_file.erl
+++ b/src/couch/src/couch_file.erl
@@ -290,20 +290,20 @@ sync(Filepath) when is_list(Filepath) ->
ok ->
ok;
{error, Reason} ->
- erlang:error({fsync_error, Reason})
+ error({fsync_error, Reason})
end
after
ok = file:close(Fd)
end;
{error, Error} ->
- erlang:error(Error)
+ error(Error)
end;
sync(Fd) ->
case gen_server:call(Fd, sync, infinity) of
ok ->
ok;
{error, Reason} ->
- erlang:error({fsync_error, Reason})
+ error({fsync_error, Reason})
end.
%%----------------------------------------------------------------------
diff --git a/src/couch/src/couch_multidb_changes.erl b/src/couch/src/couch_multidb_changes.erl
index 2ed200314..e1a95af8a 100644
--- a/src/couch/src/couch_multidb_changes.erl
+++ b/src/couch/src/couch_multidb_changes.erl
@@ -1135,7 +1135,7 @@ kill_mock_changes_reader_and_get_its_args(Pid) ->
{'DOWN', Ref, _, Pid, {Server, DbName}} ->
{Server, DbName}
after 1000 ->
- erlang:error(spawn_change_reader_timeout)
+ error(spawn_change_reader_timeout)
end.
mock_changes_reader() ->
diff --git a/src/couch/src/couch_server.erl b/src/couch/src/couch_server.erl
index aee2d9904..b6a8b0c89 100644
--- a/src/couch/src/couch_server.erl
+++ b/src/couch/src/couch_server.erl
@@ -863,7 +863,7 @@ get_engine(Server, DbName) ->
[Engine] ->
{ok, Engine};
_ ->
- erlang:error(engine_conflict)
+ error(engine_conflict)
end.
get_possible_engines(DbName, RootDir, Engines) ->
diff --git a/src/couch/src/couch_util.erl b/src/couch/src/couch_util.erl
index 7205edd80..31468b108 100644
--- a/src/couch/src/couch_util.erl
+++ b/src/couch/src/couch_util.erl
@@ -553,7 +553,7 @@ with_db(Db, Fun) ->
true ->
Fun(Db);
false ->
- erlang:error({invalid_db, Db})
+ error({invalid_db, Db})
end.
rfc1123_date() ->
diff --git a/src/couch/test/eunit/couch_bt_engine_compactor_ev_tests.erl b/src/couch/test/eunit/couch_bt_engine_compactor_ev_tests.erl
index a728711d7..3f16c8a32 100644
--- a/src/couch/test/eunit/couch_bt_engine_compactor_ev_tests.erl
+++ b/src/couch/test/eunit/couch_bt_engine_compactor_ev_tests.erl
@@ -284,7 +284,7 @@ wait_db_cleared(Db) ->
wait_db_cleared(Db, 5).
wait_db_cleared(Db, N) when N < 0 ->
- erlang:error({db_clear_timeout, couch_db:name(Db)});
+ error({db_clear_timeout, couch_db:name(Db)});
wait_db_cleared(Db, N) ->
Tab = couch_server:couch_dbs(couch_db:name(Db)),
case ets:lookup(Tab, couch_db:name(Db)) of
diff --git a/src/couch/test/eunit/couch_bt_engine_compactor_tests.erl b/src/couch/test/eunit/couch_bt_engine_compactor_tests.erl
index 4ed57668e..a7fec17db 100644
--- a/src/couch/test/eunit/couch_bt_engine_compactor_tests.erl
+++ b/src/couch/test/eunit/couch_bt_engine_compactor_tests.erl
@@ -89,7 +89,7 @@ check_db_validity(DbName) ->
with_mecked_emsort(Fun) ->
meck:new(couch_emsort, [passthrough]),
- meck:expect(couch_emsort, iter, fun(_) -> erlang:error(kaboom) end),
+ meck:expect(couch_emsort, iter, fun(_) -> error(kaboom) end),
try
Fun()
after
@@ -131,7 +131,7 @@ wait_db_compact_done(_DbName, 0) ->
{line, ?LINE},
{reason, "DB compaction failed to finish"}
],
- erlang:error({assertion_failed, Failure});
+ error({assertion_failed, Failure});
wait_db_compact_done(DbName, N) ->
IsDone = couch_util:with_db(DbName, fun(Db) ->
not is_pid(couch_db:get_compactor_pid(Db))
diff --git a/src/couch/test/eunit/couch_changes_tests.erl b/src/couch/test/eunit/couch_changes_tests.erl
index bbeeac26a..917689e86 100644
--- a/src/couch/test/eunit/couch_changes_tests.erl
+++ b/src/couch/test/eunit/couch_changes_tests.erl
@@ -1654,7 +1654,7 @@ wait_finished({_, ConsumerRef}) ->
{'DOWN', ConsumerRef, _, _, Msg} when Msg == normal; Msg == ok ->
ok;
{'DOWN', ConsumerRef, _, _, Msg} ->
- erlang:error(
+ error(
{consumer_died, [
{module, ?MODULE},
{line, ?LINE},
@@ -1662,7 +1662,7 @@ wait_finished({_, ConsumerRef}) ->
]}
)
after ?TIMEOUT ->
- erlang:error(
+ error(
{consumer_died, [
{module, ?MODULE},
{line, ?LINE},
@@ -1752,7 +1752,7 @@ maybe_pause(Parent, Acc) ->
Parent ! {ok, Ref},
throw({stop, Acc});
V when V /= updated ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
diff --git a/src/couch/test/eunit/couch_server_tests.erl b/src/couch/test/eunit/couch_server_tests.erl
index a43106d89..ea2c81e19 100644
--- a/src/couch/test/eunit/couch_server_tests.erl
+++ b/src/couch/test/eunit/couch_server_tests.erl
@@ -276,7 +276,7 @@ wait_for_open_async_result(CouchServer, Opener) ->
check_monitor_not_triggered(Ref) ->
receive
{'DOWN', Ref, _, _, Reason0} ->
- erlang:error({monitor_triggered, Reason0})
+ error({monitor_triggered, Reason0})
after 100 ->
ok
end.
@@ -286,5 +286,5 @@ get_next_message() ->
Msg ->
Msg
after 5000 ->
- erlang:error(timeout)
+ error(timeout)
end.
diff --git a/src/couch/test/eunit/couch_task_status_tests.erl b/src/couch/test/eunit/couch_task_status_tests.erl
index e5d8ead98..316db9eb3 100644
--- a/src/couch/test/eunit/couch_task_status_tests.erl
+++ b/src/couch/test/eunit/couch_task_status_tests.erl
@@ -222,7 +222,7 @@ get_task_prop(Pid, Prop) ->
),
case couch_util:get_value(Prop, hd(Element), nil) of
nil ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
diff --git a/src/couch/test/eunit/couch_work_queue_tests.erl b/src/couch/test/eunit/couch_work_queue_tests.erl
index c41cf598e..85c3f1a3c 100644
--- a/src/couch/test/eunit/couch_work_queue_tests.erl
+++ b/src/couch/test/eunit/couch_work_queue_tests.erl
@@ -375,7 +375,7 @@ produce_term(Q, Producer, Term, Wait) ->
{item, Ref, Item} ->
Item
after ?TIMEOUT ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -395,7 +395,7 @@ produce(Q, Producer, Size, Wait) ->
{item, Ref, Item} ->
Item
after ?TIMEOUT ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
diff --git a/src/couch/test/eunit/couchdb_attachments_tests.erl b/src/couch/test/eunit/couchdb_attachments_tests.erl
index 5de1eae9e..103a02326 100644
--- a/src/couch/test/eunit/couchdb_attachments_tests.erl
+++ b/src/couch/test/eunit/couchdb_attachments_tests.erl
@@ -646,7 +646,7 @@ wait_compaction(DbName, Kind, Line) ->
end,
case test_util:wait(WaitFun, ?TIMEOUT) of
timeout ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, Line},
diff --git a/src/couch/test/eunit/couchdb_file_compression_tests.erl b/src/couch/test/eunit/couchdb_file_compression_tests.erl
index 122900d4b..1016cd2de 100644
--- a/src/couch/test/eunit/couchdb_file_compression_tests.erl
+++ b/src/couch/test/eunit/couchdb_file_compression_tests.erl
@@ -222,7 +222,7 @@ wait_compaction(DbName, Kind, Line) ->
end,
case test_util:wait(WaitFun, ?TIMEOUT * 1000) of
timeout ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, Line},
diff --git a/src/couch/test/eunit/couchdb_os_proc_pool.erl b/src/couch/test/eunit/couchdb_os_proc_pool.erl
index 1a8479497..93fc275f9 100644
--- a/src/couch/test/eunit/couchdb_os_proc_pool.erl
+++ b/src/couch/test/eunit/couchdb_os_proc_pool.erl
@@ -562,7 +562,7 @@ get_client_proc({Pid, Ref}, ClientName) ->
receive
{proc, Ref, Proc} -> Proc
after ?TIMEOUT ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
diff --git a/src/couch/test/eunit/couchdb_update_conflicts_tests.erl b/src/couch/test/eunit/couchdb_update_conflicts_tests.erl
index 0722103a4..8ed51fb70 100644
--- a/src/couch/test/eunit/couchdb_update_conflicts_tests.erl
+++ b/src/couch/test/eunit/couchdb_update_conflicts_tests.erl
@@ -135,7 +135,7 @@ concurrent_doc_update(NumClients, DbName, InitRev) ->
{'DOWN', MonRef, process, Pid, conflict} ->
{AccConflicts + 1, AccValue};
{'DOWN', MonRef, process, Pid, Error} ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -146,7 +146,7 @@ concurrent_doc_update(NumClients, DbName, InitRev) ->
]}
)
after ?TIMEOUT div 2 ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
diff --git a/src/couch/test/eunit/couchdb_vhosts_tests.erl b/src/couch/test/eunit/couchdb_vhosts_tests.erl
index d1b758914..e005537cb 100644
--- a/src/couch/test/eunit/couchdb_vhosts_tests.erl
+++ b/src/couch/test/eunit/couchdb_vhosts_tests.erl
@@ -96,7 +96,7 @@ should_return_database_info({Url, DbName}) ->
{JsonBody} = jiffy:decode(Body),
?assert(proplists:is_defined(<<"db_name">>, JsonBody));
Else ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -120,7 +120,7 @@ should_return_revs_info({Url, DbName}) ->
{JsonBody} = jiffy:decode(Body),
?assert(proplists:is_defined(<<"_revs_info">>, JsonBody));
Else ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -146,7 +146,7 @@ should_return_virtual_request_path_field_in_request({Url, DbName}) ->
proplists:get_value(<<"requested_path">>, Json)
);
Else ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -170,7 +170,7 @@ should_return_real_request_path_field_in_request({Url, DbName}) ->
Path = ?l2b("/" ++ DbName ++ "/_design/doc1/_show/test"),
?assertEqual(Path, proplists:get_value(<<"path">>, Json));
Else ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -194,7 +194,7 @@ should_match_wildcard_vhost({Url, DbName}) ->
Path = ?l2b("/" ++ DbName ++ "/_design/doc1/_show/test"),
?assertEqual(Path, proplists:get_value(<<"path">>, Json));
Else ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -218,7 +218,7 @@ should_return_db_info_for_wildcard_vhost_for_custom_db({Url, DbName}) ->
{JsonBody} = jiffy:decode(Body),
?assert(proplists:is_defined(<<"db_name">>, JsonBody));
Else ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -243,7 +243,7 @@ should_replace_rewrite_variables_for_db_and_doc({Url, DbName}) ->
Path = ?l2b("/" ++ DbName ++ "/_design/doc1/_show/test"),
?assertEqual(Path, proplists:get_value(<<"path">>, Json));
Else ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -267,7 +267,7 @@ should_return_db_info_for_vhost_with_resource({Url, DbName}) ->
{JsonBody} = jiffy:decode(Body),
?assert(proplists:is_defined(<<"db_name">>, JsonBody));
Else ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -291,7 +291,7 @@ should_return_revs_info_for_vhost_with_resource({Url, DbName}) ->
{JsonBody} = jiffy:decode(Body),
?assert(proplists:is_defined(<<"_revs_info">>, JsonBody));
Else ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -311,7 +311,7 @@ should_return_db_info_for_vhost_with_wildcard_resource({Url, DbName}) ->
{JsonBody} = jiffy:decode(Body),
?assert(proplists:is_defined(<<"db_name">>, JsonBody));
Else ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -335,7 +335,7 @@ should_return_path_for_vhost_with_wildcard_host({Url, DbName}) ->
Path = ?l2b("/" ++ DbName ++ "/_design/doc1/_show/test"),
?assertEqual(Path, proplists:get_value(<<"path">>, Json));
Else ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
diff --git a/src/couch/test/eunit/couchdb_views_tests.erl b/src/couch/test/eunit/couchdb_views_tests.erl
index 0d32d7fcf..fcd02cf5b 100644
--- a/src/couch/test/eunit/couchdb_views_tests.erl
+++ b/src/couch/test/eunit/couchdb_views_tests.erl
@@ -773,7 +773,7 @@ wait_for_process_shutdown(Pid, ExpectedReason, Error) ->
{'DOWN', Pid, process, _, Reason} ->
?assertEqual(ExpectedReason, Reason)
after ?TIMEOUT ->
- erlang:error(
+ error(
{assertion_failed, [{module, ?MODULE}, {line, ?LINE}, Error]}
)
end.
@@ -994,7 +994,7 @@ compact_db(DbName) ->
wait_db_compact_done(DbName, ?WAIT_DELAY_COUNT).
wait_db_compact_done(_DbName, 0) ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -1020,7 +1020,7 @@ compact_view_group(DbName, DDocId) when is_binary(DDocId) ->
wait_view_compact_done(DbName, DDocId, 10).
wait_view_compact_done(_DbName, _DDocId, 0) ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -1052,7 +1052,7 @@ read_header(File) ->
stop_indexer(StopFun, Pid, Line, Reason) ->
case test_util:stop_sync(Pid, StopFun) of
timeout ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, Line},
diff --git a/src/couch_event/src/couch_event_listener.erl b/src/couch_event/src/couch_event_listener.erl
index 22bf23327..7fe2ec12e 100644
--- a/src/couch_event/src/couch_event_listener.erl
+++ b/src/couch_event/src/couch_event_listener.erl
@@ -109,7 +109,7 @@ maybe_name_process(Options) ->
true ->
ok;
{false, Pid} ->
- erlang:error({already_started, Pid})
+ error({already_started, Pid})
end;
none ->
ok
@@ -133,7 +133,7 @@ do_event(#st{module = Module, state = State} = St, DbName, Event) ->
{stop, Reason, NewState} ->
do_terminate(Reason, St#st{state = NewState});
Else ->
- erlang:error(Else)
+ error(Else)
end.
do_cast(#st{module = Module, state = State} = St, Message) ->
@@ -145,7 +145,7 @@ do_cast(#st{module = Module, state = State} = St, Message) ->
{stop, Reason, NewState} ->
do_terminate(Reason, St#st{state = NewState});
Else ->
- erlang:error(Else)
+ error(Else)
end.
do_info(#st{module = Module, state = State} = St, Message) ->
@@ -157,7 +157,7 @@ do_info(#st{module = Module, state = State} = St, Message) ->
{stop, Reason, NewState} ->
do_terminate(Reason, St#st{state = NewState});
Else ->
- erlang:error(Else)
+ error(Else)
end.
do_terminate(Reason, #st{module = Module, state = State}) ->
@@ -192,7 +192,7 @@ get_all_dbnames(Options) ->
end.
get_all_dbnames([], []) ->
- erlang:error(no_dbnames_provided);
+ error(no_dbnames_provided);
get_all_dbnames([], Acc) ->
lists:usort(convert_dbname_list(Acc));
get_all_dbnames([{dbname, DbName} | Rest], Acc) ->
@@ -209,4 +209,4 @@ convert_dbname_list([DbName | Rest]) when is_binary(DbName) ->
convert_dbname_list([DbName | Rest]) when is_list(DbName) ->
[list_to_binary(DbName) | convert_dbname_list(Rest)];
convert_dbname_list([DbName | _]) ->
- erlang:error({invalid_dbname, DbName}).
+ error({invalid_dbname, DbName}).
diff --git a/src/couch_event/src/couch_event_listener_mfa.erl b/src/couch_event/src/couch_event_listener_mfa.erl
index 5ec465cf7..829d3e23b 100644
--- a/src/couch_event/src/couch_event_listener_mfa.erl
+++ b/src/couch_event/src/couch_event_listener_mfa.erl
@@ -86,7 +86,7 @@ handle_event(DbName, Event, #st{mod = Mod, func = Func, state = State} = St) ->
couch_log:error("~p: else in handle_event for db ~p, event ~p, else ~p", [
?MODULE, DbName, Event, Else
]),
- erlang:error(Else)
+ error(Else)
end
catch
Class:Reason:Stack ->
diff --git a/src/couch_index/src/couch_index.erl b/src/couch_index/src/couch_index.erl
index b8bb35183..3a582051e 100644
--- a/src/couch_index/src/couch_index.erl
+++ b/src/couch_index/src/couch_index.erl
@@ -381,7 +381,7 @@ send_replies(Waiters, UpdateSeq, IdxState) ->
assert_signature_match(Mod, OldIdxState, NewIdxState) ->
case {Mod:get(signature, OldIdxState), Mod:get(signature, NewIdxState)} of
{Sig, Sig} -> ok;
- _ -> erlang:error(signature_mismatch)
+ _ -> error(signature_mismatch)
end.
commit_compacted(NewIdxState, State) ->
diff --git a/src/couch_log/src/couch_log_trunc_io.erl b/src/couch_log/src/couch_log_trunc_io.erl
index c330edb33..e365d6163 100644
--- a/src/couch_log/src/couch_log_trunc_io.erl
+++ b/src/couch_log/src/couch_log_trunc_io.erl
@@ -69,7 +69,7 @@ format(Fmt, Args, Max, Options) ->
couch_log_trunc_io_fmt:format(Fmt, Args, Max, Options)
catch
_What:_Why ->
- erlang:error(badarg, [Fmt, Args])
+ error(badarg, [Fmt, Args])
end.
%% @doc Returns an flattened list containing the ASCII representation of the given
@@ -114,7 +114,7 @@ print(Term, Max, Options) when is_list(Options) ->
print(Term, _Max, #print_options{force_strings = true}) when
not is_list(Term), not is_binary(Term), not is_atom(Term)
->
- erlang:error(badarg);
+ error(badarg);
print(_, Max, _Options) when Max < 0 -> {"...", 3};
print(_, _, #print_options{depth = 0}) ->
{"...", 3};
@@ -474,7 +474,7 @@ alist([H | T], Max, Options = #print_options{force_strings = true}) when is_bina
{[List | Final], FLen + Len}
end;
alist(_, _, #print_options{force_strings = true}) ->
- erlang:error(badarg);
+ error(badarg);
alist([H | _L], _Max, _Options) ->
throw({unprintable, H});
alist(H, _Max, _Options) ->
diff --git a/src/couch_log/src/couch_log_trunc_io_fmt.erl b/src/couch_log/src/couch_log_trunc_io_fmt.erl
index 40f3248c2..24e4d107c 100644
--- a/src/couch_log/src/couch_log_trunc_io_fmt.erl
+++ b/src/couch_log/src/couch_log_trunc_io_fmt.erl
@@ -56,10 +56,10 @@ format(FmtStr, Args, MaxLen, Opts) when is_list(FmtStr) ->
),
build2(Cs2, Count, MaxLen2 - StrLen);
false ->
- erlang:error(badarg)
+ error(badarg)
end;
format(_FmtStr, _Args, _MaxLen, _Opts) ->
- erlang:error(badarg).
+ error(badarg).
collect([$~ | Fmt0], Args0) ->
{C, Fmt1, Args1} = collect_cseq(Fmt0, Args0),
diff --git a/src/couch_log/test/eunit/couch_log_config_listener_test.erl b/src/couch_log/test/eunit/couch_log_config_listener_test.erl
index c955972ff..7177b0567 100644
--- a/src/couch_log/test/eunit/couch_log_config_listener_test.erl
+++ b/src/couch_log/test/eunit/couch_log_config_listener_test.erl
@@ -36,7 +36,7 @@ check_restart_listener() ->
{'DOWN', Ref, process, _, _} ->
?assertNot(is_process_alive(Listener1))
after ?TIMEOUT ->
- erlang:error({timeout, config_listener_mon_death})
+ error({timeout, config_listener_mon_death})
end,
NewHandler = test_util:wait(
diff --git a/src/couch_log/test/eunit/couch_log_server_test.erl b/src/couch_log/test/eunit/couch_log_server_test.erl
index df768f26e..10576fca1 100644
--- a/src/couch_log/test/eunit/couch_log_server_test.erl
+++ b/src/couch_log/test/eunit/couch_log_server_test.erl
@@ -48,7 +48,7 @@ check_can_restart() ->
receive
{'DOWN', Ref, _, _, _} -> ok
after 1000 ->
- erlang:error(timeout_restarting_couch_log_server)
+ error(timeout_restarting_couch_log_server)
end,
?assert(not is_process_alive(Pid1)),
diff --git a/src/couch_log/test/eunit/couch_log_test_util.erl b/src/couch_log/test/eunit/couch_log_test_util.erl
index 9a170bdbd..743cdf6ef 100644
--- a/src/couch_log/test/eunit/couch_log_test_util.erl
+++ b/src/couch_log/test/eunit/couch_log_test_util.erl
@@ -64,7 +64,7 @@ wait_for_config() ->
receive
couch_log_config_change_finished -> ok
after 1000 ->
- erlang:error(config_change_timeout)
+ error(config_change_timeout)
end.
with_meck(Mods, Fun) ->
@@ -119,7 +119,7 @@ disable_logs_from(Name) when is_atom(Name) ->
P when is_pid(P) ->
disable_logs_from(P);
undefined ->
- erlang:error({unknown_pid_name, Name})
+ error({unknown_pid_name, Name})
end.
last_log_key() ->
diff --git a/src/couch_mrview/src/couch_mrview_compactor.erl b/src/couch_mrview/src/couch_mrview_compactor.erl
index 28e5a9b3d..0107ab596 100644
--- a/src/couch_mrview/src/couch_mrview_compactor.erl
+++ b/src/couch_mrview/src/couch_mrview_compactor.erl
@@ -136,7 +136,7 @@ recompact(State) ->
recompact(State, recompact_retry_count()).
recompact(#mrst{db_name = DbName, idx_name = IdxName}, 0) ->
- erlang:error({exceeded_recompact_retry_count, [{db_name, DbName}, {idx_name, IdxName}]});
+ error({exceeded_recompact_retry_count, [{db_name, DbName}, {idx_name, IdxName}]});
recompact(State, RetryCount) ->
Self = self(),
link(State#mrst.fd),
diff --git a/src/couch_mrview/test/eunit/couch_mrview_compact_tests.erl b/src/couch_mrview/test/eunit/couch_mrview_compact_tests.erl
index df035c649..30e80c8e2 100644
--- a/src/couch_mrview/test/eunit/couch_mrview_compact_tests.erl
+++ b/src/couch_mrview/test/eunit/couch_mrview_compact_tests.erl
@@ -55,7 +55,7 @@ should_swap(Db) ->
receive
{'DOWN', MonRef, process, _, _} -> ok
after ?TIMEOUT ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -68,7 +68,7 @@ should_swap(Db) ->
{QPid, Count} ->
?assertEqual(1000, Count)
after ?TIMEOUT ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -100,7 +100,7 @@ should_remove(Db) ->
?assert(is_process_alive(IndexPid)),
?assert(is_process_alive(CompactorPid))
after ?TIMEOUT ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
diff --git a/src/couch_mrview/test/eunit/couch_mrview_ddoc_updated_tests.erl b/src/couch_mrview/test/eunit/couch_mrview_ddoc_updated_tests.erl
index 91b24e336..9d5628658 100644
--- a/src/couch_mrview/test/eunit/couch_mrview_ddoc_updated_tests.erl
+++ b/src/couch_mrview/test/eunit/couch_mrview_ddoc_updated_tests.erl
@@ -117,7 +117,7 @@ check_indexing_stops_on_ddoc_change(Db) ->
{QPid, Msg} ->
?assertEqual(Msg, ddoc_updated)
after ?TIMEOUT ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
diff --git a/src/couch_mrview/test/eunit/couch_mrview_purge_docs_fabric_tests.erl b/src/couch_mrview/test/eunit/couch_mrview_purge_docs_fabric_tests.erl
index 3207a3da3..f3452b55a 100644
--- a/src/couch_mrview/test/eunit/couch_mrview_purge_docs_fabric_tests.erl
+++ b/src/couch_mrview/test/eunit/couch_mrview_purge_docs_fabric_tests.erl
@@ -288,7 +288,7 @@ wait_compaction(DbName, Line) ->
end,
case test_util:wait(WaitFun, 10000) of
timeout ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, Line},
diff --git a/src/couch_mrview/test/eunit/couch_mrview_purge_docs_tests.erl b/src/couch_mrview/test/eunit/couch_mrview_purge_docs_tests.erl
index 67c26efae..c4ac9ed13 100644
--- a/src/couch_mrview/test/eunit/couch_mrview_purge_docs_tests.erl
+++ b/src/couch_mrview/test/eunit/couch_mrview_purge_docs_tests.erl
@@ -576,7 +576,7 @@ wait_compaction(DbName, Kind, Line) ->
end,
case test_util:wait(WaitFun, 10000) of
timeout ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, Line},
diff --git a/src/couch_prometheus/test/eunit/couch_prometheus_e2e_tests.erl b/src/couch_prometheus/test/eunit/couch_prometheus_e2e_tests.erl
index c33b379a8..ad7a8e081 100644
--- a/src/couch_prometheus/test/eunit/couch_prometheus_e2e_tests.erl
+++ b/src/couch_prometheus/test/eunit/couch_prometheus_e2e_tests.erl
@@ -158,7 +158,7 @@ t_starts_with_couchdb(Port) ->
{match, _} ->
ok;
nomatch ->
- erlang:error(
+ error(
{assertRegexp_failed, [
{module, ?MODULE},
{line, ?LINE},
diff --git a/src/couch_pse_tests/src/cpse_test_ref_counting.erl b/src/couch_pse_tests/src/cpse_test_ref_counting.erl
index e56321080..401353f37 100644
--- a/src/couch_pse_tests/src/cpse_test_ref_counting.erl
+++ b/src/couch_pse_tests/src/cpse_test_ref_counting.erl
@@ -82,7 +82,7 @@ start_client(Db0) ->
{waiting, Pid} ->
Pid ! go
after 1000 ->
- erlang:error(timeout)
+ error(timeout)
end,
receive
@@ -90,7 +90,7 @@ start_client(Db0) ->
couch_db:close(Db1),
ok
after 1000 ->
- erlang:error(timeout)
+ error(timeout)
end
end).
@@ -99,7 +99,7 @@ wait_client({Pid, _Ref}) ->
receive
go -> ok
after 1000 ->
- erlang:error(timeout)
+ error(timeout)
end.
close_client({Pid, Ref}) ->
@@ -108,5 +108,5 @@ close_client({Pid, Ref}) ->
{'DOWN', Ref, _, _, _} ->
ok
after 1000 ->
- erlang:error(timeout)
+ error(timeout)
end.
diff --git a/src/couch_pse_tests/src/cpse_util.erl b/src/couch_pse_tests/src/cpse_util.erl
index b5e9f32d6..3b4abd282 100644
--- a/src/couch_pse_tests/src/cpse_util.erl
+++ b/src/couch_pse_tests/src/cpse_util.erl
@@ -101,7 +101,7 @@ shutdown_db(Db) ->
{'DOWN', Ref, _, _, _} ->
ok
after ?SHUTDOWN_TIMEOUT ->
- erlang:error(database_shutdown_timeout)
+ error(database_shutdown_timeout)
end,
test_util:wait(fun() ->
case
@@ -189,7 +189,7 @@ assert_db_props(Module, Line, DbName, Props) when is_binary(DbName) ->
catch
error:{assertEqual, Props} ->
{_, Rest} = proplists:split(Props, [module, line]),
- erlang:error({assertEqual, [{module, Module}, {line, Line} | Rest]})
+ error({assertEqual, [{module, Module}, {line, Line} | Rest]})
after
couch_db:close(Db)
end;
@@ -199,7 +199,7 @@ assert_db_props(Module, Line, Db, Props) ->
catch
error:{assertEqual, Props} ->
{_, Rest} = proplists:split(Props, [module, line]),
- erlang:error({assertEqual, [{module, Module}, {line, Line} | Rest]})
+ error({assertEqual, [{module, Module}, {line, Line} | Rest]})
end.
assert_each_prop(_Db, []) ->
@@ -387,7 +387,7 @@ prep_atts(Db, [{FileName, Data} | Rest]) ->
{'DOWN', Ref, _, _, Resp} ->
Resp
after ?ATTACHMENT_WRITE_TIMEOUT ->
- erlang:error(attachment_write_timeout)
+ error(attachment_write_timeout)
end,
[Att | prep_atts(Db, Rest)].
@@ -630,9 +630,9 @@ compact(Db) ->
{'DOWN', Ref, _, _, noproc} ->
ok;
{'DOWN', Ref, _, _, Reason} ->
- erlang:error({compactor_died, Reason})
+ error({compactor_died, Reason})
after ?COMPACTOR_TIMEOUT ->
- erlang:error(compactor_timed_out)
+ error(compactor_timed_out)
end,
test_util:wait(fun() ->
diff --git a/src/couch_replicator/src/couch_replicator_api_wrap.erl b/src/couch_replicator/src/couch_replicator_api_wrap.erl
index ce22ceb64..37b1354d9 100644
--- a/src/couch_replicator/src/couch_replicator_api_wrap.erl
+++ b/src/couch_replicator/src/couch_replicator_api_wrap.erl
@@ -115,7 +115,7 @@ db_open(#httpdb{} = Db1, Create, CreateParams) ->
throw(Error);
error:Error ->
db_close(Db),
- erlang:error(Error);
+ error(Error);
exit:Error ->
db_close(Db),
erlang:exit(Error)
@@ -828,7 +828,7 @@ run_user_fun(UserFun, Arg, UserAcc, OldRef) ->
{'DOWN', Ref, process, Pid, {exit_throw, Reason}} ->
throw(Reason);
{'DOWN', Ref, process, Pid, {exit_error, Reason}} ->
- erlang:error(Reason);
+ error(Reason);
{'DOWN', Ref, process, Pid, {exit_exit, Reason}} ->
erlang:exit(Reason)
end.
@@ -844,7 +844,7 @@ restart_remote_open_doc_revs(Ref, NewRef) ->
{headers, Ref, _} ->
restart_remote_open_doc_revs(Ref, NewRef)
after 0 ->
- erlang:error({restart_open_doc_revs, NewRef})
+ error({restart_open_doc_revs, NewRef})
end.
remote_open_doc_revs_streamer_start(Parent) ->
diff --git a/src/couch_replicator/test/eunit/couch_replicator_compact_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_compact_tests.erl
index 94ad39000..c0edf2ebc 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_compact_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_compact_tests.erl
@@ -170,7 +170,7 @@ wait_target_in_sync(Source, Target) ->
wait_target_in_sync_loop(SourceDocCount, Target, 300).
wait_target_in_sync_loop(_DocCount, _TargetName, 0) ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -202,7 +202,7 @@ compare_databases(Source, Target) ->
{ok, DocT} ->
DocT;
Error ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -242,7 +242,7 @@ compact_db(Type, Db0) ->
{'DOWN', MonRef, process, CompactPid, noproc} ->
ok;
{'DOWN', MonRef, process, CompactPid, Reason} ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -258,7 +258,7 @@ compact_db(Type, Db0) ->
]}
)
after ?TIMEOUT ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -282,7 +282,7 @@ wait_for_compaction(Type, Db) ->
{error, noproc} ->
ok;
{error, Reason} ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -330,7 +330,7 @@ pause_writer(Pid) ->
{paused, Ref} ->
ok
after ?TIMEOUT_WRITER ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -346,7 +346,7 @@ resume_writer(Pid) ->
{ok, Ref} ->
ok
after ?TIMEOUT_WRITER ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -362,7 +362,7 @@ get_writer_num_docs_written(Pid) ->
{count, Ref, Count} ->
Count
after ?TIMEOUT_WRITER ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -383,7 +383,7 @@ stop_writer(Pid) ->
{'DOWN', MonRef, process, Pid, _Reason} ->
DocsWritten
after ?TIMEOUT ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
@@ -392,7 +392,7 @@ stop_writer(Pid) ->
)
end
after ?TIMEOUT_WRITER ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
diff --git a/src/couch_replicator/test/eunit/couch_replicator_error_reporting_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_error_reporting_tests.erl
index 2d6079a28..4988bb41d 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_error_reporting_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_error_reporting_tests.erl
@@ -454,7 +454,7 @@ wait_target_in_sync(Source, Target) ->
wait_target_in_sync_loop(SourceDocCount, Target, 300).
wait_target_in_sync_loop(_DocCount, _TargetName, 0) ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
diff --git a/src/couch_replicator/test/eunit/couch_replicator_httpc_pool_tests.erl b/src/couch_replicator/test/eunit/couch_replicator_httpc_pool_tests.erl
index 512d02037..c8e6d0af7 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_httpc_pool_tests.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_httpc_pool_tests.erl
@@ -120,7 +120,7 @@ get_client_worker({Pid, Ref}, ClientName) ->
{worker, Ref, Worker} ->
Worker
after ?TIMEOUT ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
diff --git a/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl b/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl
index f413e5cf4..a731a5bef 100644
--- a/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl
+++ b/src/couch_replicator/test/eunit/couch_replicator_retain_stats_between_job_runs.erl
@@ -86,7 +86,7 @@ stop_job(RepPid) ->
receive
{'DOWN', Ref, _, _, _} -> ok
after ?TIMEOUT ->
- erlang:error(timeout)
+ error(timeout)
end.
start_job() ->
@@ -187,7 +187,7 @@ wait_target_in_sync(DocCount, Target) when is_integer(DocCount) ->
wait_target_in_sync_loop(DocCount, Target, 300).
wait_target_in_sync_loop(_DocCount, _TargetName, 0) ->
- erlang:error(
+ error(
{assertion_failed, [
{module, ?MODULE},
{line, ?LINE},
diff --git a/src/custodian/src/custodian_util.erl b/src/custodian/src/custodian_util.erl
index 1a29ee7ad..baf52dff7 100644
--- a/src/custodian/src/custodian_util.erl
+++ b/src/custodian/src/custodian_util.erl
@@ -187,7 +187,7 @@ load_shards(Db, #full_doc_info{id = Id} = FDI) ->
{ok, #doc{body = {Props}}} ->
mem3_util:build_shards(Id, Props);
{not_found, _} ->
- erlang:error(database_does_not_exist, [Id])
+ error(database_does_not_exist, [Id])
end.
maybe_redirect(Nodes) ->
diff --git a/src/ddoc_cache/src/ddoc_cache_entry.erl b/src/ddoc_cache/src/ddoc_cache_entry.erl
index de9cb55cc..fb862cca9 100644
--- a/src/ddoc_cache/src/ddoc_cache_entry.erl
+++ b/src/ddoc_cache/src/ddoc_cache_entry.erl
@@ -98,7 +98,7 @@ open(Pid, Key) ->
end
catch
error:database_does_not_exist ->
- erlang:error(database_does_not_exist);
+ error(database_does_not_exist);
exit:_ ->
% Its possible that this process was evicted just
% before we tried talking to it. Just fallback
diff --git a/src/ddoc_cache/test/eunit/ddoc_cache_open_error_test.erl b/src/ddoc_cache/test/eunit/ddoc_cache_open_error_test.erl
index a92f898be..15f7461af 100644
--- a/src/ddoc_cache/test/eunit/ddoc_cache_open_error_test.erl
+++ b/src/ddoc_cache/test/eunit/ddoc_cache_open_error_test.erl
@@ -18,7 +18,7 @@
start_couch() ->
Ctx = ddoc_cache_tutil:start_couch(),
meck:expect(fabric, open_doc, fun(_, ?FOOBAR, _) ->
- erlang:error(test_kaboom)
+ error(test_kaboom)
end),
Ctx.
diff --git a/src/ddoc_cache/test/eunit/ddoc_cache_open_test.erl b/src/ddoc_cache/test/eunit/ddoc_cache_open_test.erl
index 778ef6cbb..59e7d6311 100644
--- a/src/ddoc_cache/test/eunit/ddoc_cache_open_test.erl
+++ b/src/ddoc_cache/test/eunit/ddoc_cache_open_test.erl
@@ -29,7 +29,7 @@ ddocid(_) ->
no_ddocid.
recover({deleted, _DbName}) ->
- erlang:error(database_does_not_exist);
+ error(database_does_not_exist);
recover(DbName) ->
ddoc_cache_entry_validation_funs:recover(DbName).
diff --git a/src/ddoc_cache/test/eunit/ddoc_cache_remove_test.erl b/src/ddoc_cache/test/eunit/ddoc_cache_remove_test.erl
index 3186bbd63..5a9fef023 100644
--- a/src/ddoc_cache/test/eunit/ddoc_cache_remove_test.erl
+++ b/src/ddoc_cache/test/eunit/ddoc_cache_remove_test.erl
@@ -29,7 +29,7 @@ recover(DbName) ->
<<"not_ok">> ->
{ruh, roh};
<<"error">> ->
- erlang:error(thpppt)
+ error(thpppt)
end.
start_couch() ->
diff --git a/src/ets_lru/test/ets_lru_test.erl b/src/ets_lru/test/ets_lru_test.erl
index 25a51fa9c..e76515301 100644
--- a/src/ets_lru/test/ets_lru_test.erl
+++ b/src/ets_lru/test/ets_lru_test.erl
@@ -345,7 +345,7 @@ insert_kvs(Info, LRU, Count, Limit) ->
timer:sleep(1),
case ets:info(lru_objects, Info) > Limit of
true ->
- erlang:error(exceeded_limit);
+ error(exceeded_limit);
false ->
true
end;
diff --git a/src/fabric/src/fabric.erl b/src/fabric/src/fabric.erl
index 99d370eaf..0d567ac47 100644
--- a/src/fabric/src/fabric.erl
+++ b/src/fabric/src/fabric.erl
@@ -693,7 +693,7 @@ dbname(Db) ->
couch_db:name(Db)
catch
error:badarg ->
- erlang:error({illegal_database_name, Db})
+ error({illegal_database_name, Db})
end.
%% @doc get db shard uuids
@@ -728,7 +728,7 @@ docid(DocId) ->
docs(Db, Docs) when is_list(Docs) ->
[doc(Db, D) || D <- Docs];
docs(_Db, Docs) ->
- erlang:error({illegal_docs_list, Docs}).
+ error({illegal_docs_list, Docs}).
doc(_Db, #doc{} = Doc) ->
Doc;
@@ -744,7 +744,7 @@ doc(Db0, {_} = Doc) ->
end,
couch_db:doc_from_json_obj_validate(Db, Doc);
doc(_Db, Doc) ->
- erlang:error({illegal_doc_format, Doc}).
+ error({illegal_doc_format, Doc}).
design_doc(#doc{} = DDoc) ->
DDoc;
diff --git a/src/fabric/src/fabric_db_create.erl b/src/fabric/src/fabric_db_create.erl
index b3677fa90..3f378dc73 100644
--- a/src/fabric/src/fabric_db_create.erl
+++ b/src/fabric/src/fabric_db_create.erl
@@ -223,7 +223,7 @@ db_exists_for_existing_db() ->
db_exists_for_missing_db() ->
Mock = fun(DbName) ->
- erlang:error(database_does_not_exist, [DbName])
+ error(database_does_not_exist, [DbName])
end,
meck:expect(mem3, shards, Mock),
?assertEqual(false, db_exists(<<"foobar">>)),
diff --git a/src/fabric/src/fabric_db_delete.erl b/src/fabric/src/fabric_db_delete.erl
index 6e44c6af5..5a95b0324 100644
--- a/src/fabric/src/fabric_db_delete.erl
+++ b/src/fabric/src/fabric_db_delete.erl
@@ -29,7 +29,7 @@ go(DbName, _Options) ->
{ok, accepted} ->
accepted;
{ok, not_found} ->
- erlang:error(database_does_not_exist, [DbName]);
+ error(database_does_not_exist, [DbName]);
Error ->
Error
after
diff --git a/src/fabric/src/fabric_db_update_listener.erl b/src/fabric/src/fabric_db_update_listener.erl
index 4f3c30a25..d2c3d6993 100644
--- a/src/fabric/src/fabric_db_update_listener.erl
+++ b/src/fabric/src/fabric_db_update_listener.erl
@@ -60,8 +60,8 @@ go(Parent, ParentRef, DbName, Timeout, ClientReq) ->
end,
case Resp of
{ok, _} -> ok;
- {error, Error} -> erlang:error(Error);
- Error -> erlang:error(Error)
+ {error, Error} -> error(Error);
+ Error -> error(Error)
end.
start_update_notifiers(Shards) ->
diff --git a/src/fabric/src/fabric_rpc.erl b/src/fabric/src/fabric_rpc.erl
index 86f911905..94f433a06 100644
--- a/src/fabric/src/fabric_rpc.erl
+++ b/src/fabric/src/fabric_rpc.erl
@@ -515,7 +515,7 @@ get_or_create_db(DbName, Options) ->
mem3_util:get_or_create_db_int(DbName, Options)
catch
throw:{error, missing_target} ->
- erlang:error(database_does_not_exist, [DbName])
+ error(database_does_not_exist, [DbName])
end.
get_view_cb(#mrargs{extra = Options}) ->
diff --git a/src/fabric/src/fabric_util.erl b/src/fabric/src/fabric_util.erl
index af292f761..caf9452b4 100644
--- a/src/fabric/src/fabric_util.erl
+++ b/src/fabric/src/fabric_util.erl
@@ -130,7 +130,7 @@ get_db(DbName, Options) ->
get_shard(Live, Options, Timeout, Factor).
get_shard([], _Opts, _Timeout, _Factor) ->
- erlang:error({internal_server_error, "No DB shards could be opened."});
+ error({internal_server_error, "No DB shards could be opened."});
get_shard([#shard{node = Node, name = Name} | Rest], Opts, Timeout, Factor) ->
Mon = rexi_monitor:start([rexi_utils:server_pid(Node)]),
MFA = {fabric_rpc, open_shard, [Name, [{timeout, Timeout} | Opts]]},
@@ -408,7 +408,7 @@ isolate(Fun, Timeout) ->
after Timeout ->
erlang:demonitor(Ref, [flush]),
exit(Pid, kill),
- erlang:error(timeout)
+ error(timeout)
end.
do_isolate(Fun) ->
diff --git a/src/mango/src/mango_selector.erl b/src/mango/src/mango_selector.erl
index 42031b756..9c5b7a96f 100644
--- a/src/mango/src/mango_selector.erl
+++ b/src/mango/src/mango_selector.erl
@@ -563,7 +563,7 @@ match({[{Field, Cond}]}, Value, Cmp) ->
match(Cond, SubValue, Cmp)
end;
match({[_, _ | _] = _Props} = Sel, _Value, _Cmp) ->
- erlang:error({unnormalized_selector, Sel}).
+ error({unnormalized_selector, Sel}).
% Returns true if Selector requires all
% fields in RequiredFields to exist in any matching documents.
diff --git a/src/mango/src/mango_selector_text.erl b/src/mango/src/mango_selector_text.erl
index dec6ed1bc..fc30a57b6 100644
--- a/src/mango/src/mango_selector_text.erl
+++ b/src/mango/src/mango_selector_text.erl
@@ -214,7 +214,7 @@ convert(Path, Val) when is_binary(Val); is_number(Val); is_boolean(Val) ->
{op_field, {make_field(Path, Val), value_str(Val)}};
% Anything else is a bad selector.
convert(_Path, {Props} = Sel) when length(Props) > 1 ->
- erlang:error({unnormalized_selector, Sel}).
+ error({unnormalized_selector, Sel}).
to_query_nested(Args) ->
QueryArgs = lists:map(fun to_query/1, Args),
diff --git a/src/mango/src/mango_util.erl b/src/mango/src/mango_util.erl
index 32d75000b..bceb7c510 100644
--- a/src/mango/src/mango_util.erl
+++ b/src/mango/src/mango_util.erl
@@ -121,7 +121,7 @@ defer(Mod, Fun, Args) ->
{'DOWN', Ref, process, Pid, {mango_defer_throw, Value}} ->
erlang:throw(Value);
{'DOWN', Ref, process, Pid, {mango_defer_error, Value}} ->
- erlang:error(Value);
+ error(Value);
{'DOWN', Ref, process, Pid, {mango_defer_exit, Value}} ->
erlang:exit(Value)
end.
diff --git a/src/mem3/src/mem3.erl b/src/mem3/src/mem3.erl
index ddd507210..b7998c8c4 100644
--- a/src/mem3/src/mem3.erl
+++ b/src/mem3/src/mem3.erl
@@ -265,7 +265,7 @@ choose_shards(DbName, Nodes, Options) ->
Suffix = couch_util:get_value(shard_suffix, Options, ""),
N = mem3_util:n_val(couch_util:get_value(n, Options), NodeCount),
if
- N =:= 0 -> erlang:error(no_nodes_in_zone);
+ N =:= 0 -> error(no_nodes_in_zone);
true -> ok
end,
Q = mem3_util:q_val(
@@ -315,7 +315,7 @@ dbname(DbName) when is_list(DbName) ->
dbname(DbName) when is_binary(DbName) ->
DbName;
dbname(_) ->
- erlang:error(badarg).
+ error(badarg).
%% @doc Determine if DocId belongs in shard (identified by record or filename)
belongs(#shard{} = Shard, DocId) when is_binary(DocId) ->
diff --git a/src/mem3/src/mem3_reshard_job.erl b/src/mem3/src/mem3_reshard_job.erl
index d79288e3b..aaacea3c9 100644
--- a/src/mem3/src/mem3_reshard_job.erl
+++ b/src/mem3/src/mem3_reshard_job.erl
@@ -180,7 +180,7 @@ set_start_state(#job{split_state = State} = Job) ->
undefined ->
Fmt1 = "~p recover : unknown state ~s",
couch_log:error(Fmt1, [?MODULE, jobfmt(Job)]),
- erlang:error({invalid_split_job_recover_state, Job});
+ error({invalid_split_job_recover_state, Job});
StartState ->
Job#job{split_state = StartState}
end.
@@ -371,7 +371,7 @@ parent() ->
handle_unknown_msg(Job, When, RMsg) ->
LogMsg = "~p ~s received an unknown message ~p when in ~s",
couch_log:error(LogMsg, [?MODULE, jobfmt(Job), RMsg, When]),
- erlang:error({invalid_split_job_message, Job#job.id, When, RMsg}).
+ error({invalid_split_job_message, Job#job.id, When, RMsg}).
initial_copy(#job{} = Job) ->
Pid = spawn_link(?MODULE, initial_copy_impl, [Job]),
@@ -552,7 +552,7 @@ check_state(#job{split_state = State} = Job) ->
true ->
Job;
false ->
- erlang:error({invalid_shard_split_state, State, Job})
+ error({invalid_shard_split_state, State, Job})
end.
create_artificial_mem3_rep_checkpoints(#job{} = Job, Seq) ->
@@ -665,7 +665,7 @@ reset_target(#job{source = Source, target = Targets} = Job) ->
% Should never get here but if we do crash and don't continue
LogMsg = "~p : ~p target unexpectedly found in shard map ~p",
couch_log:error(LogMsg, [?MODULE, jobfmt(Job), Name]),
- erlang:error({target_present_in_shard_map, Name});
+ error({target_present_in_shard_map, Name});
{true, false} ->
LogMsg = "~p : ~p resetting ~p target",
couch_log:warning(LogMsg, [?MODULE, jobfmt(Job), Name]),
diff --git a/src/mem3/src/mem3_rpc.erl b/src/mem3/src/mem3_rpc.erl
index 70fc797da..3c5ed95be 100644
--- a/src/mem3/src/mem3_rpc.erl
+++ b/src/mem3/src/mem3_rpc.erl
@@ -382,11 +382,11 @@ rexi_call(Node, MFA, Timeout) ->
{Ref, {ok, Reply}} ->
Reply;
{Ref, Error} ->
- erlang:error(Error);
+ error(Error);
{rexi_DOWN, Mon, _, Reason} ->
- erlang:error({rexi_DOWN, {Node, Reason}})
+ error({rexi_DOWN, {Node, Reason}})
after Timeout ->
- erlang:error(timeout)
+ error(timeout)
end
after
rexi_monitor:stop(Mon)
diff --git a/src/mem3/src/mem3_shards.erl b/src/mem3/src/mem3_shards.erl
index 6f996d4d4..8112ac5cb 100644
--- a/src/mem3/src/mem3_shards.erl
+++ b/src/mem3/src/mem3_shards.erl
@@ -460,7 +460,7 @@ load_from_db(ShardDb, DbName) ->
end,
{Shards, DbOpts};
{not_found, _} ->
- erlang:error(database_does_not_exist, [DbName])
+ error(database_does_not_exist, [DbName])
end.
load_shards_from_disk(DbName, HashKey) ->
diff --git a/src/mem3/test/eunit/mem3_reshard_changes_feed_test.erl b/src/mem3/test/eunit/mem3_reshard_changes_feed_test.erl
index 1f6f89f8a..195958f3b 100644
--- a/src/mem3/test/eunit/mem3_reshard_changes_feed_test.erl
+++ b/src/mem3/test/eunit/mem3_reshard_changes_feed_test.erl
@@ -232,7 +232,7 @@ continuous_feed_should_work_during_split(#{db1 := Db}) ->
{'DOWN', UpdaterRef, process, UpdaterPid, normal} ->
ok;
{'DOWN', UpdaterRef, process, UpdaterPid, Error} ->
- erlang:error(
+ error(
{test_context_failed, [
{module, ?MODULE},
{line, ?LINE},
diff --git a/src/rexi/src/rexi.erl b/src/rexi/src/rexi.erl
index 02d3a9e55..99333c02f 100644
--- a/src/rexi/src/rexi.erl
+++ b/src/rexi/src/rexi.erl
@@ -275,7 +275,7 @@ wait_for_ack(Count, Timeout) ->
end.
drain_acks(Count) when Count < 0 ->
- erlang:error(mismatched_rexi_ack);
+ error(mismatched_rexi_ack);
drain_acks(Count) ->
receive
{rexi_ack, N} -> drain_acks(Count - N)
diff --git a/src/rexi/src/rexi_server_mon.erl b/src/rexi/src/rexi_server_mon.erl
index 870b79612..7049cfa21 100644
--- a/src/rexi/src/rexi_server_mon.erl
+++ b/src/rexi/src/rexi_server_mon.erl
@@ -152,7 +152,7 @@ start_server(ChildMod, ChildId) ->
{ok, Pid} ->
{ok, Pid};
Else ->
- erlang:error(Else)
+ error(Else)
end.
stop_server(ChildMod, ChildId) ->
diff --git a/src/weatherreport/src/weatherreport_getopt.erl b/src/weatherreport/src/weatherreport_getopt.erl
index 736112630..c66f8e085 100644
--- a/src/weatherreport/src/weatherreport_getopt.erl
+++ b/src/weatherreport/src/weatherreport_getopt.erl
@@ -423,7 +423,7 @@ to_type(boolean, Arg) ->
true ->
false;
false ->
- erlang:error(badarg)
+ error(badarg)
end
end;
to_type(_Type, Arg) ->