From f96d1480731dca4040e1fcf3e6cd7bf07f1bfb3c Mon Sep 17 00:00:00 2001 From: martinsumner Date: Sun, 11 Dec 2016 20:17:05 +0000 Subject: [PATCH] Make the merge_test a more sensible size On the verge of a timeout. Rather than keep battling with the timeout, make it do less work --- src/leveled_pclerk.erl | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/leveled_pclerk.erl b/src/leveled_pclerk.erl index 1e46d80..63884bd 100644 --- a/src/leveled_pclerk.erl +++ b/src/leveled_pclerk.erl @@ -394,22 +394,19 @@ find_randomkeys(FList, Count, Source) -> merge_file_test() -> - {timeout, 10, merge_file_test_towrap()}. - -merge_file_test_towrap() -> - KL1_L1 = lists:sort(generate_randomkeys(16000, 0, 1000)), + KL1_L1 = lists:sort(generate_randomkeys(8000, 0, 1000)), {ok, PidL1_1, _} = leveled_sft:sft_new("../test/KL1_L1.sft", KL1_L1, [], 1), - KL1_L2 = lists:sort(generate_randomkeys(16000, 0, 250)), + KL1_L2 = lists:sort(generate_randomkeys(8000, 0, 250)), {ok, PidL2_1, _} = leveled_sft:sft_new("../test/KL1_L2.sft", KL1_L2, [], 2), - KL2_L2 = lists:sort(generate_randomkeys(16000, 250, 250)), + KL2_L2 = lists:sort(generate_randomkeys(8000, 250, 250)), {ok, PidL2_2, _} = leveled_sft:sft_new("../test/KL2_L2.sft", KL2_L2, [], 2), - KL3_L2 = lists:sort(generate_randomkeys(16000, 500, 250)), + KL3_L2 = lists:sort(generate_randomkeys(8000, 500, 250)), {ok, PidL2_3, _} = leveled_sft:sft_new("../test/KL3_L2.sft", KL3_L2, [], 2), - KL4_L2 = lists:sort(generate_randomkeys(16000, 750, 250)), + KL4_L2 = lists:sort(generate_randomkeys(8000, 750, 250)), {ok, PidL2_4, _} = leveled_sft:sft_new("../test/KL4_L2.sft", KL4_L2, [], 2), Result = perform_merge({PidL1_1, "../test/KL1_L1.sft"},