WIP: Optimise annotation expansion for mc_amqp#15743
Draft
Conversation
kjnilsson
changed the title
There was a problem hiding this comment.
Pull request overview
Optimizes how mc_amqp expands mc:annotations() into AMQP 1.0 message annotations during protocol_state/2, aiming to reduce per-annotation list scans.
Changes:
- Prefilters existing message annotations (
MA0) before folding in new annotations fromAnns. - Replaces
lists:keystore/4-based upsert with O(1) consing for newly added annotations. - Leaves the previous upsert helper and call sites commented out.
💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.
deps/rabbit/src/mc_amqp.erl
Outdated
Comment on lines
+476
to
+488
| %% filter all MA's that are going to be overwrtten by ANNS | ||
| MA = lists:filter( | ||
| fun | ||
| ({{symbol, <<"x-", _/binary>> = K}, _}) -> | ||
| not maps:is_key(K, Anns); | ||
| ({{symbol, <<"x-exchange">>}, _}) -> | ||
| not maps:is_key(?ANN_EXCHANGE, Anns); | ||
| ({{symbol, <<"x-routing-key">>}, _}) -> | ||
| not maps:is_key(?ANN_ROUTING_KEYS, Anns); | ||
| ({{symbol, <<"x-opt-rabbitmq-received-time">>}, _}) -> | ||
| not maps:is_key(<<"timestamp_in_ms">>, Anns); | ||
| ({{symbol, <<"x-opt-deaths">>}, _}) -> | ||
| not maps:is_key(deaths, Anns); |
deps/rabbit/src/mc_amqp.erl
Outdated
| amqp_annotations(). | ||
| protocol_state_message_annotations(MA, Anns) -> | ||
| protocol_state_message_annotations(MA0, Anns) -> | ||
| %% filter all MA's that are going to be overwrtten by ANNS |
deps/rabbit/src/mc_amqp.erl
Outdated
Comment on lines
+499
to
+522
| % maps_upsert(<<"x-routing-key">>, {utf8, RKey}, L); | ||
| (<<"x-", _/binary>> = K, V, L) | ||
| when V =/= undefined -> | ||
| %% any x-* annotations get added as message annotations | ||
| maps_upsert(K, mc_util:infer_type(V), L); | ||
| [{{symbol, K}, mc_util:infer_type(V)} | L]; | ||
| % maps_upsert(K, mc_util:infer_type(V), L); | ||
| (<<"timestamp_in_ms">>, V, L) -> | ||
| maps_upsert(<<"x-opt-rabbitmq-received-time">>, {timestamp, V}, L); | ||
| [{{symbol, <<"x-opt-rabbitmq-received-time">>}, | ||
| {timestamp, V}} | L]; | ||
| % maps_upsert(<<"x-opt-rabbitmq-received-time">>, {timestamp, V}, L); | ||
| (deaths, Deaths, L) | ||
| when is_list(Deaths) -> | ||
| Maps = encode_deaths(Deaths), | ||
| maps_upsert(<<"x-opt-deaths">>, {array, map, Maps}, L); | ||
| [{{symbol, <<"x-opt-deaths">>}, | ||
| {array, map, Maps}} | L]; | ||
| % maps_upsert(<<"x-opt-deaths">>, {array, map, Maps}, L); | ||
| (_, _, Acc) -> | ||
| Acc | ||
| end, MA, Anns). | ||
|
|
||
| maps_upsert(Key, TaggedVal, KVList) -> | ||
| TaggedKey = {symbol, Key}, | ||
| Elem = {TaggedKey, TaggedVal}, | ||
| lists:keystore(TaggedKey, 1, KVList, Elem). | ||
| % maps_upsert(Key, TaggedVal, KVList) -> | ||
| % TaggedKey = {symbol, Key}, | ||
| % Elem = {TaggedKey, TaggedVal}, | ||
| % lists:keystore(TaggedKey, 1, KVList, Elem). |
kjnilsson
force-pushed
the
mc-ampq-modify-annotations
branch
from
56ea0c3 to
e550aeb
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.