You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by rn...@apache.org on 2017/07/16 14:36:14 UTC
[couchdb] 01/01: Merge pull request #681 from
apache/remove-couch-crypto
This is an automated email from the ASF dual-hosted git repository.
rnewson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/couchdb.git
commit d3a5a71752f87e1f07f316c433e0cdb7fa78b804
Merge: de0634f 9e56cf3
Author: Robert Newson <rn...@apache.org>
AuthorDate: Sun Jul 16 15:36:11 2017 +0100
Merge pull request #681 from apache/remove-couch-crypto
Remove couch_crypto
src/chttpd/src/chttpd.erl | 2 +-
src/couch/src/couch_crypto.erl | 79 ----------------------
src/couch/src/couch_db.erl | 2 +-
src/couch/src/couch_db_updater.erl | 2 +-
src/couch/src/couch_file.erl | 8 +--
src/couch/src/couch_hotp.erl | 2 +-
src/couch/src/couch_httpd.erl | 2 +-
src/couch/src/couch_httpd_auth.erl | 6 +-
src/couch/src/couch_native_process.erl | 4 +-
src/couch/src/couch_passwords.erl | 8 +--
src/couch/src/couch_server.erl | 2 +-
src/couch/src/couch_stream.erl | 28 ++++----
src/couch/test/couch_auth_cache_tests.erl | 2 +-
src/couch/test/couchdb_attachments_tests.erl | 6 +-
src/couch_epi/src/couch_epi_data.erl | 2 +-
src/couch_epi/src/couch_epi_util.erl | 12 +---
.../test/couch_index_ddoc_updated_tests.erl | 2 +-
src/couch_mrview/src/couch_mrview.erl | 2 +-
src/couch_mrview/src/couch_mrview_util.erl | 8 +--
src/couch_plugins/src/couch_plugins.erl | 2 +-
src/couch_replicator/src/couch_replicator_ids.erl | 2 +-
.../test/couch_replicator_many_leaves_tests.erl | 2 +-
.../test/couch_replicator_test_helper.erl | 12 ++--
src/mango/src/mango_idx.erl | 2 +-
src/mem3/src/mem3_rep.erl | 6 +-
25 files changed, 59 insertions(+), 146 deletions(-)
diff --cc src/couch/src/couch_db_updater.erl
index 277f2b5,46e8e55..8a0fb8c
--- a/src/couch/src/couch_db_updater.erl
+++ b/src/couch/src/couch_db_updater.erl
@@@ -1473,18 -1465,8 +1473,18 @@@ make_doc_summary(#db{compression = Comp
couch_compress:compress(Atts0, Comp)
end,
SummaryBin = ?term_to_bin({Body, Atts}),
- couch_file:assemble_file_chunk(SummaryBin, couch_crypto:hash(md5, SummaryBin)).
+ 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 ->
+ ?term_size(couch_compress:decompress(Summary))
+ end.
+
+
default_security_object(<<"shards/", _/binary>>) ->
case config:get("couchdb", "default_security", "everyone") of
"admin_only" ->
--
To stop receiving notification emails like this one, please contact
"commits@couchdb.apache.org" <co...@couchdb.apache.org>.