diff --git a/deps/rabbitmq_stream/src/rabbit_stream_reader.erl b/deps/rabbitmq_stream/src/rabbit_stream_reader.erl index 2b70915eda6..2e2eed29031 100644 --- a/deps/rabbitmq_stream/src/rabbit_stream_reader.erl +++ b/deps/rabbitmq_stream/src/rabbit_stream_reader.erl @@ -3565,12 +3565,9 @@ subscription_exists(StreamSubscriptions, SubscriptionId) -> lists:any(fun(Id) -> Id =:= SubscriptionId end, SubscriptionIds). send_file_callback(?VERSION_1, - Transport, _Log, #consumer{configuration = - #consumer_configuration{socket = S, - subscription_id = - SubscriptionId, + #consumer_configuration{subscription_id = SubId, counters = Counters}}, Counter) -> fun(#{chunk_id := FirstOffsetInChunk, num_entries := NumEntries}, @@ -3581,19 +3578,16 @@ send_file_callback(?VERSION_1, ?REQUEST:1, ?COMMAND_DELIVER:15, ?VERSION_1:16, - SubscriptionId:8/unsigned>>, - Transport:send(S, FrameBeginning), + SubId:8/unsigned>>, atomics:add(Counter, 1, Size), increase_messages_consumed(Counters, NumEntries), - set_consumer_offset(Counters, FirstOffsetInChunk) + set_consumer_offset(Counters, FirstOffsetInChunk), + FrameBeginning end; send_file_callback(?VERSION_2, - Transport, Log, #consumer{configuration = - #consumer_configuration{socket = S, - subscription_id = - SubscriptionId, + #consumer_configuration{subscription_id = SubId, counters = Counters}}, Counter) -> fun(#{chunk_id := FirstOffsetInChunk, num_entries := NumEntries}, @@ -3605,12 +3599,12 @@ send_file_callback(?VERSION_2, ?REQUEST:1, ?COMMAND_DELIVER:15, ?VERSION_2:16, - SubscriptionId:8/unsigned, + SubId:8/unsigned, CommittedChunkId:64>>, - Transport:send(S, FrameBeginning), atomics:add(Counter, 1, Size), increase_messages_consumed(Counters, NumEntries), - set_consumer_offset(Counters, FirstOffsetInChunk) + set_consumer_offset(Counters, FirstOffsetInChunk), + FrameBeginning end. send_chunks(DeliverVersion, @@ -3680,9 +3674,7 @@ send_chunks(DeliverVersion, Retry, Counter) -> case osiris_log:send_file(Socket, Log, - send_file_callback(DeliverVersion, - Transport, - Log, + send_file_callback(DeliverVersion, Log, Consumer, Counter)) of diff --git a/rabbitmq-components.mk b/rabbitmq-components.mk index 4a97678543b..054f72df03b 100644 --- a/rabbitmq-components.mk +++ b/rabbitmq-components.mk @@ -49,7 +49,7 @@ dep_jose = hex 1.11.10 dep_khepri = hex 0.17.1 dep_khepri_mnesia_migration = hex 0.8.0 dep_meck = hex 1.0.0 -dep_osiris = git https://github.com/rabbitmq/osiris v1.8.8 +dep_osiris = git https://github.com/rabbitmq/osiris send-file-improvements dep_prometheus = hex 4.11.0 dep_ra = hex 2.16.11 dep_ranch = hex 2.2.0