From 69c4ba2a62a05f54d4e7dbd8985952d2785ba111 Mon Sep 17 00:00:00 2001 From: Ilya Averyanov Date: Sat, 22 Apr 2023 22:50:19 +0300 Subject: [PATCH] feat(ft): use new utils application --- apps/emqx_ft/src/emqx_ft.erl | 4 ++-- apps/emqx_ft/src/emqx_ft_api.erl | 2 +- apps/emqx_ft/src/emqx_ft_conf.erl | 6 +++--- apps/emqx_ft/src/emqx_ft_storage_exporter_fs.erl | 4 ++-- apps/emqx_ft/src/emqx_ft_storage_exporter_fs_api.erl | 4 ++-- apps/emqx_ft/src/emqx_ft_storage_exporter_s3.erl | 2 +- apps/emqx_ft/src/emqx_ft_storage_fs.erl | 8 ++++---- apps/emqx_ft/src/emqx_ft_storage_fs_gc.erl | 4 ++-- apps/emqx_ft/test/emqx_ft_SUITE.erl | 6 +++--- apps/emqx_ft/test/emqx_ft_api_SUITE.erl | 2 +- apps/emqx_ft/test/emqx_ft_storage_fs_gc_SUITE.erl | 6 +++--- apps/emqx_ft/test/emqx_ft_test_helpers.erl | 2 +- apps/emqx_s3/src/emqx_s3_profile_conf.erl | 2 +- apps/emqx_s3/test/emqx_s3_client_SUITE.erl | 2 +- apps/emqx_s3/test/emqx_s3_profile_conf_SUITE.erl | 8 ++++---- apps/emqx_s3/test/emqx_s3_uploader_SUITE.erl | 2 +- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/apps/emqx_ft/src/emqx_ft.erl b/apps/emqx_ft/src/emqx_ft.erl index 45207baa9..95982b849 100644 --- a/apps/emqx_ft/src/emqx_ft.erl +++ b/apps/emqx_ft/src/emqx_ft.erl @@ -98,7 +98,7 @@ unhook() -> %%-------------------------------------------------------------------- decode_filemeta(Payload) when is_binary(Payload) -> - case emqx_json:safe_decode(Payload, [return_maps]) of + case emqx_utils_json:safe_decode(Payload, [return_maps]) of {ok, Map} -> decode_filemeta(Map); {error, Error} -> @@ -116,7 +116,7 @@ decode_filemeta(Map) when is_map(Map) -> encode_filemeta(Meta = #{}) -> Schema = emqx_ft_schema:schema(filemeta), - hocon_tconf:make_serializable(Schema, emqx_map_lib:binary_key_map(Meta), #{}). + hocon_tconf:make_serializable(Schema, emqx_utils_maps:binary_key_map(Meta), #{}). %%-------------------------------------------------------------------- %% Hooks diff --git a/apps/emqx_ft/src/emqx_ft_api.erl b/apps/emqx_ft/src/emqx_ft_api.erl index 1ea710848..85fd8d8cb 100644 --- a/apps/emqx_ft/src/emqx_ft_api.erl +++ b/apps/emqx_ft/src/emqx_ft_api.erl @@ -75,7 +75,7 @@ schema("/file_transfer/files") -> end. error_msg(Code, Msg) -> - #{code => Code, message => emqx_misc:readable_error_msg(Msg)}. + #{code => Code, message => emqx_utils:readable_error_msg(Msg)}. roots() -> []. diff --git a/apps/emqx_ft/src/emqx_ft_conf.erl b/apps/emqx_ft/src/emqx_ft_conf.erl index 14a79b94c..dd9806e95 100644 --- a/apps/emqx_ft/src/emqx_ft_conf.erl +++ b/apps/emqx_ft/src/emqx_ft_conf.erl @@ -63,18 +63,18 @@ storage() -> -spec gc_interval(_Storage) -> milliseconds(). gc_interval(_Storage) -> Conf = assert_storage(local), - emqx_map_lib:deep_get([segments, gc, interval], Conf, ?DEFAULT_GC_INTERVAL). + emqx_utils_maps:deep_get([segments, gc, interval], Conf, ?DEFAULT_GC_INTERVAL). -spec segments_ttl(_Storage) -> {_Min :: seconds(), _Max :: seconds()}. segments_ttl(_Storage) -> Conf = assert_storage(local), { - emqx_map_lib:deep_get( + emqx_utils_maps:deep_get( [segments, gc, minimum_segments_ttl], Conf, ?DEFAULT_MIN_SEGMENTS_TTL ), - emqx_map_lib:deep_get( + emqx_utils_maps:deep_get( [segments, gc, maximum_segments_ttl], Conf, ?DEFAULT_MAX_SEGMENTS_TTL diff --git a/apps/emqx_ft/src/emqx_ft_storage_exporter_fs.erl b/apps/emqx_ft/src/emqx_ft_storage_exporter_fs.erl index ae8315510..4b05c9a58 100644 --- a/apps/emqx_ft/src/emqx_ft_storage_exporter_fs.erl +++ b/apps/emqx_ft/src/emqx_ft_storage_exporter_fs.erl @@ -315,10 +315,10 @@ list(_Options) -> -define(PRELUDE(Vsn, Meta), [<<"filemeta">>, Vsn, Meta]). encode_filemeta(Meta) -> - emqx_json:encode(?PRELUDE(_Vsn = 1, emqx_ft:encode_filemeta(Meta))). + emqx_utils_json:encode(?PRELUDE(_Vsn = 1, emqx_ft:encode_filemeta(Meta))). decode_filemeta(Binary) when is_binary(Binary) -> - ?PRELUDE(_Vsn = 1, Map) = emqx_json:decode(Binary, [return_maps]), + ?PRELUDE(_Vsn = 1, Map) = emqx_utils_json:decode(Binary, [return_maps]), case emqx_ft:decode_filemeta(Map) of {ok, Meta} -> Meta; diff --git a/apps/emqx_ft/src/emqx_ft_storage_exporter_fs_api.erl b/apps/emqx_ft/src/emqx_ft_storage_exporter_fs_api.erl index b7ad86436..f1a8c6dae 100644 --- a/apps/emqx_ft/src/emqx_ft_storage_exporter_fs_api.erl +++ b/apps/emqx_ft/src/emqx_ft_storage_exporter_fs_api.erl @@ -134,7 +134,7 @@ fields(file_node) -> end. error_msg(Code, Msg) -> - #{code => Code, message => emqx_misc:readable_error_msg(Msg)}. + #{code => Code, message => emqx_utils:readable_error_msg(Msg)}. -spec mk_export_uri(node(), file:name()) -> uri_string:uri_string(). @@ -150,7 +150,7 @@ mk_export_uri(Node, Filepath) -> %% parse_node(NodeBin) -> - case emqx_misc:safe_to_existing_atom(NodeBin) of + case emqx_utils:safe_to_existing_atom(NodeBin) of {ok, Node} -> Node; {error, _} -> diff --git a/apps/emqx_ft/src/emqx_ft_storage_exporter_s3.erl b/apps/emqx_ft/src/emqx_ft_storage_exporter_s3.erl index 259cb4016..adf000346 100644 --- a/apps/emqx_ft/src/emqx_ft_storage_exporter_s3.erl +++ b/apps/emqx_ft/src/emqx_ft_storage_exporter_s3.erl @@ -135,7 +135,7 @@ s3_headers({ClientId, FileId}, Filemeta) -> }. s3_header_filemeta(Filemeta) -> - emqx_json:encode(emqx_ft:encode_filemeta(Filemeta), [force_utf8, uescape]). + emqx_utils_json:encode(emqx_ft:encode_filemeta(Filemeta), [force_utf8, uescape]). list(Client, Options) -> case list_key_info(Client, Options) of diff --git a/apps/emqx_ft/src/emqx_ft_storage_fs.erl b/apps/emqx_ft/src/emqx_ft_storage_fs.erl index d871d1f32..1b1d9ecf7 100644 --- a/apps/emqx_ft/src/emqx_ft_storage_fs.erl +++ b/apps/emqx_ft/src/emqx_ft_storage_fs.erl @@ -271,7 +271,7 @@ read_transferinfo(Storage, Transfer, Acc) -> -spec get_root(storage()) -> file:name(). get_root(Storage) -> - case emqx_map_lib:deep_find([segments, root], Storage) of + case emqx_utils_maps:deep_find([segments, root], Storage) of {ok, Root} -> Root; {not_found, _, _} -> @@ -296,10 +296,10 @@ get_subdirs_for(temporary) -> -define(PRELUDE(Vsn, Meta), [<<"filemeta">>, Vsn, Meta]). encode_filemeta(Meta) -> - emqx_json:encode(?PRELUDE(_Vsn = 1, emqx_ft:encode_filemeta(Meta))). + emqx_utils_json:encode(?PRELUDE(_Vsn = 1, emqx_ft:encode_filemeta(Meta))). decode_filemeta(Binary) when is_binary(Binary) -> - ?PRELUDE(_Vsn = 1, Map) = emqx_json:decode(Binary, [return_maps]), + ?PRELUDE(_Vsn = 1, Map) = emqx_utils_json:decode(Binary, [return_maps]), case emqx_ft:decode_filemeta(Map) of {ok, Meta} -> Meta; @@ -347,7 +347,7 @@ read_file(Filepath, DecodeFun) -> write_file_atomic(Storage, Transfer, Filepath, Content) when is_binary(Content) -> TempFilepath = mk_temp_filepath(Storage, Transfer, filename:basename(Filepath)), - Result = emqx_misc:pipeline( + Result = emqx_utils:pipeline( [ fun filelib:ensure_dir/1, fun write_contents/2, diff --git a/apps/emqx_ft/src/emqx_ft_storage_fs_gc.erl b/apps/emqx_ft/src/emqx_ft_storage_fs_gc.erl index 2ab30e88b..0f61e65b7 100644 --- a/apps/emqx_ft/src/emqx_ft_storage_fs_gc.erl +++ b/apps/emqx_ft/src/emqx_ft_storage_fs_gc.erl @@ -135,7 +135,7 @@ maybe_report(#gcstats{} = _Stats, #st{storage = _Storage}) -> start_timer(St = #st{storage = Storage, next_gc_timer = undefined}) -> case emqx_ft_conf:gc_interval(Storage) of Delay when Delay > 0 -> - St#st{next_gc_timer = emqx_misc:start_timer(Delay, collect)}; + St#st{next_gc_timer = emqx_utils:start_timer(Delay, collect)}; 0 -> ?SLOG(warning, #{msg => "periodic_gc_disabled"}), St @@ -144,7 +144,7 @@ start_timer(St = #st{storage = Storage, next_gc_timer = undefined}) -> reset_timer(St = #st{next_gc_timer = undefined}) -> start_timer(St); reset_timer(St = #st{next_gc_timer = TRef}) -> - ok = emqx_misc:cancel_timer(TRef), + ok = emqx_utils:cancel_timer(TRef), start_timer(St#st{next_gc_timer = undefined}). gc_enabled(St) -> diff --git a/apps/emqx_ft/test/emqx_ft_SUITE.erl b/apps/emqx_ft/test/emqx_ft_SUITE.erl index 3649d02f8..151b8e5fe 100644 --- a/apps/emqx_ft/test/emqx_ft_SUITE.erl +++ b/apps/emqx_ft/test/emqx_ft_SUITE.erl @@ -63,7 +63,7 @@ set_special_configs(Config) -> % NOTE % Inhibit local fs GC to simulate it isn't fast enough to collect % complete transfers. - storage => emqx_map_lib:deep_merge( + storage => emqx_utils_maps:deep_merge( Storage, #{segments => #{gc => #{interval => 0}}} ) @@ -325,7 +325,7 @@ t_invalid_meta(Config) -> %% Invalid schema Meta = #{foo => <<"bar">>}, - MetaPayload = emqx_json:encode(Meta), + MetaPayload = emqx_utils_json:encode(Meta), ?assertRCName( unspecified_error, emqtt:publish(C, mk_init_topic(FileId), MetaPayload, 1) @@ -667,7 +667,7 @@ meta(FileName, Data) -> }. encode_meta(Meta) -> - emqx_json:encode(emqx_ft:encode_filemeta(Meta)). + emqx_utils_json:encode(emqx_ft:encode_filemeta(Meta)). list_files(ClientId) -> {ok, Files} = emqx_ft_storage:files(), diff --git a/apps/emqx_ft/test/emqx_ft_api_SUITE.erl b/apps/emqx_ft/test/emqx_ft_api_SUITE.erl index a1bef2a2a..5f3b213fb 100644 --- a/apps/emqx_ft/test/emqx_ft_api_SUITE.erl +++ b/apps/emqx_ft/test/emqx_ft_api_SUITE.erl @@ -137,7 +137,7 @@ request(Method, Url, Decoder) when is_function(Decoder) -> end. json(Body) when is_binary(Body) -> - emqx_json:decode(Body, [return_maps]). + emqx_utils_json:decode(Body, [return_maps]). query(Params) -> KVs = lists:map(fun({K, V}) -> uri_encode(K) ++ "=" ++ uri_encode(V) end, maps:to_list(Params)), diff --git a/apps/emqx_ft/test/emqx_ft_storage_fs_gc_SUITE.erl b/apps/emqx_ft/test/emqx_ft_storage_fs_gc_SUITE.erl index 90039cd96..abf2749ed 100644 --- a/apps/emqx_ft/test/emqx_ft_storage_fs_gc_SUITE.erl +++ b/apps/emqx_ft/test/emqx_ft_storage_fs_gc_SUITE.erl @@ -127,7 +127,7 @@ t_gc_complete_transfers(_Config) -> } ], % 1. Start all transfers - TransferSizes = emqx_misc:pmap( + TransferSizes = emqx_utils:pmap( fun(Transfer) -> start_transfer(Storage, Transfer) end, Transfers ), @@ -162,7 +162,7 @@ t_gc_complete_transfers(_Config) -> ), ?assertEqual( [ok, ok], - emqx_misc:pmap( + emqx_utils:pmap( fun({Transfer, Size}) -> complete_transfer(Storage, Transfer, Size) end, [{T2, S2}, {T3, S3}] ) @@ -221,7 +221,7 @@ t_gc_incomplete_transfers(_Config) -> } ], % 1. Start transfers, send all the segments but don't trigger completion. - _ = emqx_misc:pmap(fun(Transfer) -> start_transfer(Storage, Transfer) end, Transfers), + _ = emqx_utils:pmap(fun(Transfer) -> start_transfer(Storage, Transfer) end, Transfers), % 2. Enable periodic GC every 0.5 seconds. ok = set_gc_config(interval, 500), ok = emqx_ft_storage_fs_gc:reset(Storage), diff --git a/apps/emqx_ft/test/emqx_ft_test_helpers.erl b/apps/emqx_ft/test/emqx_ft_test_helpers.erl index b7004dcc6..704e55454 100644 --- a/apps/emqx_ft/test/emqx_ft_test_helpers.erl +++ b/apps/emqx_ft/test/emqx_ft_test_helpers.erl @@ -82,7 +82,7 @@ upload_file(ClientId, FileId, Name, Data, Node) -> expire_at => erlang:system_time(_Unit = second) + 3600, size => Size }, - MetaPayload = emqx_json:encode(emqx_ft:encode_filemeta(Meta)), + MetaPayload = emqx_utils_json:encode(emqx_ft:encode_filemeta(Meta)), ct:pal("MetaPayload = ~ts", [MetaPayload]), diff --git a/apps/emqx_s3/src/emqx_s3_profile_conf.erl b/apps/emqx_s3/src/emqx_s3_profile_conf.erl index 3d66823a7..87f006bcb 100644 --- a/apps/emqx_s3/src/emqx_s3_profile_conf.erl +++ b/apps/emqx_s3/src/emqx_s3_profile_conf.erl @@ -351,7 +351,7 @@ http_config( ]. maybe_ipv6_probe(TransportOpts, true) -> - emqx_misc:ipv6_probe(TransportOpts); + emqx_utils:ipv6_probe(TransportOpts); maybe_ipv6_probe(TransportOpts, false) -> TransportOpts. diff --git a/apps/emqx_s3/test/emqx_s3_client_SUITE.erl b/apps/emqx_s3/test/emqx_s3_client_SUITE.erl index cb55bc083..434510867 100644 --- a/apps/emqx_s3/test/emqx_s3_client_SUITE.erl +++ b/apps/emqx_s3/test/emqx_s3_client_SUITE.erl @@ -159,7 +159,7 @@ profile_config(Config) -> ?config(bucket, Config), ProfileConfig0 ), - ProfileConfig2 = emqx_map_lib:deep_put( + ProfileConfig2 = emqx_utils_maps:deep_put( [transport_options, pool_type], ProfileConfig1, ?config(pool_type, Config) diff --git a/apps/emqx_s3/test/emqx_s3_profile_conf_SUITE.erl b/apps/emqx_s3/test/emqx_s3_profile_conf_SUITE.erl index ce53525be..4b70ba015 100644 --- a/apps/emqx_s3/test/emqx_s3_profile_conf_SUITE.erl +++ b/apps/emqx_s3/test/emqx_s3_profile_conf_SUITE.erl @@ -62,7 +62,7 @@ t_regular_outdated_pool_cleanup(Config) -> [OldPool] = emqx_s3_profile_http_pools:all(profile_id()), ProfileBaseConfig = ?config(profile_config, Config), - ProfileConfig = emqx_map_lib:deep_put( + ProfileConfig = emqx_utils_maps:deep_put( [transport_options, pool_size], ProfileBaseConfig, 16 ), ok = emqx_s3:update_profile(profile_id(), ProfileConfig), @@ -110,7 +110,7 @@ t_timeout_pool_cleanup(Config) -> [OldPool] = emqx_s3_profile_http_pools:all(profile_id()), - NewProfileConfig = emqx_map_lib:deep_put( + NewProfileConfig = emqx_utils_maps:deep_put( [transport_options, pool_size], ProfileConfig, 16 ), @@ -153,7 +153,7 @@ t_httpc_pool_update_error(Config) -> meck:expect(ehttpc_pool, init, fun(_) -> meck:raise(error, badarg) end), ProfileBaseConfig = ?config(profile_config, Config), - NewProfileConfig = emqx_map_lib:deep_put( + NewProfileConfig = emqx_utils_maps:deep_put( [transport_options, pool_size], ProfileBaseConfig, 16 ), @@ -237,7 +237,7 @@ t_checkout_client(Config) -> %% Now change config for the profile ProfileBaseConfig = ?config(profile_config, Config), NewProfileConfig0 = ProfileBaseConfig#{bucket => <<"new_bucket">>}, - NewProfileConfig1 = emqx_map_lib:deep_put( + NewProfileConfig1 = emqx_utils_maps:deep_put( [transport_options, pool_size], NewProfileConfig0, 16 ), ok = emqx_s3:update_profile(profile_id(), NewProfileConfig1), diff --git a/apps/emqx_s3/test/emqx_s3_uploader_SUITE.erl b/apps/emqx_s3/test/emqx_s3_uploader_SUITE.erl index e09ea2773..6ba0e3ed9 100644 --- a/apps/emqx_s3/test/emqx_s3_uploader_SUITE.erl +++ b/apps/emqx_s3/test/emqx_s3_uploader_SUITE.erl @@ -526,7 +526,7 @@ t_tls_error(Config) -> _ = process_flag(trap_exit, true), ProfileBaseConfig = ?config(profile_config, Config), - ProfileConfig = emqx_map_lib:deep_put( + ProfileConfig = emqx_utils_maps:deep_put( [transport_options, ssl, server_name_indication], ProfileBaseConfig, "invalid-hostname" ), ok = emqx_s3:update_profile(profile_id(), ProfileConfig),