diff options
author | Will Holley <willholley@apache.org> | 2019-12-02 12:58:41 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-12-02 12:58:41 +0000 |
commit | 2d734f38096bd72cd4c6bed3059453799d1a521f (patch) | |
tree | d4624efcfa9bd1d332268c6624895cdf42ba8170 | |
parent | 6d432a920e94f7de1de69efe963a4abbf8e5ac33 (diff) | |
parent | bcf6881e4a244bb7ec3326cc051fe45c586e35e6 (diff) | |
download | couchdb-2d734f38096bd72cd4c6bed3059453799d1a521f.tar.gz |
Merge pull request #2337 from apache/couch_hash_update
Update usage of couch_hash:md5_hash shim
-rw-r--r-- | src/couch_mrview/test/eunit/couch_mrview_purge_docs_tests.erl | 2 | ||||
-rw-r--r-- | src/couch_pse_tests/src/cpse_test_purge_docs.erl | 4 | ||||
-rw-r--r-- | src/couch_pse_tests/src/cpse_test_purge_seqs.erl | 2 | ||||
-rw-r--r-- | src/couch_pse_tests/src/cpse_util.erl | 4 | ||||
-rw-r--r-- | src/dreyfus/src/dreyfus_index.erl | 4 | ||||
-rw-r--r-- | src/fabric/test/eunit/fabric_rpc_purge_tests.erl | 2 |
6 files changed, 9 insertions, 9 deletions
diff --git a/src/couch_mrview/test/eunit/couch_mrview_purge_docs_tests.erl b/src/couch_mrview/test/eunit/couch_mrview_purge_docs_tests.erl index 1020607a4..62e1410cb 100644 --- a/src/couch_mrview/test/eunit/couch_mrview_purge_docs_tests.erl +++ b/src/couch_mrview/test/eunit/couch_mrview_purge_docs_tests.erl @@ -139,7 +139,7 @@ test_purge_partial(Db) -> FDI1 = couch_db:get_full_doc_info(Db, <<"1">>), Rev1 = get_rev(FDI1), Update = {[ {'_id', <<"1">>}, - {'_rev', couch_doc:rev_to_str({1, [crypto:hash(md5, <<"1.2">>)]})}, + {'_rev', couch_doc:rev_to_str({1, [couch_hash:md5_hash(<<"1.2">>)]})}, {'val', 1.2} ]}, {ok, [_Rev2]} = save_docs(Db, [Update], [replicated_changes]), diff --git a/src/couch_pse_tests/src/cpse_test_purge_docs.erl b/src/couch_pse_tests/src/cpse_test_purge_docs.erl index 1788eecd1..60a072da6 100644 --- a/src/couch_pse_tests/src/cpse_test_purge_docs.erl +++ b/src/couch_pse_tests/src/cpse_test_purge_docs.erl @@ -253,7 +253,7 @@ cpse_purge_partial_revs(DbName) -> {ok, Rev1} = cpse_util:save_doc(DbName, {[{'_id', foo}, {vsn, <<"1.1">>}]}), Update = {[ {'_id', foo}, - {'_rev', couch_doc:rev_to_str({1, [crypto:hash(md5, <<"1.2">>)]})}, + {'_rev', couch_doc:rev_to_str({1, [couch_hash:md5_hash(<<"1.2">>)]})}, {vsn, <<"1.2">>} ]}, {ok, [_Rev2]} = cpse_util:save_docs(DbName, [Update], [replicated_changes]), @@ -392,7 +392,7 @@ cpse_purge_repeated_revisions(DbName) -> {ok, Rev1} = cpse_util:save_doc(DbName, {[{'_id', foo}, {vsn, <<"1.1">>}]}), Update = {[ {'_id', foo}, - {'_rev', couch_doc:rev_to_str({1, [crypto:hash(md5, <<"1.2">>)]})}, + {'_rev', couch_doc:rev_to_str({1, [couch_hash:md5_hash(<<"1.2">>)]})}, {vsn, <<"1.2">>} ]}, {ok, [Rev2]} = cpse_util:save_docs(DbName, [Update], [replicated_changes]), diff --git a/src/couch_pse_tests/src/cpse_test_purge_seqs.erl b/src/couch_pse_tests/src/cpse_test_purge_seqs.erl index f363b76bb..c896b6154 100644 --- a/src/couch_pse_tests/src/cpse_test_purge_seqs.erl +++ b/src/couch_pse_tests/src/cpse_test_purge_seqs.erl @@ -101,7 +101,7 @@ cpse_increment_purge_seq_on_partial_purge(DbName) -> {ok, Rev1} = cpse_util:save_doc(DbName, {[{'_id', foo1}, {vsn, <<"1.1">>}]}), Update = {[ {'_id', foo1}, - {'_rev', couch_doc:rev_to_str({1, [crypto:hash(md5, <<"1.2">>)]})}, + {'_rev', couch_doc:rev_to_str({1, [couch_hash:md5_hash(<<"1.2">>)]})}, {vsn, <<"1.2">>} ]}, {ok, [_Rev2]} = cpse_util:save_docs(DbName, [Update], [replicated_changes]), diff --git a/src/couch_pse_tests/src/cpse_util.erl b/src/couch_pse_tests/src/cpse_util.erl index f8f6a19ae..24f49e88c 100644 --- a/src/couch_pse_tests/src/cpse_util.erl +++ b/src/couch_pse_tests/src/cpse_util.erl @@ -371,11 +371,11 @@ gen_write(Db, {Action, {DocId, Body, Atts}}) -> gen_rev(A, DocId, {Pos, Rev}, Body, Atts) when A == update; A == delete -> - NewRev = crypto:hash(md5, term_to_binary({DocId, Rev, Body, Atts})), + NewRev = couch_hash:md5_hash(term_to_binary({DocId, Rev, Body, Atts})), {Pos + 1, [NewRev, Rev]}; gen_rev(conflict, DocId, _, Body, Atts) -> UUID = couch_uuids:random(), - NewRev = crypto:hash(md5, term_to_binary({DocId, UUID, Body, Atts})), + NewRev = couch_hash:md5_hash(term_to_binary({DocId, UUID, Body, Atts})), {1, [NewRev]}. diff --git a/src/dreyfus/src/dreyfus_index.erl b/src/dreyfus/src/dreyfus_index.erl index e33a208ee..2bf560f37 100644 --- a/src/dreyfus/src/dreyfus_index.erl +++ b/src/dreyfus/src/dreyfus_index.erl @@ -197,7 +197,7 @@ handle_info({'EXIT', FromPid, {updated, NewSeq}}, nil; false -> spawn_link(fun() -> - dreyfus_index_updater:update(IndexPid, Index) + dreyfus_index_updater:update(IndexPid, Index) end) end, {noreply, State#state{index=Index, @@ -274,7 +274,7 @@ design_doc_to_index(#doc{id=Id,body={Fields}}, IndexName) -> undefined -> {error, InvalidDDocError}; Def -> - Sig = ?l2b(couch_util:to_hex(crypto:hash(md5, + Sig = ?l2b(couch_util:to_hex(couch_hash:md5_hash( term_to_binary({Analyzer, Def})))), {ok, #index{ analyzer=Analyzer, diff --git a/src/fabric/test/eunit/fabric_rpc_purge_tests.erl b/src/fabric/test/eunit/fabric_rpc_purge_tests.erl index 4eafb2bc4..6db6a70aa 100644 --- a/src/fabric/test/eunit/fabric_rpc_purge_tests.erl +++ b/src/fabric/test/eunit/fabric_rpc_purge_tests.erl @@ -241,7 +241,7 @@ create_update(Doc, NewVsn) -> body = {Props} } = Doc, NewProps = lists:keyreplace(<<"vsn">>, 1, Props, {<<"vsn">>, NewVsn}), - NewRev = crypto:hash(md5, term_to_binary({DocId, Rev, {NewProps}})), + NewRev = couch_hash:md5_hash(term_to_binary({DocId, Rev, {NewProps}})), Doc#doc{ revs = {Pos + 1, [NewRev | Revs]}, body = {NewProps} |