diff options
author | Vlad Alexandru Ionescu <vlad@rabbitmq.com> | 2011-02-14 13:19:56 -0600 |
---|---|---|
committer | Vlad Alexandru Ionescu <vlad@rabbitmq.com> | 2011-02-14 13:19:56 -0600 |
commit | 3263bbd984306d328d7d1c1f0314bce56cc6c0da (patch) | |
tree | b79aa2c095977a7d36ae847a2b1f87d30ac2834e | |
parent | 3f86e7afaf4bfe8f66e81ad96f491de48f159d84 (diff) | |
download | rabbitmq-server-3263bbd984306d328d7d1c1f0314bce56cc6c0da.tar.gz |
removing duplication and use of sets in rabbit_mnesia
-rw-r--r-- | src/rabbit_mnesia.erl | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/src/rabbit_mnesia.erl b/src/rabbit_mnesia.erl index c6441b68..51b6c6a9 100644 --- a/src/rabbit_mnesia.erl +++ b/src/rabbit_mnesia.erl @@ -553,19 +553,14 @@ create_local_table_copy(Tab, Type) -> ok. wait_for_replicated_tables() -> - AllTablesSet = ordsets:from_list(mnesia:system_info(tables)), - ReplicatedTablesSet = ordsets:from_list(replicated_table_names()), - wait_for_tables(ordsets:to_list(ordsets:intersection(AllTablesSet, - ReplicatedTablesSet))). + wait_for_tables(replicated_table_names()). wait_for_tables() -> - AllTablesSet = ordsets:from_list(mnesia:system_info(tables)), - RabbitTablesSet = ordsets:from_list(table_names()), - wait_for_tables(ordsets:to_list(ordsets:intersection(AllTablesSet, - RabbitTablesSet))). + wait_for_tables(table_names()). wait_for_tables(TableNames) -> - case mnesia:wait_for_tables(TableNames, 30000) of + Inexistent = TableNames -- mnesia:system_info(tables), + case mnesia:wait_for_tables(TableNames -- Inexistent, 30000) of ok -> ok; {timeout, BadTabs} -> throw({error, {timeout_waiting_for_tables, BadTabs}}); |