diff options
| author | Simon MacMullen <simon@rabbitmq.com> | 2011-03-30 14:12:05 +0100 |
|---|---|---|
| committer | Simon MacMullen <simon@rabbitmq.com> | 2011-03-30 14:12:05 +0100 |
| commit | d7938cad8df1662013c9535018796b3b2ebe024f (patch) | |
| tree | 8a7813e6c9f7a8dc3d43eb26906abeb5d4b43931 /src | |
| parent | 056f5467c9778017c97939ee7a911cffaa99cce9 (diff) | |
| download | rabbitmq-server-git-d7938cad8df1662013c9535018796b3b2ebe024f.tar.gz | |
Call the field next, not serial.
Diffstat (limited to 'src')
| -rw-r--r-- | src/rabbit_exchange.erl | 7 | ||||
| -rw-r--r-- | src/rabbit_upgrade_functions.erl | 2 |
2 files changed, 4 insertions, 5 deletions
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]}]). %%-------------------------------------------------------------------- |