Skip to content

Commit bdd5176

Browse files
committed
QQ: add v8 modules
And tidy up some backwards compatible code that is no longer needed.
1 parent 8096520 commit bdd5176

File tree

7 files changed

+3517
-480
lines changed

7 files changed

+3517
-480
lines changed

deps/rabbit/src/rabbit_fifo.erl

Lines changed: 145 additions & 349 deletions
Large diffs are not rendered by default.

deps/rabbit/src/rabbit_fifo_client.erl

Lines changed: 14 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -376,24 +376,12 @@ checkout(ConsumerTag, CreditMode, #{} = Meta,
376376
is_tuple(CreditMode) ->
377377
Servers = sorted_servers(State0),
378378
ConsumerId = consumer_id(ConsumerTag),
379-
Spec = case rabbit_fifo:is_v4() of
380-
true ->
381-
case CreditMode of
382-
{simple_prefetch, 0} ->
383-
{auto, {simple_prefetch,
384-
?UNLIMITED_PREFETCH_COUNT}};
385-
_ ->
386-
{auto, CreditMode}
387-
end;
388-
false ->
389-
case CreditMode of
390-
{credited, _} ->
391-
{auto, 0, credited};
392-
{simple_prefetch, 0} ->
393-
{auto, ?UNLIMITED_PREFETCH_COUNT, simple_prefetch};
394-
{simple_prefetch, Num} ->
395-
{auto, Num, simple_prefetch}
396-
end
379+
Spec = case CreditMode of
380+
{simple_prefetch, 0} ->
381+
{auto, {simple_prefetch,
382+
?UNLIMITED_PREFETCH_COUNT}};
383+
_ ->
384+
{auto, CreditMode}
397385
end,
398386
Cmd = rabbit_fifo:make_checkout(ConsumerId, Spec, Meta),
399387
%% ???
@@ -417,19 +405,15 @@ checkout(ConsumerTag, CreditMode, #{} = Meta,
417405
NextMsgId - 1
418406
end
419407
end,
420-
DeliveryCount = case rabbit_fifo:is_v4() of
421-
true -> credit_api_v2;
422-
false -> {credit_api_v1, 0}
423-
end,
408+
DeliveryCount = credit_api_v2,
424409
ConsumerKey = maps:get(key, Reply, ConsumerId),
425-
SDels = maps:update_with(
426-
ConsumerTag,
427-
fun (C) -> C#consumer{ack = Ack} end,
428-
#consumer{key = ConsumerKey,
429-
last_msg_id = LastMsgId,
430-
ack = Ack,
431-
delivery_count = DeliveryCount},
432-
CDels0),
410+
SDels = maps:update_with(ConsumerTag,
411+
fun (C) -> C#consumer{ack = Ack} end,
412+
#consumer{key = ConsumerKey,
413+
last_msg_id = LastMsgId,
414+
ack = Ack,
415+
delivery_count = DeliveryCount},
416+
CDels0),
433417
{ok, Reply, State0#state{leader = Leader,
434418
consumers = SDels}};
435419
Err ->

0 commit comments

Comments
 (0)