You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2026/04/22 14:26:22 UTC

(couchdb) branch find-threshold updated (24a54fa94 -> c1bf94f75)

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

rnewson pushed a change to branch find-threshold
in repository https://gitbox.apache.org/repos/asf/couchdb.git


 discard 24a54fa94 fixes _find when over threshold
     new c1bf94f75 fixes _find when over threshold

This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version.  This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:

 * -- * -- B -- O -- O -- O   (24a54fa94)
            \
             N -- N -- N   refs/heads/find-threshold (c1bf94f75)

You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.

Any revisions marked "omit" are not gone; other references still
refer to them.  Any revisions marked "discard" are gone forever.

The 1 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:
 mise.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


(couchdb) 01/01: fixes _find when over threshold

Posted by rn...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

rnewson pushed a commit to branch find-threshold
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit c1bf94f7559334dba290abecc7755701e53290ca
Author: Robert Newson <rn...@apache.org>
AuthorDate: Wed Apr 22 15:25:20 2026 +0100

    fixes _find when over threshold
    
    fixed a typo also
    
    closes https://github.com/apache/couchdb/issues/5977
---
 mise.toml                           | 4 ++--
 src/chttpd/src/chttpd.erl           | 2 +-
 src/mango/src/mango_cursor_view.erl | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/mise.toml b/mise.toml
index 677d203bb..1942eadf6 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,6 +1,6 @@
 [tools]
-elixir = "1.19.5-otp-28"
-erlang = "28"
+elixir = "1.19.5-otp-26"
+erlang = '26'
 java = '21'
 nodejs = '24'
 python = '3'
diff --git a/src/chttpd/src/chttpd.erl b/src/chttpd/src/chttpd.erl
index 57a3aeaea..485e012c2 100644
--- a/src/chttpd/src/chttpd.erl
+++ b/src/chttpd/src/chttpd.erl
@@ -1189,7 +1189,7 @@ error_info(timeout) ->
 error_info({service_unavailable, Reason}) ->
     {503, <<"service unavailable">>, Reason};
 error_info({insufficient_storage, Reason}) ->
-    {507, <<"insufficent_storage">>, Reason};
+    {507, <<"insufficient_storage">>, Reason};
 error_info({timeout, _Reason}) ->
     error_info(timeout);
 error_info({'EXIT', {Error, _Stack}}) ->
diff --git a/src/mango/src/mango_cursor_view.erl b/src/mango/src/mango_cursor_view.erl
index b496961f6..38bdaf6f9 100644
--- a/src/mango/src/mango_cursor_view.erl
+++ b/src/mango/src/mango_cursor_view.erl
@@ -460,6 +460,8 @@ view_cb(complete, #mrargs{extra = Options} = Acc) ->
     % Finish view output
     ok = rexi:stream_last(complete),
     {ok, Acc};
+view_cb(ok, insufficient_storage) ->
+    rexi:reply({ok, insufficient_storage});
 view_cb(ok, ddoc_updated) ->
     rexi:reply({ok, ddoc_updated}).