Skip to content

support amqp10 message without body #14967

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 3 commits into
base: main
Choose a base branch
from
Draft

support amqp10 message without body #14967

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9de5fb4
support undefined body
thorhalvor Nov 18, 2025
54ea0b6
support that Payload is not used
thorhalvor Nov 18, 2025
7200645
overload with undefined will never happen because of decode_bin
thorhalvor Nov 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions deps/rabbit/src/mc_amqp.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,6 +346,31 @@ prepare(read, Msg) ->
Msg;
prepare(store, Msg = #v1{}) ->
Msg;
prepare(store, #msg_body_encoded{
message_annotations = MA,
properties = Props,
bare_and_footer = BF,
bare_and_footer_application_properties_pos = AppPropsPos,
bare_and_footer_body_pos = uninit,
body_code = uninit}) ->
%% Message has no body section. We still convert to #v1{} so that
%% classic/quorum queues can store it on disk. We mark the body
%% position at the end of the bare_and_footer binary; since there
%% is no actual body, decoding will only see properties and
%% application-properties.
PropsPos = case Props of
undefined -> ?OMITTED_SECTION;
#'v1_0.properties'{} -> 0
end,
#v1{message_annotations = MA,
bare_and_footer = BF,
bare_and_footer_properties_pos = PropsPos,
bare_and_footer_application_properties_pos = AppPropsPos,
bare_and_footer_body_pos = byte_size(BF),
%% body_code is unused when there is no body, but must be a valid
%% descriptor code; DATA is the most neutral choice.
body_code = ?DESCRIPTOR_CODE_DATA
};
prepare(store, #msg_body_encoded{
message_annotations = MA,
properties = Props,
Expand Down Expand Up @@ -609,6 +634,9 @@ msg_body_decoded([#'v1_0.amqp_value'{} = B | Rem], #msg_body_decoded{} = Msg) ->
msg_body_decoded([#'v1_0.footer'{content = FC} | Rem], Msg) ->
msg_body_decoded(Rem, Msg#msg_body_decoded{footer = FC}).

msg_body_encoded([], _Payload, Msg) ->
%% handle empty or undefined body
Msg;
msg_body_encoded([#'v1_0.header'{} = H | Rem], Payload, Msg) ->
msg_body_encoded(Rem, Payload, Msg#msg_body_encoded{header = H});
msg_body_encoded([_Ignore = #'v1_0.delivery_annotations'{} | Rem], Payload, Msg) ->
Expand Down
Loading