A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(gateway): stop dropping newly requested lazy ranges (#2293)
Hampus6786dfe7e32d
diff --git a/fluxer_gateway/src/guild/guild_subscription_handler.erl b/fluxer_gateway/src/guild/guild_subscription_handler.erlindex 84fd64fc2..3e0274135 100644--- a/fluxer_gateway/src/guild/guild_subscription_handler.erl+++ b/fluxer_gateway/src/guild/guild_subscription_handler.erl@@ -88,11 +88,24 @@ merge_lazy_subscribe_request(_ExistingRequest, Request) ->[guild_member_list:range()], [guild_member_list:range()]) -> [guild_member_list:range()].merge_lazy_subscribe_ranges(ExistingRanges, Ranges) ->- lists:sublist(- guild_member_list:normalize_ranges(ExistingRanges ++ Ranges),- ?MAX_BUFFERED_LAZY_SUBSCRIBE_RANGES+ limit_lazy_subscribe_ranges(+ guild_member_list:normalize_ranges(ExistingRanges ++ Ranges), Ranges).+-spec limit_lazy_subscribe_ranges(+ [guild_member_list:range()], [guild_member_list:range()]+) -> [guild_member_list:range()].+limit_lazy_subscribe_ranges(MergedRanges, Ranges) ->+ case length(MergedRanges) > ?MAX_BUFFERED_LAZY_SUBSCRIBE_RANGES of+ true ->+ lists:sublist(+ guild_member_list:normalize_ranges(Ranges),+ ?MAX_BUFFERED_LAZY_SUBSCRIBE_RANGES+ );+ false ->+ MergedRanges+ end.+-spec flush_lazy_subscribe_buffer(guild_state()) -> guild_state().flush_lazy_subscribe_buffer(State) ->Buffer = maps:get(lazy_subscribe_buffer, State, #{}),@@ -453,6 +466,29 @@ buffer_lazy_subscribe_moves_replaced_key_to_tail_test() ->ordered_lazy_subscribe_keys(State3, maps:get(lazy_subscribe_buffer, State3))).+buffer_lazy_subscribe_keeps_newest_ranges_over_limit_test() ->+ Existing = [{Start * 200, Start * 200 + 99} || Start <- lists:seq(0, 9)],+ Request1 = #{session_id => <<"s1">>, channel_id => 500, ranges => Existing},+ State1 = buffer_lazy_subscribe(Request1, #{}),+ Request2 = #{session_id => <<"s1">>, channel_id => 500, ranges => [{0, 99}, {5000, 5099}]},+ State2 = buffer_lazy_subscribe(Request2, State1),+ Buffer = maps:get(lazy_subscribe_buffer, State2),+ ?assertEqual(+ Request2#{ranges := [{0, 99}, {5000, 5099}]}, maps:get({<<"s1">>, 500}, Buffer)+ ).++buffer_lazy_subscribe_caps_merged_ranges_test() ->+ Existing = [{Start * 200, Start * 200 + 99} || Start <- lists:seq(0, 9)],+ Request1 = #{session_id => <<"s1">>, channel_id => 500, ranges => Existing},+ State1 = buffer_lazy_subscribe(Request1, #{}),+ Ranges2 = [{Start * 200, Start * 200 + 99} || Start <- lists:seq(20, 30)],+ Request2 = #{session_id => <<"s1">>, channel_id => 500, ranges => Ranges2},+ State2 = buffer_lazy_subscribe(Request2, State1),+ Buffer = maps:get(lazy_subscribe_buffer, State2),+ #{ranges := Merged} = maps:get({<<"s1">>, 500}, Buffer),+ ?assertEqual(?MAX_BUFFERED_LAZY_SUBSCRIBE_RANGES, length(Merged)),+ ?assertEqual(lists:sublist(Ranges2, ?MAX_BUFFERED_LAZY_SUBSCRIBE_RANGES), Merged).+flush_lazy_subscribe_buffer_clears_state_test() ->Buffer = #{{<<"s1">>, 500} => #{session_id => <<"s1">>, channel_id => 500, ranges => []}},State = #{lazy_subscribe_buffer => Buffer, lazy_subscribe_timer => make_ref()},