summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorSimon MacMullen <simon@rabbitmq.com>2011-04-01 11:55:08 +0100
committerSimon MacMullen <simon@rabbitmq.com>2011-04-01 11:55:08 +0100
commitea8cefe18293f93f0d07354f87ee64be81b7f9cf (patch)
tree6495c5113e3bc3feee60160e5f76a998a9c473c1 /include
parent8118ea9c727e9c46bfc9deb5ef651ed5a42cc557 (diff)
parentbae88c4882efc2790d46baf8743fb6d358a1a98c (diff)
downloadrabbitmq-server-git-ea8cefe18293f93f0d07354f87ee64be81b7f9cf.tar.gz
Merge bug 24009 into bug 23939.
Diffstat (limited to 'include')
-rw-r--r--include/rabbit.hrl1
-rw-r--r--include/rabbit_exchange_type_spec.hrl12
2 files changed, 9 insertions, 4 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 9f483c307d..db4773b8ec 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -43,6 +43,7 @@
-record(resource, {virtual_host, kind, name}).
-record(exchange, {name, type, durable, auto_delete, internal, arguments}).
+-record(exchange_serial, {name, next}).
-record(amqqueue, {name, durable, auto_delete, exclusive_owner = none,
arguments, pid}).
diff --git a/include/rabbit_exchange_type_spec.hrl b/include/rabbit_exchange_type_spec.hrl
index 8163b6f2c8..b3be7e5dff 100644
--- a/include/rabbit_exchange_type_spec.hrl
+++ b/include/rabbit_exchange_type_spec.hrl
@@ -16,17 +16,21 @@
-ifdef(use_specs).
+-type(tx() :: 'transaction' | 'none').
+-type(serial() :: pos_integer() | tx()).
+
-spec(description/0 :: () -> [{atom(), any()}]).
+-spec(serialise_events/0 :: () -> boolean()).
-spec(route/2 :: (rabbit_types:exchange(), rabbit_types:delivery())
-> rabbit_router:match_result()).
-spec(validate/1 :: (rabbit_types:exchange()) -> 'ok').
--spec(start/3 :: (boolean(), rabbit_types:exchange(),
+-spec(start/3 :: (tx(), rabbit_types:exchange(),
[rabbit_types:binding()]) -> 'ok').
--spec(delete/3 :: (boolean(), rabbit_types:exchange(),
+-spec(delete/3 :: (tx(), rabbit_types:exchange(),
[rabbit_types:binding()]) -> 'ok').
--spec(add_bindings/3 :: (boolean(), rabbit_types:exchange(),
+-spec(add_bindings/3 :: (serial(), rabbit_types:exchange(),
[rabbit_types:binding()]) -> 'ok').
--spec(remove_bindings/3 :: (boolean(), rabbit_types:exchange(),
+-spec(remove_bindings/3 :: (serial(), rabbit_types:exchange(),
[rabbit_types:binding()]) -> 'ok').
-spec(assert_args_equivalence/2 ::
(rabbit_types:exchange(), rabbit_framing:amqp_table())