diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-04-22 14:57:56 +0100 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-04-22 14:57:56 +0100 |
| commit | 044eff474a1f3f85da2add310d99d02ab82eb3a8 (patch) | |
| tree | dcbed983b63fc5be09627bfed6821a0bac6f50cd | |
| parent | 95b7edb13d820bf4550fd1c6db22d25e0595a64b (diff) | |
| download | rabbitmq-server-git-044eff474a1f3f85da2add310d99d02ab82eb3a8.tar.gz | |
rename clean_stop
remove extra mnesia index - this has significantly improved performance!
| -rw-r--r-- | src/rabbit_disk_queue.erl | 4 | ||||
| -rw-r--r-- | src/rabbit_mnesia.erl | 1 | ||||
| -rw-r--r-- | src/rabbit_tests.erl | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit_disk_queue.erl b/src/rabbit_disk_queue.erl index f586713d62..ba24dd9319 100644 --- a/src/rabbit_disk_queue.erl +++ b/src/rabbit_disk_queue.erl @@ -40,7 +40,7 @@ -export([publish/3, deliver/1, ack/2, tx_publish/2, tx_commit/2, tx_cancel/1]). --export([stop/0, clean_stop/0]). +-export([stop/0, stop_and_obliterate/0]). -include_lib("stdlib/include/qlc.hrl"). -include("rabbit.hrl"). @@ -233,7 +233,7 @@ tx_cancel(MsgIds) when is_list(MsgIds) -> stop() -> gen_server:call(?SERVER, stop, infinity). -clean_stop() -> +stop_and_obliterate() -> gen_server:call(?SERVER, clean_stop, infinity). %% ---- GEN-SERVER INTERNAL API ---- diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index 3995166938..b3c4a9267e 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -147,7 +147,6 @@ table_definitions() -> {rabbit_disk_queue, [{record_name, dq_msg_loc}, {type, set}, - {index, [msg_id]}, {attributes, record_info(fields, dq_msg_loc)}, {disc_only_copies, [node()]}]} ]. diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl index 08b05da282..1e765d290c 100644 --- a/src/rabbit_tests.erl +++ b/src/rabbit_tests.erl @@ -772,7 +772,7 @@ rdq_time_commands(Funcs) -> rdq_virgin() -> {Micros, {ok, _}} = timer:tc(rabbit_disk_queue, start_link, [1024*1024, 5]), - ok = rabbit_disk_queue:clean_stop(), + ok = rabbit_disk_queue:stop_and_obliterate(), Micros. rdq_start() -> |