[couchdb] branch prototype/fdb-layer updated: Fix mango erlfdb error catch clause erlfdb -> erlfdb_error

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch prototype/fdb-layer
in repository https://gitbox.apache.org/repos/asf/couchdb.git


The following commit(s) were added to refs/heads/prototype/fdb-layer by this push:
     new ef4cfb4  Fix mango erlfdb error catch clause erlfdb -> erlfdb_error
ef4cfb4 is described below

commit ef4cfb447c2835dd45139dc9eaded361bb87ced6
Author: Nick Vatamaniuc <va...@apache.org>
AuthorDate: Thu May 28 15:16:18 2020 -0400

    Fix mango erlfdb error catch clause erlfdb -> erlfdb_error
---
 src/couch_views/src/couch_views_updater.erl       | 5 +++--
 src/couch_views/test/couch_views_updater_test.erl | 6 +++---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/couch_views/src/couch_views_updater.erl b/src/couch_views/src/couch_views_updater.erl
index a87fab1..ba9fadb 100644
--- a/src/couch_views/src/couch_views_updater.erl
+++ b/src/couch_views/src/couch_views_updater.erl
@@ -31,11 +31,12 @@ index(Db, #doc{id = Id, revs = Revs} = Doc, _NewWinner, _OldWinner, NewRevId,
             index_int(Db, Doc, Seq)
         end
     catch
-        error:{erlfdb, ErrCode} when is_integer(ErrCode) ->
+        error:{erlfdb_error, ErrCode} when is_integer(ErrCode) ->
+            Stack = erlang:get_stacktrace(),
             DbName = fabric2_db:name(Db),
             couch_log:error("Mango index erlfdb error Db ~s Doc ~p ~p",
                 [DbName, Id, ErrCode]),
-            erlang:raise(error, {erlfdb, ErrCode}, erlang:get_stacktrace());
+            erlang:raise(error, {erlfdb_error, ErrCode}, Stack);
         Error:Reason ->
             DbName = fabric2_db:name(Db),
             couch_log:error("Mango index error for Db ~s Doc ~p ~p ~p",
diff --git a/src/couch_views/test/couch_views_updater_test.erl b/src/couch_views/test/couch_views_updater_test.erl
index 0dfc574..89c341a 100644
--- a/src/couch_views/test/couch_views_updater_test.erl
+++ b/src/couch_views/test/couch_views_updater_test.erl
@@ -36,7 +36,7 @@ indexer_test_() ->
                     ?TDEF_FE(update_doc),
                     ?TDEF_FE(delete_doc),
                     ?TDEF_FE(includes_design_docs),
-                    ?TDEF_FE(handle_erlfdb_errors)
+                    ?TDEF_FE(handle_erlfdb_errors, 15)
                 ]
             }
         }
@@ -136,9 +136,9 @@ includes_design_docs({Db, _}) ->
 
 handle_erlfdb_errors({Db, _}) ->
     meck:expect(couch_views_fdb, write_doc, fun(_, _, _, _) ->
-        error({erlfdb, 1009})
+        error({erlfdb_error, 1009})
     end),
-    ?assertError({erlfdb, 1009}, fabric2_db:update_docs(Db, [doc(4)])).
+    ?assertError({erlfdb_error, 1009}, fabric2_db:update_docs(Db, [doc(4)])).
 
 
 run_query(Db, DDoc) ->