diff options
| author | Paul J. Davis <paul.joseph.davis@gmail.com> | 2018-02-14 13:28:34 -0600 |
|---|---|---|
| committer | Paul J. Davis <paul.joseph.davis@gmail.com> | 2018-02-28 10:32:43 -0600 |
| commit | 364ea209250df169f0c7425cf0003e20a5a2d28d (patch) | |
| tree | 69c55a3b01f22fb75a21cc9958433fa30acd1fce | |
| parent | 083239353e919e897b97e8a96ee07cb42ca4eccd (diff) | |
| download | couchdb-364ea209250df169f0c7425cf0003e20a5a2d28d.tar.gz | |
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.
| -rw-r--r-- | src/couch/src/couch_db_updater.erl | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/src/couch/src/couch_db_updater.erl b/src/couch/src/couch_db_updater.erl index ca61e04c6..56f497fb4 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>>) -> |