summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Radestock <matthias@rabbitmq.com>2010-10-22 19:16:03 +0100
committerMatthias Radestock <matthias@rabbitmq.com>2010-10-22 19:16:03 +0100
commit0834fc3124921a76284e46b1539b8731751b86e7 (patch)
tree82b4ba5c51ca37ac29b6bd4217255b78d16853fb
parent53b30d451e35e2da3dc7ccc10f0212bafd2e730c (diff)
downloadrabbitmq-server-0834fc3124921a76284e46b1539b8731751b86e7.tar.gz
minor refactor: lists:filter -> list comprehension
-rw-r--r--src/rabbit_msg_store_gc.erl5
-rw-r--r--src/rabbit_tests.erl2
2 files changed, 3 insertions, 4 deletions
diff --git a/src/rabbit_msg_store_gc.erl b/src/rabbit_msg_store_gc.erl
index 3d0e983f..76b6422a 100644
--- a/src/rabbit_msg_store_gc.erl
+++ b/src/rabbit_msg_store_gc.erl
@@ -135,9 +135,8 @@ attempt_action(Action, Files,
State = #state { parent = Parent,
pending_no_readers = Pending,
msg_store_state = MsgStoreState }) ->
- case lists:filter(fun (File) ->
- rabbit_msg_store:has_readers(File, MsgStoreState)
- end, Files) of
+ case [File || File <- Files,
+ rabbit_msg_store:has_readers(File, MsgStoreState)] of
[] -> do_action(Action, Files, Parent, MsgStoreState),
State;
[File | _] -> Pending1 = dict:store(File, {Action, Files}, Pending),
diff --git a/src/rabbit_tests.erl b/src/rabbit_tests.erl
index 1b47cdb7..2c13c736 100644
--- a/src/rabbit_tests.erl
+++ b/src/rabbit_tests.erl
@@ -1564,7 +1564,7 @@ test_msg_store() ->
%% push a lot of msgs in... at least 100 files worth
{ok, FileSize} = application:get_env(rabbit, msg_store_file_size_limit),
PayloadSizeBits = 65536,
- BigCount = trunc(100 * FileSize / (PayloadSizeBits div 8)),
+ BigCount = trunc(10 * FileSize / (PayloadSizeBits div 8)),
GuidsBig = [guid_bin(X) || X <- lists:seq(1, BigCount)],
Payload = << 0:PayloadSizeBits >>,
ok = foreach_with_msg_store_client(