#basic_message.guid -> id

5 files changed, 14 insertions, 14 deletions

diff --git a/include/rabbit.hrl b/include/rabbit.hrl
index 4d75b546..9f483c30 100644
--- a/include/rabbit.hrl
+++ b/include/rabbit.hrl
@@ -62,7 +62,7 @@
 
 -record(listener, {node, protocol, host, ip_address, port}).
 
--record(basic_message, {exchange_name, routing_keys = [], content, guid,
+-record(basic_message, {exchange_name, routing_keys = [], content, id,
                         is_persistent}).
 
 -record(ssl_socket, {tcp, ssl}).
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 44053593..57426e13 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -433,7 +433,7 @@ record_confirm_message(#delivery{sender     = ChPid,
                                  msg_seq_no = MsgSeqNo,
                                  message    = #basic_message {
                                    is_persistent = true,
-                                   guid          = Guid}},
+                                   id            = Guid}},
                        State =
                            #q{guid_to_channel = GTC,
                               q               = #amqqueue{durable = true}}) ->
diff --git a/src/rabbit_basic.erl b/src/rabbit_basic.erl
index 57aad808..43230f30 100644
--- a/src/rabbit_basic.erl
+++ b/src/rabbit_basic.erl
@@ -116,12 +116,12 @@ message(ExchangeName, RoutingKey,
         #content{properties = Props} = DecodedContent) ->
     try
         {ok, #basic_message{
-            exchange_name = ExchangeName,
-            content       = strip_header(DecodedContent, ?DELETED_HEADER),
-            guid          = rabbit_guid:guid(),
-            is_persistent = is_message_persistent(DecodedContent),
-            routing_keys  = [RoutingKey |
-                             header_routes(Props#'P_basic'.headers)]}}
+           exchange_name = ExchangeName,
+           content       = strip_header(DecodedContent, ?DELETED_HEADER),
+           id            = rabbit_guid:guid(),
+           is_persistent = is_message_persistent(DecodedContent),
+           routing_keys  = [RoutingKey |
+                            header_routes(Props#'P_basic'.headers)]}}
     catch
         {error, _Reason} = Error -> Error
     end.
diff --git a/src/rabbit_types.erl b/src/rabbit_types.erl
index 899291f2..90dfd38d 100644
--- a/src/rabbit_types.erl
+++ b/src/rabbit_types.erl
@@ -67,7 +67,7 @@
       #basic_message{exchange_name  :: rabbit_exchange:name(),
                      routing_keys   :: [rabbit_router:routing_key()],
                      content        :: content(),
-                     guid           :: msg_id(),
+                     id             :: msg_id(),
                      is_persistent  :: boolean()}).
 -type(message() :: basic_message()).
 -type(delivery() ::
diff --git a/src/rabbit_variable_queue.erl b/src/rabbit_variable_queue.erl
index 1d32cec6..0c4c06e8 100644
--- a/src/rabbit_variable_queue.erl
+++ b/src/rabbit_variable_queue.erl
@@ -509,7 +509,7 @@ publish(Msg, MsgProps, State) ->
     {_SeqId, State1} = publish(Msg, MsgProps, false, false, State),
     a(reduce_memory_use(State1)).
 
-publish_delivered(false, #basic_message { guid = MsgId },
+publish_delivered(false, #basic_message { id = MsgId },
                   #message_properties {
                     needs_confirming = NeedsConfirming },
                   State = #vqstate { len = 0 }) ->
@@ -519,7 +519,7 @@ publish_delivered(false, #basic_message { guid = MsgId },
     end,
     {undefined, a(State)};
 publish_delivered(true, Msg = #basic_message { is_persistent = IsPersistent,
-                                               guid = MsgId },
+                                               id = MsgId },
                   MsgProps = #message_properties {
                     needs_confirming = NeedsConfirming },
                   State = #vqstate { len              = 0,
@@ -909,7 +909,7 @@ gb_sets_maybe_insert(false, _Val, Set) -> Set;
 %% when requeueing, we re-add a msg_id to the unconfirmed set
 gb_sets_maybe_insert(true,  Val,  Set) -> gb_sets:add(Val, Set).
 
-msg_status(IsPersistent, SeqId, Msg = #basic_message { guid = MsgId },
+msg_status(IsPersistent, SeqId, Msg = #basic_message { id = MsgId },
            MsgProps) ->
     #msg_status { seq_id = SeqId, msg_id = MsgId, msg = Msg,
                   is_persistent = IsPersistent, is_delivered = false,
@@ -996,7 +996,7 @@ store_tx(Txn, Tx) -> put({txn, Txn}, Tx).
 erase_tx(Txn) -> erase({txn, Txn}).
 
 persistent_msg_ids(Pubs) ->
-    [MsgId || {#basic_message { guid          = MsgId,
+    [MsgId || {#basic_message { id            = MsgId,
                                 is_persistent = true }, _MsgProps} <- Pubs].
 
 betas_from_index_entries(List, TransientThreshold, IndexState) ->
@@ -1247,7 +1247,7 @@ sum_msg_ids_by_store_to_len(LensByStore, MsgIdsByStore) ->
 %% Internal gubbins for publishing
 %%----------------------------------------------------------------------------
 
-publish(Msg = #basic_message { is_persistent = IsPersistent, guid = MsgId },
+publish(Msg = #basic_message { is_persistent = IsPersistent, id = MsgId },
         MsgProps = #message_properties { needs_confirming = NeedsConfirming },
         IsDelivered, MsgOnDisk,
         State = #vqstate { q1 = Q1, q3 = Q3, q4 = Q4,