summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Watson <watson.timothy@gmail.com>2014-01-14 17:32:18 +0000
committerTim Watson <watson.timothy@gmail.com>2014-01-14 17:32:18 +0000
commit01859e16637e82aacaad7d397d55b284c2543f83 (patch)
tree17714a89de21dedf843785bad6d83e1b436e3b2d
parente4075435bb1f26e98697e0e20791525c95e04da9 (diff)
downloadrabbitmq-server-01859e16637e82aacaad7d397d55b284c2543f83.tar.gz
Cosmetic (ish)
Strip extraneous comment lines and remove an unused function.
-rw-r--r--src/rabbit_backing_queue.erl1
-rw-r--r--src/rabbit_queue_index.erl10
2 files changed, 1 insertions, 10 deletions
diff --git a/src/rabbit_backing_queue.erl b/src/rabbit_backing_queue.erl
index 07dc272f..3361a02e 100644
--- a/src/rabbit_backing_queue.erl
+++ b/src/rabbit_backing_queue.erl
@@ -44,7 +44,6 @@
%%
%% The list of queue recovery terms returned as {ok, Terms} must be given
%% in the same order as the list of queue names supplied.
-%%
-callback start([rabbit_amqqueue:name()]) -> rabbit_types:ok(recovery_terms()).
%% Called to tear down any state/resources. NB: Implementations should
diff --git a/src/rabbit_queue_index.erl b/src/rabbit_queue_index.erl
index e2ae4e00..e05b2174 100644
--- a/src/rabbit_queue_index.erl
+++ b/src/rabbit_queue_index.erl
@@ -16,7 +16,7 @@
-module(rabbit_queue_index).
--export([init/2, shutdown_terms/1, recover/5,
+-export([init/2, recover/5,
terminate/2, delete_and_terminate/1,
publish/5, deliver/2, ack/2, sync/1, needs_sync/1, flush/1,
read/3, next_segment_boundary/1, bounds/1, recover/1]).
@@ -198,7 +198,6 @@
-type(shutdown_terms() :: {recovery_type(), [any()]}).
-spec(init/2 :: (rabbit_amqqueue:name(), on_sync_fun()) -> qistate()).
--spec(shutdown_terms/1 :: (rabbit_amqqueue:name()) -> shutdown_terms()).
-spec(recover/5 :: (rabbit_amqqueue:name(), shutdown_terms(), boolean(),
contains_predicate(), on_sync_fun()) ->
{'undefined' | non_neg_integer(), qistate()}).
@@ -235,13 +234,6 @@ init(Name, OnSyncFun) ->
false = rabbit_file:is_file(Dir), %% is_file == is file or dir
State #qistate { on_sync = OnSyncFun }.
-shutdown_terms(Name) ->
- #qistate { dir = Dir } = blank_state(Name),
- case rabbit_recovery_terms:read(Dir) of
- {error, _} -> [];
- {ok, Terms1} -> Terms1
- end.
-
recover(Name, {Recovery, Terms}, MsgStoreRecovered,
ContainsCheckFun, OnSyncFun) ->
State = blank_state(Name),