summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTony Sun <tony.sun@cloudant.com>2017-07-12 10:56:25 -0700
committerTony Sun <tony.sun@cloudant.com>2017-07-12 10:56:25 -0700
commitb3eb718098f1b5e64c823e9b6d515764ca7841e5 (patch)
tree5b48eebfa13495106dde39aec8680d2db9bfedb8
parent8b825571118b82bc8853072b9cb69cfba7237259 (diff)
downloadcouchdb-b3eb718098f1b5e64c823e9b6d515764ca7841e5.tar.gz
cleanup and formatting
-rw-r--r--src/couch/src/couch_db.erl7
-rw-r--r--src/couch/src/couch_db_updater.erl1
2 files changed, 4 insertions, 4 deletions
diff --git a/src/couch/src/couch_db.erl b/src/couch/src/couch_db.erl
index 65cd26ee5..e4e3a8b34 100644
--- a/src/couch/src/couch_db.erl
+++ b/src/couch/src/couch_db.erl
@@ -1112,9 +1112,10 @@ prepare_doc_summaries(Db, BucketList) ->
end,
SummaryChunk = couch_db_updater:make_doc_summary(Db, {Body, DiskAtts}),
Meta = Doc#doc.meta,
- ExternalSize = ?term_size(Body),
- Doc#doc{body = {summary, SummaryChunk, SizeInfo, AttsFd},
- meta = [{ejson_size, ExternalSize} | Meta]}
+ Doc#doc{
+ body = {summary, SummaryChunk, SizeInfo, AttsFd},
+ meta = [{ejson_size, ?term_size(Body)} | Meta]
+ }
end,
Bucket) || Bucket <- BucketList].
diff --git a/src/couch/src/couch_db_updater.erl b/src/couch/src/couch_db_updater.erl
index eee72eea1..26921bcfe 100644
--- a/src/couch/src/couch_db_updater.erl
+++ b/src/couch/src/couch_db_updater.erl
@@ -1076,7 +1076,6 @@ check_md5(_, _) -> throw(md5_mismatch).
copy_docs(Db, #db{fd = DestFd} = NewDb, MixedInfos, Retry) ->
DocInfoIds = [Id || #doc_info{id=Id} <- MixedInfos],
- Compress = NewDb#db.compression,
LookupResults = couch_btree:lookup(Db#db.id_tree, DocInfoIds),
% COUCHDB-968, make sure we prune duplicates during compaction
NewInfos0 = lists:usort(fun(#full_doc_info{id=A}, #full_doc_info{id=B}) ->