diff options
| author | Matthew Sackman <matthew@lshift.net> | 2009-11-27 14:45:30 +0000 |
|---|---|---|
| committer | Matthew Sackman <matthew@lshift.net> | 2009-11-27 14:45:30 +0000 |
| commit | 4e03a59592424036d3880bf80c5eeaf54c8162f3 (patch) | |
| tree | e122c3ba3bd4f3e45ec1413a2fee9743408a9122 | |
| parent | 86f859cb22f7181826779903120178883bbdf85e (diff) | |
| download | rabbitmq-server-git-4e03a59592424036d3880bf80c5eeaf54c8162f3.tar.gz | |
Removed mnesia table and dq_msg_loc record that's no longer needed
| -rw-r--r-- | include/rabbit.hrl | 2 | ||||
| -rw-r--r-- | src/rabbit_mnesia.erl | 15 |
2 files changed, 5 insertions, 12 deletions
diff --git a/include/rabbit.hrl b/include/rabbit.hrl index 330eef80d7..28cfb2d91b 100644 --- a/include/rabbit.hrl +++ b/include/rabbit.hrl @@ -65,8 +65,6 @@ -record(basic_message, {exchange_name, routing_key, content, guid, is_persistent}). --record(dq_msg_loc, {queue_and_seq_id, is_delivered, is_persistent, msg_id}). - -record(ssl_socket, {tcp, ssl}). -record(delivery, {mandatory, immediate, txn, sender, message}). diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index a1d886bb57..1443d769b6 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -55,8 +55,8 @@ -spec(cluster/1 :: ([erlang_node()]) -> 'ok'). -spec(reset/0 :: () -> 'ok'). -spec(force_reset/0 :: () -> 'ok'). --spec(is_clustered/0 :: () -> boolean()). --spec(empty_ram_only_tables/0 :: () -> 'ok'). +-spec(is_clustered/0 :: () -> boolean()). +-spec(empty_ram_only_tables/0 :: () -> 'ok'). -spec(create_tables/0 :: () -> 'ok'). -endif. @@ -162,12 +162,7 @@ table_definitions() -> {disc_copies, [node()]}]}, {rabbit_queue, [{record_name, amqqueue}, - {attributes, record_info(fields, amqqueue)}]}, - {rabbit_disk_queue, - [{record_name, dq_msg_loc}, - {attributes, record_info(fields, dq_msg_loc)}, - {disc_copies, [node()]}, - {local_content, true}]} + {attributes, record_info(fields, amqqueue)}]} ]. table_names() -> @@ -179,7 +174,7 @@ replicated_table_names() -> ]. dir() -> mnesia:system_info(directory). - + ensure_mnesia_dir() -> MnesiaDir = dir() ++ "/", case filelib:ensure_dir(MnesiaDir) of @@ -396,7 +391,7 @@ wait_for_replicated_tables() -> wait_for_tables(replicated_table_names()). wait_for_tables() -> wait_for_tables(table_names()). -wait_for_tables(TableNames) -> +wait_for_tables(TableNames) -> case check_schema_integrity() of ok -> case mnesia:wait_for_tables(TableNames, 30000) of |