yuanbiao
/
emqx
1
0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

chore(dsrepl): mark few more BPAPI targets as obsolete

This commit is contained in:
Andrew Mayorov 2024-03-25 19:45:56 +01:00
parent 4dbf68716a
commit 0e36f7afa4
No known key found for this signature in database
GPG Key ID: 2837C62ACFBFED5D
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
apps/emqx_durable_storage/src/emqx_ds_replication_layer.erl
View File

@ -43,7 +43,6 @@
-export([ -export([
%% RPC Targets: %% RPC Targets:
do_drop_db_v1/1, do_drop_db_v1/1,
do_store_batch_v1/4,
do_get_streams_v1/4, do_get_streams_v1/4,
do_get_streams_v2/4, do_get_streams_v2/4,
do_make_iterator_v2/5, do_make_iterator_v2/5,
@ -53,11 +52,11 @@
do_get_delete_streams_v4/4, do_get_delete_streams_v4/4,
do_make_delete_iterator_v4/5, do_make_delete_iterator_v4/5,
do_delete_next_v4/5, do_delete_next_v4/5,
%% Unused:
do_drop_generation_v3/3,
%% Obsolete: %% Obsolete:
do_store_batch_v1/4,
do_make_iterator_v1/5, do_make_iterator_v1/5,
do_add_generation_v2/1, do_add_generation_v2/1,
do_drop_generation_v3/3,
%% Egress API: %% Egress API:
ra_store_batch/3 ra_store_batch/3
@ -139,6 +138,8 @@
-type message_id() :: emqx_ds:message_id(). -type message_id() :: emqx_ds:message_id().
%% TODO: this type is obsolete and is kept only for compatibility with
%% BPAPIs. Remove it when emqx_ds_proto_v4 is gone (EMQX 5.6)
-type batch() :: #{ -type batch() :: #{
?tag := ?BATCH, ?tag := ?BATCH,
?batch_messages := [emqx_types:message()] ?batch_messages := [emqx_types:message()]
@ -391,10 +392,9 @@ do_drop_db_v1(DB) ->
batch(), batch(),
emqx_ds:message_store_opts() emqx_ds:message_store_opts()
) -> ) ->
emqx_ds:store_batch_result(). no_return().
do_store_batch_v1(DB, Shard, #{?tag := ?BATCH, ?batch_messages := Messages}, Options) -> do_store_batch_v1(_DB, _Shard, _Batch, _Options) ->
Batch = [{emqx_message:timestamp(Message), Message} || Message <- Messages], error(obsolete_api).
emqx_ds_storage_layer:store_batch({DB, Shard}, Batch, Options).
%% Remove me in EMQX 5.6 %% Remove me in EMQX 5.6
-dialyzer({nowarn_function, do_get_streams_v1/4}). -dialyzer({nowarn_function, do_get_streams_v1/4}).
@ -489,9 +489,9 @@ do_list_generations_with_lifetimes_v3(DB, ShardId) ->
emqx_ds_storage_layer:list_generations_with_lifetimes({DB, ShardId}). emqx_ds_storage_layer:list_generations_with_lifetimes({DB, ShardId}).
-spec do_drop_generation_v3(emqx_ds:db(), shard_id(), emqx_ds_storage_layer:gen_id()) -> -spec do_drop_generation_v3(emqx_ds:db(), shard_id(), emqx_ds_storage_layer:gen_id()) ->
ok | {error, _}. no_return().
do_drop_generation_v3(DB, ShardId, GenId) -> do_drop_generation_v3(_DB, _ShardId, _GenId) ->
emqx_ds_storage_layer:drop_generation({DB, ShardId}, GenId). error(obsolete_api).
-spec do_get_delete_streams_v4( -spec do_get_delete_streams_v4(
emqx_ds:db(), emqx_ds_replication_layer:shard_id(), emqx_ds:topic_filter(), emqx_ds:time() emqx_ds:db(), emqx_ds_replication_layer:shard_id(), emqx_ds:topic_filter(), emqx_ds:time()