diff options
| author | Tony Garnock-Jones <tonyg@lshift.net> | 2009-11-23 14:59:43 +0000 |
|---|---|---|
| committer | Tony Garnock-Jones <tonyg@lshift.net> | 2009-11-23 14:59:43 +0000 |
| commit | 29cb6dd31fa90ace0992ef9c8a03bd3d935662ff (patch) | |
| tree | 8da370285bb8c7654f64e956b30934f40382b2da | |
| parent | 9e4a1b80e24b90d5c84218a070c3ce61ce3fa99f (diff) | |
| download | rabbitmq-server-29cb6dd31fa90ace0992ef9c8a03bd3d935662ff.tar.gz | |
Rename sort_arguments to sort_field_table
| -rw-r--r-- | src/rabbit_exchange.erl | 2 | ||||
| -rw-r--r-- | src/rabbit_exchange_type_headers.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_misc.erl | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index 621162f6..09ea1e96 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -376,7 +376,7 @@ binding_action(ExchangeName, QueueName, RoutingKey, Arguments, Fun) -> Fun(X, Q, #binding{exchange_name = ExchangeName, queue_name = QueueName, key = RoutingKey, - args = rabbit_misc:sort_arguments(Arguments)}) + args = rabbit_misc:sort_field_table(Arguments)}) end). sync_binding(Binding, Durable, Fun) -> diff --git a/src/rabbit_exchange_type_headers.erl b/src/rabbit_exchange_type_headers.erl index 775d7ef1..5efcc30c 100644 --- a/src/rabbit_exchange_type_headers.erl +++ b/src/rabbit_exchange_type_headers.erl @@ -50,7 +50,7 @@ publish(#exchange{name = Name}, Delivery = #delivery{message = #basic_message{content = Content}}) -> Headers = case (Content#content.properties)#'P_basic'.headers of undefined -> []; - H -> rabbit_misc:sort_arguments(H) + H -> rabbit_misc:sort_field_table(H) end, rabbit_router:deliver(rabbit_router:match_bindings(Name, fun (#binding{args = Spec}) -> headers_match(Spec, Headers) @@ -68,7 +68,7 @@ parse_x_match(Other) -> %% Horrendous matching algorithm. Depends for its merge-like %% (linear-time) behaviour on the lists:keysort -%% (rabbit_misc:sort_arguments) that route/3 and +%% (rabbit_misc:sort_field_table) that route/3 and %% rabbit_exchange:{add,delete}_binding/4 do. %% %% !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! diff --git a/src/rabbit_misc.erl b/src/rabbit_misc.erl index ef3e0309..2a0015bf 100644 --- a/src/rabbit_misc.erl +++ b/src/rabbit_misc.erl @@ -56,7 +56,7 @@ -export([format_stderr/2]). -export([start_applications/1, stop_applications/1]). -export([unfold/2, ceil/1]). --export([sort_arguments/1]). +-export([sort_field_table/1]). -import(mnesia). -import(lists). @@ -492,5 +492,5 @@ ceil(N) -> end. %% Sorts a list of AMQP table fields as per the AMQP spec -sort_arguments(Arguments) -> +sort_field_table(Arguments) -> lists:keysort(1, Arguments). |