You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by ga...@apache.org on 2021/01/18 12:37:43 UTC
[couchdb] branch main updated (b2a34dc -> 053595c)
This is an automated email from the ASF dual-hosted git repository.
garren pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git.
from b2a34dc Update README.md
new 94c5fe0 remove {restart_tx, true} from mango _all_docs
new 053595c add http error for fdb 1031
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
src/chttpd/src/chttpd.erl | 5 +++++
src/mango/src/mango_cursor_view.erl | 3 +--
2 files changed, 6 insertions(+), 2 deletions(-)
[couchdb] 02/02: add http error for fdb 1031
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 053595cf9b536801e8bd39dd54f6526f463dfdb9
Author: Garren Smith <ga...@gmail.com>
AuthorDate: Mon Jan 18 14:03:22 2021 +0200
add http error for fdb 1031
---
src/chttpd/src/chttpd.erl | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/src/chttpd/src/chttpd.erl b/src/chttpd/src/chttpd.erl
index 636aad9..0c5e272 100644
--- a/src/chttpd/src/chttpd.erl
+++ b/src/chttpd/src/chttpd.erl
@@ -364,6 +364,8 @@ catch_error(HttpReq, error, not_ciphertext) ->
send_error(HttpReq, not_ciphertext);
catch_error(HttpReq, error, {erlfdb_error, 2101}) ->
send_error(HttpReq, transaction_too_large);
+catch_error(HttpReq, error, {erlfdb_error, 1031}) ->
+ send_error(HttpReq, transaction_timeout);
catch_error(HttpReq, Tag, Error) ->
Stack = erlang:get_stacktrace(),
% TODO improve logging and metrics collection for client disconnects
@@ -999,6 +1001,9 @@ error_info({doc_validation, Reason}) ->
{400, <<"doc_validation">>, Reason};
error_info({invalid_since_seq, Reason}) ->
{400, <<"invalid_since_seq">>, Reason};
+error_info(transaction_timeout) ->
+ {408, <<"transaction_timeout">>,
+ <<"The request transaction timed out" >>};
error_info({missing_stub, Reason}) ->
{412, <<"missing_stub">>, Reason};
error_info(request_entity_too_large) ->
[couchdb] 01/02: remove {restart_tx, true} from mango _all_docs
Posted by ga...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
garren pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 94c5fe0b713958b9472cbee7f644da09d1b54408
Author: Garren Smith <ga...@gmail.com>
AuthorDate: Mon Jan 18 14:03:02 2021 +0200
remove {restart_tx, true} from mango _all_docs
---
src/mango/src/mango_cursor_view.erl | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/mango/src/mango_cursor_view.erl b/src/mango/src/mango_cursor_view.erl
index 411f4af..43a59ff 100644
--- a/src/mango/src/mango_cursor_view.erl
+++ b/src/mango/src/mango_cursor_view.erl
@@ -137,8 +137,7 @@ execute(#cursor{db = Db, index = Idx, execution_stats = Stats} = Cursor0, UserFu
Result = case mango_idx:def(Idx) of
all_docs ->
CB = fun ?MODULE:handle_all_docs_message/2,
- AllDocOpts = fabric2_util:all_docs_view_opts(Args)
- ++ [{restart_tx, true}],
+ AllDocOpts = fabric2_util:all_docs_view_opts(Args),
fabric2_db:fold_docs(Db, CB, Cursor, AllDocOpts);
_ ->
CB = fun ?MODULE:handle_message/2,