summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJay Doane <jaydoane@apache.org>2023-05-08 12:41:47 -0700
committerJay Doane <jaydoane@apache.org>2023-05-08 13:30:01 -0700
commit7045a1061c0f1a84968ee5287dcb556db4bfd290 (patch)
tree563a3cdde74284c37feea2acbb3b4a83269f85fb
parentc9bd4e9f8cdc3564f39cae7b009dcbc134ef8518 (diff)
downloadcouchdb-7045a1061c0f1a84968ee5287dcb556db4bfd290.tar.gz
Specify minor_version 1 in term_to_binary
In Erlang/OTP 26, the default minor_version changed from 1 to 2, so make minor version explicit in `term_to_binary/2` via existing macro.
-rw-r--r--src/couch_epi/src/couch_epi_util.erl4
-rw-r--r--src/couch_mrview/src/couch_mrview.erl2
-rw-r--r--src/couch_mrview/src/couch_mrview_util.erl8
3 files changed, 8 insertions, 6 deletions
diff --git a/src/couch_epi/src/couch_epi_util.erl b/src/couch_epi/src/couch_epi_util.erl
index 2c86a96e2..3f445788b 100644
--- a/src/couch_epi/src/couch_epi_util.erl
+++ b/src/couch_epi/src/couch_epi_util.erl
@@ -12,6 +12,8 @@
-module(couch_epi_util).
+-include_lib("couch/include/couch_db.hrl").
+
-export([module_version/1, hash/1, module_exists/1]).
-compile([nowarn_deprecated_function]).
@@ -22,7 +24,7 @@ module_version(Module) ->
VSNs.
hash(Term) ->
- <<SigInt:128/integer>> = couch_hash:md5_hash(term_to_binary(Term)),
+ <<SigInt:128/integer>> = couch_hash:md5_hash(?term_to_bin(Term)),
lists:flatten(io_lib:format("\"~.36B\"", [SigInt])).
module_exists(Module) ->
diff --git a/src/couch_mrview/src/couch_mrview.erl b/src/couch_mrview/src/couch_mrview.erl
index c0f6ff49b..1a4a3ebcc 100644
--- a/src/couch_mrview/src/couch_mrview.erl
+++ b/src/couch_mrview/src/couch_mrview.erl
@@ -261,7 +261,7 @@ query_all_docs(Db, Args, Callback, Acc) when is_list(Args) ->
query_all_docs(Db, Args0, Callback, Acc) ->
Sig = couch_util:with_db(Db, fun(WDb) ->
{ok, Info} = couch_db:get_db_info(WDb),
- couch_index_util:hexsig(couch_hash:md5_hash(term_to_binary(Info)))
+ couch_index_util:hexsig(couch_hash:md5_hash(?term_to_bin(Info)))
end),
Args1 = Args0#mrargs{view_type = map},
Args2 = couch_mrview_util:validate_all_docs_args(Db, Args1),
diff --git a/src/couch_mrview/src/couch_mrview_util.erl b/src/couch_mrview/src/couch_mrview_util.erl
index 440eb7222..5913aa3d0 100644
--- a/src/couch_mrview/src/couch_mrview_util.erl
+++ b/src/couch_mrview/src/couch_mrview_util.erl
@@ -265,7 +265,7 @@ ddoc_to_mrst(DbName, #doc{id = Id, body = {Fields}}) ->
partitioned = Partitioned
},
SigInfo = {Views, Language, DesignOpts, couch_index_util:sort_lib(Lib)},
- {ok, IdxState#mrst{sig = couch_hash:md5_hash(term_to_binary(SigInfo))}}.
+ {ok, IdxState#mrst{sig = couch_hash:md5_hash(?term_to_bin(SigInfo))}}.
set_view_type(_Args, _ViewName, []) ->
throw({not_found, missing_named_view});
@@ -315,7 +315,7 @@ view_sig(Db, State, View, #mrargs{include_docs = true} = Args) ->
UpdateSeq = couch_db:get_update_seq(Db),
PurgeSeq = couch_db:get_purge_seq(Db),
Term = view_sig_term(BaseSig, UpdateSeq, PurgeSeq),
- couch_index_util:hexsig(couch_hash:md5_hash(term_to_binary(Term)));
+ couch_index_util:hexsig(couch_hash:md5_hash(?term_to_bin(Term)));
view_sig(Db, State, {_Nth, _Lang, View}, Args) ->
view_sig(Db, State, View, Args);
view_sig(_Db, State, View, Args0) ->
@@ -327,7 +327,7 @@ view_sig(_Db, State, View, Args0) ->
extra = []
},
Term = view_sig_term(Sig, UpdateSeq, PurgeSeq, Args),
- couch_index_util:hexsig(couch_hash:md5_hash(term_to_binary(Term))).
+ couch_index_util:hexsig(couch_hash:md5_hash(?term_to_bin(Term))).
view_sig_term(BaseSig, UpdateSeq, PurgeSeq) ->
{BaseSig, UpdateSeq, PurgeSeq}.
@@ -1114,7 +1114,7 @@ sig_vsn_2x(State) ->
KSI = proplists:get_value(<<"keyseq_indexed">>, DesignOpts, false),
Views = [old_view_format(V, SI, KSI) || V <- State#mrst.views],
SigInfo = {Views, Language, DesignOpts, couch_index_util:sort_lib(Lib)},
- couch_hash:md5_hash(term_to_binary(SigInfo)).
+ couch_hash:md5_hash(?term_to_bin(SigInfo)).
old_view_format(View, SI, KSI) ->
{