resolve msg_id type confusion

rabbit_mixed_queue and rabbit_disk_queue see guids, not non_neg_integers.

5 files changed, 14 insertions, 9 deletions

diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 25a3673263..c17ac7eb5a 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -157,9 +157,6 @@
                 txn       :: maybe(txn()),
                 sender    :: pid(),
                 message   :: message()}).
-%% this really should be an abstract type
--type(msg_id() :: non_neg_integer()).
--type(msg() :: {queue_name(), pid(), msg_id(), bool(), message()}).
 -type(listener() ::
       #listener{node     :: erlang_node(),
                 protocol :: atom(),
diff --git a/src/rabbit_amqqueue.erl b/src/rabbit_amqqueue.erl
index ad0a0f0c68..41286cf7fe 100644
--- a/src/rabbit_amqqueue.erl
+++ b/src/rabbit_amqqueue.erl
@@ -56,6 +56,8 @@
 
 -ifdef(use_specs).
 
+-type(msg_id() :: non_neg_integer()).
+-type(msg() :: {queue_name(), pid(), msg_id(), bool(), message()}).
 -type(qstats() :: {'ok', queue_name(), non_neg_integer(), non_neg_integer()}).
 -type(qlen() :: {'ok', non_neg_integer()}).
 -type(qfun(A) :: fun ((amqqueue()) -> A)).
diff --git a/src/rabbit_channel.erl b/src/rabbit_channel.erl
index 397659c1fa..c178826ba5 100644
--- a/src/rabbit_channel.erl
+++ b/src/rabbit_channel.erl
@@ -54,6 +54,9 @@
 
 -ifdef(use_specs).
 
+-type(msg_id() :: non_neg_integer()).
+-type(msg() :: {queue_name(), pid(), msg_id(), bool(), message()}).
+
 -spec(start_link/5 ::
       (channel_number(), pid(), pid(), username(), vhost()) -> pid()).
 -spec(do/2 :: (pid(), amqp_method()) -> 'ok').
diff --git a/src/rabbit_disk_queue.erl b/src/rabbit_disk_queue.erl
index ad5d8fb140..6beccf3a87 100644
--- a/src/rabbit_disk_queue.erl
+++ b/src/rabbit_disk_queue.erl
@@ -89,6 +89,7 @@
 
 -ifdef(use_specs).
 
+-type(msg_id() :: guid()).
 -type(seq_id() :: non_neg_integer()).
 -type(ack_tag() :: {msg_id(), seq_id()}).
 
diff --git a/src/rabbit_mixed_queue.erl b/src/rabbit_mixed_queue.erl
index 2bb9c09a0e..da94d893ec 100644
--- a/src/rabbit_mixed_queue.erl
+++ b/src/rabbit_mixed_queue.erl
@@ -67,21 +67,23 @@
                               memory_size :: (non_neg_integer() | 'undefined'),
                               prefetcher :: (pid() | 'undefined')
                             }).
--type(acktag() :: ( 'no_on_disk' | { non_neg_integer(), non_neg_integer() })).
+-type(msg_id() :: guid()).
+-type(seq_id() :: non_neg_integer()).
+-type(ack_tag() :: ( 'no_on_disk' | {msg_id(), seq_id()} )).
 -type(okmqs() :: {'ok', mqstate()}).
 
 -spec(init/2 :: (queue_name(), boolean()) -> okmqs()).
 -spec(publish/2 :: (message(), mqstate()) -> okmqs()).
 -spec(publish_delivered/2 :: (message(), mqstate()) ->
-             {'ok', acktag(), mqstate()}).
+             {'ok', ack_tag(), mqstate()}).
 -spec(fetch/1 :: (mqstate()) ->
-             {('empty' | {message(), boolean(), acktag(), non_neg_integer()}),
+             {('empty' | {message(), boolean(), ack_tag(), non_neg_integer()}),
               mqstate()}).
--spec(ack/2 :: ([{message(), acktag()}], mqstate()) -> okmqs()).
+-spec(ack/2 :: ([{message(), ack_tag()}], mqstate()) -> okmqs()).
 -spec(tx_publish/2 :: (message(), mqstate()) -> okmqs()).
--spec(tx_commit/3 :: ([message()], [acktag()], mqstate()) -> okmqs()).
+-spec(tx_commit/3 :: ([message()], [ack_tag()], mqstate()) -> okmqs()).
 -spec(tx_rollback/2 :: ([message()], mqstate()) -> okmqs()).
--spec(requeue/2 :: ([{message(), acktag()}], mqstate()) -> okmqs()).
+-spec(requeue/2 :: ([{message(), ack_tag()}], mqstate()) -> okmqs()).
 -spec(purge/1 :: (mqstate()) -> okmqs()).
 -spec(delete_queue/1 :: (mqstate()) -> {'ok', mqstate()}).
 -spec(len/1 :: (mqstate()) -> non_neg_integer()).