Skip to content

Commit d53557b

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

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
@@ -377,24 +377,12 @@ checkout(ConsumerTag, CreditMode, #{} = Meta,
377377
is_tuple(CreditMode) ->
378378
Servers = sorted_servers(State0),
379379
ConsumerId = consumer_id(ConsumerTag),
380-
Spec = case rabbit_fifo:is_v4() of
381-
true ->
382-
case CreditMode of
383-
{simple_prefetch, 0} ->
384-
{auto, {simple_prefetch,
385-
?UNLIMITED_PREFETCH_COUNT}};
386-
_ ->
387-
{auto, CreditMode}
388-
end;
389-
false ->
390-
case CreditMode of
391-
{credited, _} ->
392-
{auto, 0, credited};
393-
{simple_prefetch, 0} ->
394-
{auto, ?UNLIMITED_PREFETCH_COUNT, simple_prefetch};
395-
{simple_prefetch, Num} ->
396-
{auto, Num, simple_prefetch}
397-
end
380+
Spec = case CreditMode of
381+
{simple_prefetch, 0} ->
382+
{auto, {simple_prefetch,
383+
?UNLIMITED_PREFETCH_COUNT}};
384+
_ ->
385+
{auto, CreditMode}
398386
end,
399387
Cmd = rabbit_fifo:make_checkout(ConsumerId, Spec, Meta),
400388
%% ???
@@ -418,19 +406,15 @@ checkout(ConsumerTag, CreditMode, #{} = Meta,
418406
NextMsgId - 1
419407
end
420408
end,
421-
DeliveryCount = case rabbit_fifo:is_v4() of
422-
true -> credit_api_v2;
423-
false -> {credit_api_v1, 0}
424-
end,
409+
DeliveryCount = credit_api_v2,
425410
ConsumerKey = maps:get(key, Reply, ConsumerId),
426-
SDels = maps:update_with(
427-
ConsumerTag,
428-
fun (C) -> C#consumer{ack = Ack} end,
429-
#consumer{key = ConsumerKey,
430-
last_msg_id = LastMsgId,
431-
ack = Ack,
432-
delivery_count = DeliveryCount},
433-
CDels0),
411+
SDels = maps:update_with(ConsumerTag,
412+
fun (C) -> C#consumer{ack = Ack} end,
413+
#consumer{key = ConsumerKey,
414+
last_msg_id = LastMsgId,
415+
ack = Ack,
416+
delivery_count = DeliveryCount},
417+
CDels0),
434418
{ok, Reply, State0#state{leader = Leader,
435419
consumers = SDels}};
436420
Err ->

0 commit comments

Comments
 (0)