diff options
| author | Matthew Sackman <matthew@rabbitmq.com> | 2010-10-06 15:04:00 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@rabbitmq.com> | 2010-10-06 15:04:00 +0100 |
| commit | c6f48bac39166c3a35f53a6c89e6717b129abe59 (patch) | |
| tree | 217d58c57b15548641ea44d1604380c1ce28eeeb /include | |
| parent | ab6519c9fe81d873dc5aee437628a582b9500943 (diff) | |
| parent | 95bc0296885572f0c0064d7b9995ce80cb4146af (diff) | |
| download | rabbitmq-server-git-c6f48bac39166c3a35f53a6c89e6717b129abe59.tar.gz | |
Merging default into bug23111
Diffstat (limited to 'include')
| -rw-r--r-- | include/rabbit.hrl | 2 | ||||
| -rw-r--r-- | include/rabbit_backing_queue_spec.hrl | 31 |
2 files changed, 23 insertions, 10 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 24aa8d987c..0f0a0e87fd 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -74,6 +74,8 @@ -record(event, {type, props, timestamp}). +-record(msg_properties, {expiry}). + %%---------------------------------------------------------------------------- -define(COPYRIGHT_MESSAGE, "Copyright (C) 2007-2010 LShift Ltd., Cohesive Financial Technologies LLC., and Rabbit Technologies Ltd."). diff --git a/include/rabbit_backing_queue_spec.hrl b/include/rabbit_backing_queue_spec.hrl index 38c6f9398f..12d3236348 100644 --- a/include/rabbit_backing_queue_spec.hrl +++ b/include/rabbit_backing_queue_spec.hrl @@ -31,12 +31,16 @@ -type(fetch_result() :: ('empty' | - %% Message, IsDelivered, AckTag, RemainingLen + %% Message, IsDelivered, AckTag, Remaining_Len {rabbit_types:basic_message(), boolean(), ack(), non_neg_integer()})). +-type(peek_result() :: ('empty'|{rabbit_types:basic_message(), + rabbit_types:msg_properties()})). -type(is_durable() :: boolean()). -type(attempt_recovery() :: boolean()). -type(purged_msg_count() :: non_neg_integer()). -type(ack_required() :: boolean()). +-type(msg_properties_transformer() :: + fun ((rabbit_types:msg_properties()) -> rabbit_types:msg_properties())). -spec(start/1 :: ([rabbit_amqqueue:name()]) -> 'ok'). -spec(stop/0 :: () -> 'ok'). @@ -45,19 +49,26 @@ -spec(terminate/1 :: (state()) -> state()). -spec(delete_and_terminate/1 :: (state()) -> state()). -spec(purge/1 :: (state()) -> {purged_msg_count(), state()}). --spec(publish/2 :: (rabbit_types:basic_message(), state()) -> state()). --spec(publish_delivered/3 :: - (ack_required(), rabbit_types:basic_message(), state()) -> - {ack(), state()}). +-spec(publish/3 :: + (rabbit_types:basic_message(), rabbit_types:msg_properties(), state()) + -> state()). +-spec(publish_delivered/4 :: (ack_required(), rabbit_types:basic_message(), + rabbit_types:msg_properties(), state()) + -> {ack(), state()}). +-spec(dropwhile/2 :: + (fun ((rabbit_types:msg_properties()) -> boolean()), state()) + -> state()). -spec(fetch/2 :: (ack_required(), state()) -> {fetch_result(), state()}). -spec(ack/2 :: ([ack()], state()) -> state()). --spec(tx_publish/3 :: (rabbit_types:txn(), rabbit_types:basic_message(), - state()) -> state()). +-spec(tx_publish/4 :: + (rabbit_types:txn(), rabbit_types:basic_message(), + rabbit_types:msg_properties(), state()) -> state()). -spec(tx_ack/3 :: (rabbit_types:txn(), [ack()], state()) -> state()). -spec(tx_rollback/2 :: (rabbit_types:txn(), state()) -> {[ack()], state()}). --spec(tx_commit/3 :: (rabbit_types:txn(), fun (() -> any()), state()) -> - {[ack()], state()}). --spec(requeue/2 :: ([ack()], state()) -> state()). +-spec(tx_commit/4 :: + (rabbit_types:txn(), fun (() -> any()), + msg_properties_transformer(), state()) -> {[ack()], state()}). +-spec(requeue/3 :: ([ack()], msg_properties_transformer(), state()) -> state()). -spec(len/1 :: (state()) -> non_neg_integer()). -spec(is_empty/1 :: (state()) -> boolean()). -spec(set_ram_duration_target/2 :: |