diff options
| -rw-r--r-- | include/rabbit.hrl | 2 | ||||
| -rw-r--r-- | src/rabbit_exchange.erl | 7 | ||||
| -rw-r--r-- | src/rabbit_upgrade_functions.erl | 2 |
3 files changed, 5 insertions, 6 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 99608be426..db4773b8ec 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -43,7 +43,7 @@ -record(resource, {virtual_host, kind, name}). -record(exchange, {name, type, durable, auto_delete, internal, arguments}). --record(exchange_serial, {name, serial}). +-record(exchange_serial, {name, next}). -record(amqqueue, {name, durable, auto_delete, exclusive_owner = none, arguments, pid}). diff --git a/src/rabbit_exchange.erl b/src/rabbit_exchange.erl index dfcb05d6a7..a9b1b2e50e 100644 --- a/src/rabbit_exchange.erl +++ b/src/rabbit_exchange.erl @@ -145,7 +145,7 @@ declare(XName, Type, Durable, AutoDelete, Internal, Args) -> store(X = #exchange{name = Name, type = Type}) -> ok = mnesia:write(rabbit_exchange, X, write), case (type_to_module(Type)):serialise_events() of - true -> S = #exchange_serial{name = Name, serial = 0}, + true -> S = #exchange_serial{name = Name, next = 1}, ok = mnesia:write(rabbit_exchange_serial, S, write); false -> ok end. @@ -327,11 +327,10 @@ serial(#exchange{name = XName, type = Type}) -> end. next_serial(XName) -> - [#exchange_serial{serial = S}] = + [#exchange_serial{next = Serial}] = mnesia:read(rabbit_exchange_serial, XName, write), - Serial = S + 1, ok = mnesia:write(rabbit_exchange_serial, - #exchange_serial{name = XName, serial = Serial}, write), + #exchange_serial{name = XName, next = Serial + 1}, write), Serial. %% Used with atoms from records; e.g., the type is expected to exist. diff --git a/src/rabbit_upgrade_functions.erl b/src/rabbit_upgrade_functions.erl index 7c53e99694..b21dd76455 100644 --- a/src/rabbit_upgrade_functions.erl +++ b/src/rabbit_upgrade_functions.erl @@ -105,7 +105,7 @@ topic_trie() -> exchange_event_serial() -> create(rabbit_exchange_serial, [{record_name, exchange_serial}, - {attributes, [name, serial]}]). + {attributes, [name, next]}]). %%-------------------------------------------------------------------- |