This is an automated email from the ASF dual-hosted git repository.
davisp pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit 364ea209250df169f0c7425cf0003e20a5a2d28d
Author: Paul J. Davis <paul.joseph.da...@gmail.com>
AuthorDate: Wed Feb 14 13:28:34 2018 -0600
Remove old rolling reboot upgrade code
This relied on having introspection into the state of a #doc{} record
that is no longer valid with PSE. This is a harmless change as it was
only necessary when performing a rolling reboot to a version that
included the new get_meta_body_size function. We can remove it now
because anyone wanting to do a rolling reboot with PSE will have to step
through a version that includes commit aee57bf which includes the
previous upgrade logic as well.
---
src/couch/src/couch_db_updater.erl | 10 +++-------
1 file changed, 3 insertions(+), 7 deletions(-)
diff --git a/src/couch/src/couch_db_updater.erl
b/src/couch/src/couch_db_updater.erl
index ca61e04..56f497f 100644
--- a/src/couch/src/couch_db_updater.erl
+++ b/src/couch/src/couch_db_updater.erl
@@ -1467,13 +1467,9 @@ make_doc_summary(#db{compression = Comp}, {Body0,
Atts0}) ->
couch_file:assemble_file_chunk(SummaryBin, crypto:hash(md5, SummaryBin)).
-get_meta_body_size(Meta, Summary) ->
- case lists:keyfind(ejson_size, 1, Meta) of
- {ejson_size, ExternalSize} ->
- ExternalSize;
- false ->
- couch_compress:uncompressed_size(Summary)
- end.
+get_meta_body_size(Meta) ->
+ {ejson_size, ExternalSize} = lists:keyfind(ejson_size, 1, Meta),
+ ExternalSize.
default_security_object(<<"shards/", _/binary>>) ->
--
To stop receiving notification emails like this one, please contact
dav...@apache.org.
