[couchdb] 23/28: ss - implement PSE

[da...@apache.org]

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

davisp pushed a commit to branch COUCHDB-3287-pluggable-storage-engines
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 2522ed75e316657619633ae859c31a718435b24e
Author: Paul J. Davis <pa...@gmail.com>
AuthorDate: Tue Sep 12 13:36:22 2017 -0500

    ss - implement PSE
---
 src/couch/src/couch_db_updater.erl | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/couch/src/couch_db_updater.erl b/src/couch/src/couch_db_updater.erl
index 904167c..b0fc25a 100644
--- a/src/couch/src/couch_db_updater.erl
+++ b/src/couch/src/couch_db_updater.erl
@@ -271,7 +271,7 @@ handle_info({'EXIT', _Pid, normal}, Db) ->
     {noreply, Db, idle_limit()};
 handle_info({'EXIT', _Pid, Reason}, Db) ->
     {stop, Reason, Db};
-handle_info(timeout, #db{fd=Fd, name=DbName} = Db) ->
+handle_info(timeout, #db{name=DbName} = Db) ->
     IdleLimitMSec = update_idle_limit_from_config(),
     case couch_db:is_idle(Db) of
         true ->
@@ -409,7 +409,7 @@ flush_trees(#db{} = Db,
                 % flushed to disk.
                 #doc{} = Doc ->
                     check_doc_atts(Db, Doc),
-                    ExternalSize = get_meta_body_size(Value#doc.meta, Summary),
+                    ExternalSize = get_meta_body_size(Value#doc.meta),
                     {size_info, AttSizeInfo} =
                             lists:keyfind(size_info, 1, Doc#doc.meta),
                     {ok, NewDoc, WrittenSize} =
@@ -730,12 +730,8 @@ pair_purge_info(Old, New) ->
 
 
 get_meta_body_size(Meta, Summary) ->
-    case lists:keyfind(ejson_size, 1, Meta) of
-        {ejson_size, ExternalSize} ->
-            ExternalSize;
-        false ->
-            ?term_size(couch_compress:decompress(Summary))
-    end.
+    {ejson_size, ExtSize} = lists:keyfind(ejson_size, 1, Meta),
+    ExtSize.
 
 
 default_security_object(<<"shards/", _/binary>>) ->

-- 
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.