remove tx-related queue info itemsbug22657

since their presence exposes an implementation detail

2 files changed, 2 insertions, 30 deletions

diff --git a/docs/rabbitmqctl.1.xml b/docs/rabbitmqctl.1.xml
index a96d1415..5e2668c1 100644
--- a/docs/rabbitmqctl.1.xml
+++ b/docs/rabbitmqctl.1.xml
@@ -715,28 +715,15 @@
                 <listitem><para>Number of messages delivered to clients but not yet acknowledged.</para></listitem>
               </varlistentry>
               <varlistentry>
-                <term>messages_uncommitted</term>
-                <listitem><para>Number of messages published in as yet uncommitted transactions</para></listitem>
-              </varlistentry>
-              <varlistentry>
                 <term>messages</term>
-                <listitem><para>Sum of ready, unacknowledged and uncommitted messages
+                <listitem><para>Sum of ready and unacknowledged messages
                   (queue depth).</para></listitem>
               </varlistentry>
               <varlistentry>
-                <term>acks_uncommitted</term>
-                <listitem><para>Number of acknowledgements received in as yet uncommitted
-                  transactions.</para></listitem>
-              </varlistentry>
-              <varlistentry>
                 <term>consumers</term>
                 <listitem><para>Number of consumers.</para></listitem>
               </varlistentry>
               <varlistentry>
-                <term>transactions</term>
-                <listitem><para>Number of transactions.</para></listitem>
-              </varlistentry>
-              <varlistentry>
                 <term>memory</term>
                 <listitem><para>Bytes of memory consumed by the Erlang process associated with the
                   queue, including stack, heap and internal structures.</para></listitem>
diff --git a/src/rabbit_amqqueue_process.erl b/src/rabbit_amqqueue_process.erl
index 5e325794..82e3e05e 100644
--- a/src/rabbit_amqqueue_process.erl
+++ b/src/rabbit_amqqueue_process.erl
@@ -80,11 +80,8 @@
          exclusive_consumer_tag,
          messages_ready,
          messages_unacknowledged,
-         messages_uncommitted,
          messages,
-         acks_uncommitted,
          consumers,
-         transactions,
          memory]).
 
 %%----------------------------------------------------------------------------
@@ -445,9 +442,6 @@ store_tx(Txn, Tx) ->
 erase_tx(Txn) ->
     erase({txn, Txn}).
 
-all_tx_record() ->
-    [T || {{txn, _}, T} <- get()].
-
 all_tx() ->
     [Txn || {{txn, Txn}, _} <- get()].
 
@@ -521,20 +515,11 @@ i(messages_ready, #q{message_buffer = MessageBuffer}) ->
 i(messages_unacknowledged, _) ->
     lists:sum([dict:size(UAM) ||
                   #cr{unacked_messages = UAM} <- all_ch_record()]);
-i(messages_uncommitted, _) ->
-    lists:sum([length(Pending) ||
-                  #tx{pending_messages = Pending} <- all_tx_record()]);
 i(messages, State) ->
     lists:sum([i(Item, State) || Item <- [messages_ready,
-                                          messages_unacknowledged,
-                                          messages_uncommitted]]);
-i(acks_uncommitted, _) ->
-    lists:sum([length(Pending) ||
-                  #tx{pending_acks = Pending} <- all_tx_record()]);
+                                          messages_unacknowledged]]);
 i(consumers, State) ->
     queue:len(State#q.active_consumers) + queue:len(State#q.blocked_consumers);
-i(transactions, _) ->
-    length(all_tx_record());
 i(memory, _) ->
     {memory, M} = process_info(self(), memory),
     M;