[couchdb] branch prototype/fdb-layer updated (452ce75 -> 9fd2010)
This is an automated email from the ASF dual-hosted git repository. rnewson pushed a change to branch prototype/fdb-layer in repository https://gitbox.apache.org/repos/asf/couchdb.git. from 452ce75 Do not use (catch ...) in couch_views_reader:load_docs/4 add 46222f4 Don't log client disconnects new 9fd2010 Merge pull request #3092 from apache/dont-log-client-disconnects 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: src/chttpd/src/chttpd.erl | 2 ++ 1 file changed, 2 insertions(+)
[couchdb] 01/01: Merge pull request #3092 from apache/dont-log-client-disconnects
This is an automated email from the ASF dual-hosted git repository. rnewson pushed a commit to branch prototype/fdb-layer in repository https://gitbox.apache.org/repos/asf/couchdb.git commit 9fd20109a5e7b73e9fd8f561418f50f38722714f Merge: 452ce75 46222f4 Author: Robert Newson AuthorDate: Thu Aug 20 21:35:33 2020 +0100 Merge pull request #3092 from apache/dont-log-client-disconnects Don't log client disconnects src/chttpd/src/chttpd.erl | 2 ++ 1 file changed, 2 insertions(+)
[couchdb] branch prototype/fdb-layer updated: Do not use (catch ...) in couch_views_reader:load_docs/4
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 452ce75 Do not use (catch ...) in couch_views_reader:load_docs/4
452ce75 is described below
commit 452ce75350de652a462a9c633844cfb37672fda1
Author: Nick Vatamaniuc
AuthorDate: Thu Aug 20 15:36:38 2020 -0400
Do not use (catch ...) in couch_views_reader:load_docs/4
Any error there would just be generating a case clause.
Remove the `{not_found, missing}` clause since it was accidentally matching
on
the Rev string and the case was included in the `_Else` clause anyway.
---
src/couch_views/src/couch_views_reader.erl | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/couch_views/src/couch_views_reader.erl
b/src/couch_views/src/couch_views_reader.erl
index ce7f163..61a78d7 100644
--- a/src/couch_views/src/couch_views_reader.erl
+++ b/src/couch_views/src/couch_views_reader.erl
@@ -210,8 +210,7 @@ load_doc(TxDb, Id, null, DocOpts) ->
load_doc(TxDb, Id, Rev, DocOpts) ->
Rev1 = couch_doc:parse_rev(Rev),
-case (catch fabric2_db:open_doc_revs(TxDb, Id, [Rev1], DocOpts)) of
+case fabric2_db:open_doc_revs(TxDb, Id, [Rev1], DocOpts) of
{ok, [{ok, Doc}]} -> couch_doc:to_json_obj(Doc, DocOpts);
-{ok, [{{not_found, missing}, Rev}]} -> null;
{ok, [_Else]} -> null
end.
[couchdb] branch do_not_use_catch_in_view_load_doc updated (f331a13 -> 7fffc33)
This is an automated email from the ASF dual-hosted git repository. vatamane pushed a change to branch do_not_use_catch_in_view_load_doc in repository https://gitbox.apache.org/repos/asf/couchdb.git. discard f331a13 Do not use (catch ...) in couch_views_reader:load_docs/4 add 7fffc33 Do not use (catch ...) in couch_views_reader:load_docs/4 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 (f331a13) \ N -- N -- N refs/heads/do_not_use_catch_in_view_load_doc (7fffc33) 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. No new revisions were added by this update. Summary of changes:
[couchdb] branch do_not_use_catch_in_view_load_doc updated (0fe3f81 -> f331a13)
This is an automated email from the ASF dual-hosted git repository. vatamane pushed a change to branch do_not_use_catch_in_view_load_doc in repository https://gitbox.apache.org/repos/asf/couchdb.git. discard 0fe3f81 Do not use (catch ...) in couch_views_reader:load_docs/4 add f331a13 Do not use (catch ...) in couch_views_reader:load_docs/4 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 (0fe3f81) \ N -- N -- N refs/heads/do_not_use_catch_in_view_load_doc (f331a13) 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. No new revisions were added by this update. Summary of changes: src/couch_views/src/couch_views_reader.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[couchdb] branch dont-log-client-disconnects updated (25428e4 -> 46222f4)
This is an automated email from the ASF dual-hosted git repository. rnewson pushed a change to branch dont-log-client-disconnects in repository https://gitbox.apache.org/repos/asf/couchdb.git. discard 25428e4 Don't log client disconnects add 46222f4 Don't log client disconnects 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 (25428e4) \ N -- N -- N refs/heads/dont-log-client-disconnects (46222f4) 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. No new revisions were added by this update. Summary of changes: src/chttpd/src/chttpd.erl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
[couchdb] 01/01: Do not use (catch ...) in couch_views_reader:load_docs/4
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch do_not_use_catch_in_view_load_doc
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 0fe3f81654a83d5ee39cb195dbdf9d31ecc18a94
Author: Nick Vatamaniuc
AuthorDate: Thu Aug 20 15:36:38 2020 -0400
Do not use (catch ...) in couch_views_reader:load_docs/4
Any error there would just be generating a case clause.
Remove the `_Else` catch-all clause too, as `open_doc_revs/4` should return
a
list of just one item that is either `{ok, Doc}` or `{{not_found,
missing},Rev}`. That's because it is called with just a single `[Rev1]`
parameter
and views `#mrargs` can't have the `latest` doc_options option.
References:
*
[fabric2_db:open_doc_revs/4](https://github.com/apache/couchdb/blob/prototype/fdb-layer/src/fabric/src/fabric2_db.erl#L684-L691)
*
[couch_mrview_http](https://github.com/apache/couchdb/blob/prototype/fdb-layer/src/couch_mrview/src/couch_mrview_http.erl#L491)
---
src/couch_views/src/couch_views_reader.erl | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/couch_views/src/couch_views_reader.erl
b/src/couch_views/src/couch_views_reader.erl
index ce7f163..141cf94 100644
--- a/src/couch_views/src/couch_views_reader.erl
+++ b/src/couch_views/src/couch_views_reader.erl
@@ -210,8 +210,7 @@ load_doc(TxDb, Id, null, DocOpts) ->
load_doc(TxDb, Id, Rev, DocOpts) ->
Rev1 = couch_doc:parse_rev(Rev),
-case (catch fabric2_db:open_doc_revs(TxDb, Id, [Rev1], DocOpts)) of
+case fabric2_db:open_doc_revs(TxDb, Id, [Rev1], DocOpts) of
{ok, [{ok, Doc}]} -> couch_doc:to_json_obj(Doc, DocOpts);
-{ok, [{{not_found, missing}, Rev}]} -> null;
-{ok, [_Else]} -> null
+{ok, [{{not_found, missing}, Rev}]} -> null
end.
[couchdb] branch do_not_use_catch_in_view_load_doc updated (ecc4f42 -> 0fe3f81)
This is an automated email from the ASF dual-hosted git repository. vatamane pushed a change to branch do_not_use_catch_in_view_load_doc in repository https://gitbox.apache.org/repos/asf/couchdb.git. discard ecc4f42 Do not use (catch ...) in couch_views_reader:load_docs/4 new 0fe3f81 Do not use (catch ...) in couch_views_reader:load_docs/4 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 (ecc4f42) \ N -- N -- N refs/heads/do_not_use_catch_in_view_load_doc (0fe3f81) 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:
[couchdb] 01/01: Do not use (catch ...) in couch_views_reader:load_docs/4
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch do_not_use_catch_in_view_load_doc
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit ecc4f422214028def3b1e0dade3632c3732273f4
Author: Nick Vatamaniuc
AuthorDate: Thu Aug 20 15:36:38 2020 -0400
Do not use (catch ...) in couch_views_reader:load_docs/4
Any error there would just be generating a case clause.
Remove the `_Else` catch-all clause too as `open_doc_revs/4` should return a
list of just one item that is either `{ok, Doc}` or `{{not_found, missing},
Rev}`. That's because it is called with just single [Rev1] parameter and
view
`#mrargs` can't have the `latest` doc_options option present [1].
[1]
https://github.com/apache/couchdb/blob/prototype/fdb-layer/src/couch_mrview/src/couch_mrview_http.erl#L491
---
src/couch_views/src/couch_views_reader.erl | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/couch_views/src/couch_views_reader.erl
b/src/couch_views/src/couch_views_reader.erl
index ce7f163..141cf94 100644
--- a/src/couch_views/src/couch_views_reader.erl
+++ b/src/couch_views/src/couch_views_reader.erl
@@ -210,8 +210,7 @@ load_doc(TxDb, Id, null, DocOpts) ->
load_doc(TxDb, Id, Rev, DocOpts) ->
Rev1 = couch_doc:parse_rev(Rev),
-case (catch fabric2_db:open_doc_revs(TxDb, Id, [Rev1], DocOpts)) of
+case fabric2_db:open_doc_revs(TxDb, Id, [Rev1], DocOpts) of
{ok, [{ok, Doc}]} -> couch_doc:to_json_obj(Doc, DocOpts);
-{ok, [{{not_found, missing}, Rev}]} -> null;
-{ok, [_Else]} -> null
+{ok, [{{not_found, missing}, Rev}]} -> null
end.
[couchdb] branch do_not_use_catch_in_view_load_doc created (now ecc4f42)
This is an automated email from the ASF dual-hosted git repository. vatamane pushed a change to branch do_not_use_catch_in_view_load_doc in repository https://gitbox.apache.org/repos/asf/couchdb.git. at ecc4f42 Do not use (catch ...) in couch_views_reader:load_docs/4 This branch includes the following new commits: new ecc4f42 Do not use (catch ...) in couch_views_reader:load_docs/4 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.
[couchdb] branch 3.x updated: Handle jiffy returning an iolist when encoding atts_since query string
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch 3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
The following commit(s) were added to refs/heads/3.x by this push:
new 02e7157 Handle jiffy returning an iolist when encoding atts_since
query string
02e7157 is described below
commit 02e7157d47ebd508929e03b5e4b6385a9636464a
Author: Nick Vatamaniuc
AuthorDate: Thu Aug 20 11:57:56 2020 -0400
Handle jiffy returning an iolist when encoding atts_since query string
If we don't handle it, it throws an error when trying to encode the full URL
string, for example:
```
badarg,[
{mochiweb_util,quote_plus,2,[{file,"src/mochiweb_util.erl"},{line,192}]},
{couch_replicator_httpc,query_args_to_string,2,[{file,"src/couch_replicator_httpc.erl"},{line,421}]},
{couch_replicator_httpc,full_url,2,[{file,"src/couch_replicator_httpc.erl"},{line,413}]},
{couch_replicator_api_wrap,open_doc_revs,6,[{file,"src/couch_replicator_api_wrap.erl"},{line,255}]}
]
```
This is also similar to what we did for open_revs encoding:
https://github.com/apache/couchdb/commit/a2d0c4290dde2015e5fb6184696fec3f89c81a4b
---
src/couch_replicator/src/couch_replicator_api_wrap.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/couch_replicator/src/couch_replicator_api_wrap.erl
b/src/couch_replicator/src/couch_replicator_api_wrap.erl
index a21de42..8dc7f2f 100644
--- a/src/couch_replicator/src/couch_replicator_api_wrap.erl
+++ b/src/couch_replicator/src/couch_replicator_api_wrap.erl
@@ -546,7 +546,7 @@ options_to_query_args(HttpDb, Path, Options0) ->
length("GET " ++ FullUrl ++ " HTTP/1.1\r\n") +
length("&atts_since=") + 6, % +6 = % encoded [ and ]
PAs, MaxLen, []),
-[{"atts_since", ?JSON_ENCODE(RevList)} | QueryArgs1]
+[{"atts_since", ?b2l(iolist_to_binary(?JSON_ENCODE(RevList)))} |
QueryArgs1]
end.
[couchdb] branch dont-log-client-disconnects updated (e5ee8d6 -> 25428e4)
This is an automated email from the ASF dual-hosted git repository. rnewson pushed a change to branch dont-log-client-disconnects in repository https://gitbox.apache.org/repos/asf/couchdb.git. discard e5ee8d6 Don't log client disconnects add 25428e4 Don't log client disconnects 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 (e5ee8d6) \ N -- N -- N refs/heads/dont-log-client-disconnects (25428e4) 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. No new revisions were added by this update. Summary of changes: src/chttpd/src/chttpd.erl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[couchdb] 01/01: Don't log client disconnects
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch dont-log-client-disconnects
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit e5ee8d6179aac126e782fea47f11805e5dee31aa
Author: Robert Newson
AuthorDate: Thu Aug 20 20:01:52 2020 +0100
Don't log client disconnects
---
src/chttpd/src/chttpd.erl | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/chttpd/src/chttpd.erl b/src/chttpd/src/chttpd.erl
index 5a3e3fa..6ac1275 100644
--- a/src/chttpd/src/chttpd.erl
+++ b/src/chttpd/src/chttpd.erl
@@ -1187,6 +1187,8 @@ maybe_decompress(Httpd, Body) ->
log_error_with_stack_trace({bad_request, _, _}) ->
ok;
+log_error_with_stack_trace({<<"unknown_error">>,<<"normal">>, _}) ->
+ok;
log_error_with_stack_trace({Error, Reason, Stack}) ->
EFmt = if is_binary(Error) -> "~s"; true -> "~w" end,
RFmt = if is_binary(Reason) -> "~s"; true -> "~w" end,
[couchdb] branch dont-log-client-disconnects created (now e5ee8d6)
This is an automated email from the ASF dual-hosted git repository. rnewson pushed a change to branch dont-log-client-disconnects in repository https://gitbox.apache.org/repos/asf/couchdb.git. at e5ee8d6 Don't log client disconnects This branch includes the following new commits: new e5ee8d6 Don't log client disconnects 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.
[couchdb] branch handle-jiffy-iolist-reponse-in-atts-since-3.x created (now b8e3c3e)
This is an automated email from the ASF dual-hosted git repository. vatamane pushed a change to branch handle-jiffy-iolist-reponse-in-atts-since-3.x in repository https://gitbox.apache.org/repos/asf/couchdb.git. at b8e3c3e Handle jiffy returning an iolist when encoding atts_since query string This branch includes the following new commits: new b8e3c3e Handle jiffy returning an iolist when encoding atts_since query string 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.
[couchdb] 01/01: Handle jiffy returning an iolist when encoding atts_since query string
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch handle-jiffy-iolist-reponse-in-atts-since-3.x
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit b8e3c3e18f9ed08e6ddfb124ee9459f49ae40dc6
Author: Nick Vatamaniuc
AuthorDate: Thu Aug 20 11:57:56 2020 -0400
Handle jiffy returning an iolist when encoding atts_since query string
If we don't handle it, it throws an error when trying to encode the full URL
string, for example:
```
badarg,[
{mochiweb_util,quote_plus,2,[{file,"src/mochiweb_util.erl"},{line,192}]},
{couch_replicator_httpc,query_args_to_string,2,[{file,"src/couch_replicator_httpc.erl"},{line,421}]},
{couch_replicator_httpc,full_url,2,[{file,"src/couch_replicator_httpc.erl"},{line,413}]},
{couch_replicator_api_wrap,open_doc_revs,6,[{file,"src/couch_replicator_api_wrap.erl"},{line,255}]}
]
```
This is also similar to what we did for open_revs encoding:
https://github.com/apache/couchdb/commit/a2d0c4290dde2015e5fb6184696fec3f89c81a4b
---
src/couch_replicator/src/couch_replicator_api_wrap.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/couch_replicator/src/couch_replicator_api_wrap.erl
b/src/couch_replicator/src/couch_replicator_api_wrap.erl
index a21de42..8dc7f2f 100644
--- a/src/couch_replicator/src/couch_replicator_api_wrap.erl
+++ b/src/couch_replicator/src/couch_replicator_api_wrap.erl
@@ -546,7 +546,7 @@ options_to_query_args(HttpDb, Path, Options0) ->
length("GET " ++ FullUrl ++ " HTTP/1.1\r\n") +
length("&atts_since=") + 6, % +6 = % encoded [ and ]
PAs, MaxLen, []),
-[{"atts_since", ?JSON_ENCODE(RevList)} | QueryArgs1]
+[{"atts_since", ?b2l(iolist_to_binary(?JSON_ENCODE(RevList)))} |
QueryArgs1]
end.
[couchdb] branch master updated: Handle jiffy returning an iolist when encoding atts_since query string
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git
The following commit(s) were added to refs/heads/master by this push:
new bdfb129 Handle jiffy returning an iolist when encoding atts_since
query string
bdfb129 is described below
commit bdfb129c1242e26cf312d2bc5cf1fe3af2e1e56d
Author: Nick Vatamaniuc
AuthorDate: Thu Aug 20 11:57:56 2020 -0400
Handle jiffy returning an iolist when encoding atts_since query string
If we don't handle it, it throws an error when trying to encode the full URL
string, for example:
```
badarg,[
{mochiweb_util,quote_plus,2,[{file,"src/mochiweb_util.erl"},{line,192}]},
{couch_replicator_httpc,query_args_to_string,2,[{file,"src/couch_replicator_httpc.erl"},{line,421}]},
{couch_replicator_httpc,full_url,2,[{file,"src/couch_replicator_httpc.erl"},{line,413}]},
{couch_replicator_api_wrap,open_doc_revs,6,[{file,"src/couch_replicator_api_wrap.erl"},{line,255}]}
]
```
This is also similar to what we did for open_revs encoding:
https://github.com/apache/couchdb/commit/a2d0c4290dde2015e5fb6184696fec3f89c81a4b
---
src/couch_replicator/src/couch_replicator_api_wrap.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/couch_replicator/src/couch_replicator_api_wrap.erl
b/src/couch_replicator/src/couch_replicator_api_wrap.erl
index a21de42..8dc7f2f 100644
--- a/src/couch_replicator/src/couch_replicator_api_wrap.erl
+++ b/src/couch_replicator/src/couch_replicator_api_wrap.erl
@@ -546,7 +546,7 @@ options_to_query_args(HttpDb, Path, Options0) ->
length("GET " ++ FullUrl ++ " HTTP/1.1\r\n") +
length("&atts_since=") + 6, % +6 = % encoded [ and ]
PAs, MaxLen, []),
-[{"atts_since", ?JSON_ENCODE(RevList)} | QueryArgs1]
+[{"atts_since", ?b2l(iolist_to_binary(?JSON_ENCODE(RevList)))} |
QueryArgs1]
end.
[couchdb] branch prototype/fdb-replicator updated (79083a5 -> f659a81)
This is an automated email from the ASF dual-hosted git repository. vatamane pushed a change to branch prototype/fdb-replicator in repository https://gitbox.apache.org/repos/asf/couchdb.git. from 79083a5 [wip] start running couch_replicator eunit tests add 6b3c8a6 [wip] add debug to fabric2_db add d43a099 [wip] add debug chttpd add cbfcf71 [fix] apply atts since fix from master add f659a81 [wip] allow maps in _parse No new revisions were added by this update. Summary of changes: src/chttpd/src/chttpd_db.erl | 1 + src/couch/src/couch_httpd_multipart.erl| 7 ++ .../src/couch_replicator_api_wrap.erl | 2 +- .../src/couch_replicator_parse.erl | 11 +- .../couch_replicator_attachments_too_large.erl | 30 ++--- ...replicator_create_target_with_options_tests.erl | 55 - .../test/eunit/couch_replicator_filtered_tests.erl | 33 +++--- .../eunit/couch_replicator_httpc_pool_tests.erl| 8 +- .../eunit/couch_replicator_id_too_long_tests.erl | 36 +++--- .../eunit/couch_replicator_large_atts_tests.erl| 38 +++ .../eunit/couch_replicator_many_leaves_tests.erl | 126 + .../test/eunit/couch_replicator_test_helper.erl| 121 src/fabric/src/fabric2_db.erl | 9 +- 13 files changed, 263 insertions(+), 214 deletions(-)
[couchdb] branch handle-jiffy-iolist-reponse-in-atts-since updated (151e901 -> c752557)
This is an automated email from the ASF dual-hosted git repository. vatamane pushed a change to branch handle-jiffy-iolist-reponse-in-atts-since in repository https://gitbox.apache.org/repos/asf/couchdb.git. discard 151e901 Handle jiffy returning an iolist when encoding atts_since query string add c752557 Handle jiffy returning an iolist when encoding atts_since query string 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 (151e901) \ N -- N -- N refs/heads/handle-jiffy-iolist-reponse-in-atts-since (c752557) 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. No new revisions were added by this update. Summary of changes:
[couchdb] branch handle-jiffy-iolist-reponse-in-atts-since created (now 151e901)
This is an automated email from the ASF dual-hosted git repository. vatamane pushed a change to branch handle-jiffy-iolist-reponse-in-atts-since in repository https://gitbox.apache.org/repos/asf/couchdb.git. at 151e901 Handle jiffy returning an iolist when encoding atts_since query string This branch includes the following new commits: new 151e901 Handle jiffy returning an iolist when encoding atts_since query string 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.
[couchdb] 01/01: Handle jiffy returning an iolist when encoding atts_since query string
This is an automated email from the ASF dual-hosted git repository.
vatamane pushed a commit to branch handle-jiffy-iolist-reponse-in-atts-since
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 151e9012240d1201d7938c8bc443dce923d8213b
Author: Nick Vatamaniuc
AuthorDate: Thu Aug 20 11:57:56 2020 -0400
Handle jiffy returning an iolist when encoding atts_since query string
If we don't handle it, it thows an error when trying to encode the full URL
string, for example:
```
badarg,[
{mochiweb_util,quote_plus,2,[{file,"src/mochiweb_util.erl"},{line,192}]},
{couch_replicator_httpc,query_args_to_string,2,[{file,"src/couch_replicator_httpc.erl"},{line,421}]},
{couch_replicator_httpc,full_url,2,[{file,"src/couch_replicator_httpc.erl"},{line,413}]},
{couch_replicator_api_wrap,open_doc_revs,6,[{file,"src/couch_replicator_api_wrap.erl"},{line,255}]}
]
```
This is also similar to what we did for open_revs encoding:
https://github.com/apache/couchdb/commit/a2d0c4290dde2015e5fb6184696fec3f89c81a4b
---
src/couch_replicator/src/couch_replicator_api_wrap.erl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/couch_replicator/src/couch_replicator_api_wrap.erl
b/src/couch_replicator/src/couch_replicator_api_wrap.erl
index a21de42..8dc7f2f 100644
--- a/src/couch_replicator/src/couch_replicator_api_wrap.erl
+++ b/src/couch_replicator/src/couch_replicator_api_wrap.erl
@@ -546,7 +546,7 @@ options_to_query_args(HttpDb, Path, Options0) ->
length("GET " ++ FullUrl ++ " HTTP/1.1\r\n") +
length("&atts_since=") + 6, % +6 = % encoded [ and ]
PAs, MaxLen, []),
-[{"atts_since", ?JSON_ENCODE(RevList)} | QueryArgs1]
+[{"atts_since", ?b2l(iolist_to_binary(?JSON_ENCODE(RevList)))} |
QueryArgs1]
end.
