Merge pull request #10161 from richcarl/replace-zf

Deprecate lists:zf/2 and remove uses in OTP

OTP-19783

Author: bjorng

bootstrap/lib/stdlib/ebin/otp_internal.beam

@@ -1,4 +1,11 @@
-%% ``Licensed under the Apache License, Version 2.0 (the "License");
+%%
+%% %CopyrightBegin%
+%%
+%% SPDX-License-Identifier: Apache-2.0
+%%
+%% Copyright Ericsson AB 1996-2025. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
 %% You may obtain a copy of the License at
 %%
@@ -10,11 +17,9 @@
 %% See the License for the specific language governing permissions and
 %% limitations under the License.
 %%
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
+%% %CopyrightEnd%
 %%
-%%     $Id: mnesia_controller.erl,v 1.3 2010/03/04 13:54:19 maria Exp $
+
 %% The mnesia_init process loads tables from local disc or from
 %% another nodes. It also coordinates updates of the info about
 %% where we can read and write tables.
@@ -28,11 +33,6 @@
 %% consistent replica and we have received mnesia_down from all
 %% other nodes holding the table. Then we let the mnesia_init
 %% process enter its normal working state.
-%%
-%% When we need to load a table we append a request to the load
-%% request queue. All other requests are regarded as high priority
-%% and are processed immediately (e.g. update table whereabouts).
-%% We processes the load request queue as a "background" job..
 
 -module(mnesia_controller).
 
@@ -1375,15 +1375,15 @@ initial_safe_loads() ->
 	    Downs = [],
 	    Tabs = val({schema, local_tables}) -- [schema],
 	    LastC = fun(T) -> last_consistent_replica(T, Downs) end,
-	    lists:zf(LastC, Tabs);
+	    lists:filtermap(LastC, Tabs);
 
 	disc_copies ->
 	    Downs = mnesia_recover:get_mnesia_downs(),
 	    dbg_out("mnesia_downs = ~p~n", [Downs]),
 
 	    Tabs = val({schema, local_tables}) -- [schema],
 	    LastC = fun(T) -> last_consistent_replica(T, Downs) end,
-	    lists:zf(LastC, Tabs)
+	    lists:filtermap(LastC, Tabs)
     end.
 
 last_consistent_replica(Tab, Downs) ->

lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_controller.erl

@@ -1,24 +1,24 @@
-%%% ``Licensed under the Apache License, Version 2.0 (the "License");
-%%% you may not use this file except in compliance with the License.
-%%% You may obtain a copy of the License at
-%%%
-%%%     http://www.apache.org/licenses/LICENSE-2.0
-%%%
-%%% Unless required by applicable law or agreed to in writing, software
-%%% distributed under the License is distributed on an "AS IS" BASIS,
-%%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-%%% See the License for the specific language governing permissions and
-%%% limitations under the License.
-%%%
-%%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%%% AB. All Rights Reserved.''
-%%%
-%%%     $Id: mnesia_frag.erl,v 1.1 2008/12/17 09:53:38 mikpe Exp $
-%%%----------------------------------------------------------------------
-%%% Purpose : Support tables so large that they need
-%%%           to be divided into several fragments.
-%%%----------------------------------------------------------------------
+%%
+%% %CopyrightBegin%
+%%
+%% SPDX-License-Identifier: Apache-2.0
+%%
+%% Copyright Ericsson AB 1996-2025. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
+%% you may not use this file except in compliance with the License.
+%% You may obtain a copy of the License at
+%%
+%%     http://www.apache.org/licenses/LICENSE-2.0
+%%
+%% Unless required by applicable law or agreed to in writing, software
+%% distributed under the License is distributed on an "AS IS" BASIS,
+%% WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+%% See the License for the specific language governing permissions and
+%% limitations under the License.
+%%
+%% %CopyrightEnd%
+%%
 
 %header_doc_include
 
@@ -700,7 +700,7 @@ replace_frag_hash(Cs, FH) when record(FH, frag_state) ->
 			  true
 		  end
 	  end,
-    Props = lists:zf(Fun, Cs#cstruct.frag_properties),
+    Props = lists:filtermap(Fun, Cs#cstruct.frag_properties),
     Cs#cstruct{frag_properties = Props}.
 
 %% Adjust table info before split

lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_frag.erl

@@ -1,4 +1,11 @@
-%% ``Licensed under the Apache License, Version 2.0 (the "License");
+%%
+%% %CopyrightBegin%
+%%
+%% SPDX-License-Identifier: Apache-2.0
+%%
+%% Copyright Ericsson AB 1996-2025. All Rights Reserved.
+%%
+%% Licensed under the Apache License, Version 2.0 (the "License");
 %% you may not use this file except in compliance with the License.
 %% You may obtain a copy of the License at
 %%
@@ -10,14 +17,8 @@
 %% See the License for the specific language governing permissions and
 %% limitations under the License.
 %%
-%% The Initial Developer of the Original Code is Ericsson Utvecklings AB.
-%% Portions created by Ericsson are Copyright 1999, Ericsson Utvecklings
-%% AB. All Rights Reserved.''
+%% %CopyrightEnd%
 %%
-%%     $Id: mnesia_lib.erl,v 1.3 2009/07/01 15:45:40 kostis Exp $
-%% This module contains all sorts of various which doesn't fit
-%% anywhere else. Basically everything is exported.
-
 -module(mnesia_lib).
 
 -include("mnesia.hrl").
@@ -30,7 +31,6 @@
 	 add/2,
 	 add_list/2,
 	 all_nodes/0,
-%%	 catch_val/1,
 	 cleanup_tmp_files/1,
 	 copy_file/2,
 	 copy_holders/1,
@@ -442,7 +442,7 @@ ensure_loaded(Appl) ->
 
 local_active_tables() ->
     Tabs = val({schema, local_tables}),
-    lists:zf(fun(Tab) -> active_here(Tab) end, Tabs).
+    lists:filtermap(fun(Tab) -> active_here(Tab) end, Tabs).
 
 active_tables() ->
     Tabs = val({schema, tables}),
@@ -452,7 +452,7 @@ active_tables() ->
 		    _ -> {true, Tab}
 		end
 	end,
-    lists:zf(F, Tabs).
+    lists:filtermap(F, Tabs).
 
 etype(X) when integer(X) -> integer;
 etype([]) -> nil;
@@ -588,7 +588,7 @@ mkcore(CrashInfo) ->
     term_to_binary(Core).
 
 procs() ->
-    Fun = fun(P) -> {P, (catch lists:zf(fun proc_info/1, process_info(P)))} end,
+    Fun = fun(P) -> {P, (catch lists:filtermap(fun proc_info/1, process_info(P)))} end,
     lists:map(Fun, processes()).
 
 proc_info({registered_name, Val}) -> {true, Val};
@@ -626,7 +626,7 @@ relatives() ->
 		       Pid -> {true, {Name, Pid, catch process_info(Pid)}}
 		   end
 	   end,
-    lists:zf(Info, mnesia:ms()).
+    lists:filtermap(Info, mnesia:ms()).
 
 workers({workers, Loader, Sender, Dumper}) ->
     Info = fun({Name, Pid}) ->
@@ -635,7 +635,7 @@ workers({workers, Loader, Sender, Dumper}) ->
 		       Pid -> {true, {Name, Pid, catch process_info(Pid)}}
 		   end
 	   end,
-    lists:zf(Info, [{loader, Loader}, {sender, Sender}, {dumper, Dumper}]).
+    lists:filtermap(Info, [{loader, Loader}, {sender, Sender}, {dumper, Dumper}]).
 
 locking_procs(LockList) when list(LockList) ->
     Tids = [element(1, Lock) || Lock <- LockList],
@@ -649,7 +649,7 @@ locking_procs(LockList) when list(LockList) ->
 			   false
 		   end
 	   end,
-    lists:zf(Info, UT).
+    lists:filtermap(Info, UT).
 
 view() ->
     Bin = mkcore({crashinfo, {"view only~n", []}}),
@@ -693,7 +693,7 @@ vcore() ->
     {ok, Cwd} = file:get_cwd(),
     case file:list_dir(Cwd) of
 	{ok, Files}->
-	    CoreFiles = lists:sort(lists:zf(Filter, Files)),
+	    CoreFiles = lists:sort(lists:filtermap(Filter, Files)),
 	    show("Mnesia core files: ~p~n", [CoreFiles]),
 	    vcore(lists:last(CoreFiles));
 	Error ->

lib/dialyzer/test/r9c_SUITE_data/src/mnesia/mnesia_lib.erl

@@ -49,7 +49,7 @@
 %% Test exports, only to be used from the test suites
 -export([test_change_apps/2]).
 
--import(lists, [zf/2, map/2, foreach/2, foldl/3,
+-import(lists, [filtermap/2, map/2, foreach/2, foldl/3,
 		keyfind/3, keydelete/3, keyreplace/4]).
 
 -include("application_master.hrl").
@@ -889,7 +889,7 @@ handle_call({config_change, EnvBefore}, _From, S) ->
     {reply, R, S};
 
 handle_call(which_applications, _From, S) ->
-    Reply = zf(fun({Name, Id}) ->
+    Reply = filtermap(fun({Name, Id}) ->
 		       case Id of
 			   {distributed, _Node} ->
 			       false;

lib/kernel/src/application_controller.erl

@@ -40,7 +40,7 @@
 	 code_change/3, send_timeout/3]).
 -export([info/0]).
 
--import(lists, [zf/2, filter/2, map/2, foreach/2, foldl/3, mapfoldl/3,
+-import(lists, [filtermap/2, filter/2, map/2, foreach/2, foldl/3, mapfoldl/3,
 		keysearch/3, keydelete/3, keyreplace/4, member/2]).
 
 -define(AC, application_controller).
@@ -508,7 +508,7 @@ handle_info({ac_application_stopped, AppName}, S) ->
 %%-----------------------------------------------------------------
 handle_info({dist_ac_new_node, _Vsn, Node, HisAppls, []}, S) ->
     Appls = S#state.appls,
-    MyStarted = zf(fun(Appl) when Appl#appl.id =:= local ->
+    MyStarted = filtermap(fun(Appl) when Appl#appl.id =:= local ->
 			   {true, {node(), Appl#appl.name}};
 		      (_) ->
 			   false
@@ -623,7 +623,7 @@ handle_info({nodedown, Node}, S) ->
 			 (_) -> false
 		      end,
 		      S#state.appls),
-    Appls2 = zf(fun(Appl) when Appl#appl.id =:= {distributed, Node} -> 
+    Appls2 = filtermap(fun(Appl) when Appl#appl.id =:= {distributed, Node} ->
 			case lists:member(Appl#appl.name, AppNames) of
 			    true ->
 				{true, Appl#appl{id = {failover, Node}}};
@@ -1419,7 +1419,7 @@ do_dist_change_update(Appls, AppName, NewTime, NewNodes) ->
 
 %% Merge his Permissions with mine.
 dist_merge(MyAppls, HisAppls, HisNode) ->
-    zf(fun(Appl) ->
+    filtermap(fun(Appl) ->
 	       #appl{name = AppName, run = Run} = Appl,
 %	       #appl{name = AppName, nodes = Nodes, run = Run} = Appl,
 %	       HeIsMember = lists:member(HisNode, flat_nodes(Nodes)),
@@ -1442,7 +1442,7 @@ dist_merge(MyAppls, HisAppls, HisNode) ->
 dist_get_runnable_nodes(Appls, AppName) ->
     case keysearch(AppName, #appl.name, Appls) of
 	{value, #appl{run = Run}} ->
-	    zf(fun({Node, true}) -> {true, Node};
+	    filtermap(fun({Node, true}) -> {true, Node};
 		  (_) -> false
 	       end, Run);
 	false ->
@@ -1473,7 +1473,7 @@ is_loaded(AppName, #state{appls = Appls}) ->
     end.
 
 dist_get_runnable(Appls) ->
-    zf(fun(#appl{name = AppName, run = Run}) ->
+    filtermap(fun(#appl{name = AppName, run = Run}) ->
 	       case keysearch(node(), 1, Run) of
 		   {value, {_, true}} -> {true, AppName};
 		   _ -> false

lib/kernel/src/dist_ac.erl

@@ -1597,15 +1597,15 @@ initial_safe_loads() ->
 	    Downs = [],
 	    Tabs = val({schema, local_tables}) -- [schema],
 	    LastC = fun(T) -> last_consistent_replica(T, Downs) end,
-	    lists:zf(LastC, Tabs);
+	    lists:filtermap(LastC, Tabs);
 
 	disc_copies ->
 	    Downs = mnesia_recover:get_mnesia_downs(),
 	    dbg_out("mnesia_downs = ~p~n", [Downs]),
 
 	    Tabs = val({schema, local_tables}) -- [schema],
 	    LastC = fun(T) -> last_consistent_replica(T, Downs) end,
-	    lists:zf(LastC, Tabs)
+	    lists:filtermap(LastC, Tabs)
     end.
 
 last_consistent_replica(Tab, Downs) ->

lib/mnesia/src/mnesia_controller.erl

@@ -895,7 +895,7 @@ replace_frag_hash(Cs, FH) when is_record(FH, frag_state) ->
 			  true
 		  end
 	  end,
-    Props = lists:zf(Fun, Cs#cstruct.frag_properties),
+    Props = lists:filtermap(Fun, Cs#cstruct.frag_properties),
     Cs#cstruct{frag_properties = Props}.
 
 %% Adjust table info before split

lib/mnesia/src/mnesia_frag.erl

@@ -531,7 +531,7 @@ ensure_loaded(Appl) ->
 
 local_active_tables() ->
     Tabs = val({schema, local_tables}),
-    lists:zf(fun(Tab) -> active_here(Tab) end, Tabs).
+    lists:filtermap(fun(Tab) -> active_here(Tab) end, Tabs).
 
 active_tables() ->
     Tabs = val({schema, tables}),
@@ -541,7 +541,7 @@ active_tables() ->
 		    _ -> {true, Tab}
 		end
 	end,
-    lists:zf(F, Tabs).
+    lists:filtermap(F, Tabs).
 
 etype(X) when is_integer(X) -> integer;
 etype([]) -> nil;
@@ -715,7 +715,7 @@ mkcore(CrashInfo) ->
     term_to_binary(Core).
 
 procs() ->
-    Fun = fun(P) -> {P, (?CATCH(lists:zf(fun proc_info/1, process_info(P))))} end,
+    Fun = fun(P) -> {P, (?CATCH(lists:filtermap(fun proc_info/1, process_info(P))))} end,
     lists:map(Fun, processes()).
 
 proc_info({registered_name, Val}) -> {true, Val};
@@ -765,7 +765,7 @@ relatives() ->
 		       Pid -> {true, {Name, Pid, proc_dbg_info(Pid)}}
 		   end
 	   end,
-    lists:zf(Info, mnesia:ms()).
+    lists:filtermap(Info, mnesia:ms()).
 
 workers({workers, Loaders, Senders, Dumper}) ->
     Info = fun({Pid, {send_table, Tab, _Receiver, _St}}) ->
@@ -781,9 +781,9 @@ workers({workers, Loaders, Senders, Dumper}) ->
 		       Pid -> {true, {Name, Pid, proc_dbg_info(Pid)}}
 		   end
 	   end,
-    SInfo = lists:zf(Info, Senders),
-    Linfo = lists:zf(Info, Loaders),
-    [{senders, SInfo},{loader, Linfo}|lists:zf(Info, [{dumper, Dumper}])].
+    SInfo = lists:filtermap(Info, Senders),
+    Linfo = lists:filtermap(Info, Loaders),
+    [{senders, SInfo},{loader, Linfo}|lists:filtermap(Info, [{dumper, Dumper}])].
 
 locking_procs(LockList) when is_list(LockList) ->
     Tids = [element(3, Lock) || Lock <- LockList],
@@ -797,7 +797,7 @@ locking_procs(LockList) when is_list(LockList) ->
 			   false
 		   end
 	   end,
-    lists:zf(Info, UT).
+    lists:filtermap(Info, UT).
 
 proc_dbg_info(Pid) ->
     try
@@ -849,7 +849,7 @@ vcore() ->
     {ok, Cwd} = file:get_cwd(),
     case file:list_dir(Cwd) of
 	{ok, Files}->
-	    CoreFiles = lists:sort(lists:zf(Filter, Files)),
+	    CoreFiles = lists:sort(lists:filtermap(Filter, Files)),
 	    show("Mnesia core files: ~tp~n", [CoreFiles]),
 	    vcore(lists:last(CoreFiles));
 	Error ->

lib/mnesia/src/mnesia_lib.erl

@@ -291,7 +291,7 @@ transform_some_records(Tab1, _Tab2, Old) ->
     Filter = fun(Rec) when element(1, Rec) == Tab1 -> {true, Fun(Rec)};
 		(_) -> true
 	     end,
-    lists:sort(lists:zf(Filter, Old)).
+    lists:sort(lists:filtermap(Filter, Old)).
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%