From 8e92a2c5638f010b0bcd075974d0ca8835170c66 Mon Sep 17 00:00:00 2001 From: martinsumner Date: Sun, 15 Jan 2017 01:47:23 +0000 Subject: [PATCH] Fix pclerk unit test --- src/leveled_pclerk.erl | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/src/leveled_pclerk.erl b/src/leveled_pclerk.erl index c255943..ad9afbf 100644 --- a/src/leveled_pclerk.erl +++ b/src/leveled_pclerk.erl @@ -261,18 +261,34 @@ merge_file_test() -> 2, KL4_L2, undefined), - E1 = #manifest_entry{owner = PidL1_1, filename = "../test/KL1_L1.sst"}, - E2 = #manifest_entry{owner = PidL2_1, filename = "../test/KL1_L2.sst"}, - E3 = #manifest_entry{owner = PidL2_2, filename = "../test/KL2_L2.sst"}, - E4 = #manifest_entry{owner = PidL2_3, filename = "../test/KL3_L2.sst"}, - E5 = #manifest_entry{owner = PidL2_4, filename = "../test/KL4_L2.sst"}, + + E1 = #manifest_entry{owner = PidL1_1, + filename = "../test/KL1_L1.sst", + end_key = lists:last(KL1_L1), + start_key = lists:nth(1, KL1_L1)}, + E2 = #manifest_entry{owner = PidL2_1, + filename = "../test/KL1_L2.sst", + end_key = lists:last(KL1_L2), + start_key = lists:nth(1, KL1_L2)}, + E3 = #manifest_entry{owner = PidL2_2, + filename = "../test/KL2_L2.sst", + end_key = lists:last(KL2_L2), + start_key = lists:nth(1, KL2_L2)}, + E4 = #manifest_entry{owner = PidL2_3, + filename = "../test/KL3_L2.sst", + end_key = lists:last(KL3_L2), + start_key = lists:nth(1, KL3_L2)}, + E5 = #manifest_entry{owner = PidL2_4, + filename = "../test/KL4_L2.sst", + end_key = lists:last(KL4_L2), + start_key = lists:nth(1, KL4_L2)}, Man0 = leveled_manifest:new_manifest(), - Man1 = leveled_manifest:insert_manifest_entry(Man0, 1, 2, E1), - Man2 = leveled_manifest:insert_manifest_entry(Man1, 1, 2, E2), - Man3 = leveled_manifest:insert_manifest_entry(Man2, 1, 2, E3), - Man4 = leveled_manifest:insert_manifest_entry(Man3, 1, 2, E4), - Man5 = leveled_manifest:insert_manifest_entry(Man4, 2, 1, E5), + Man1 = leveled_manifest:insert_manifest_entry(Man0, 1, 2, E2), + Man2 = leveled_manifest:insert_manifest_entry(Man1, 1, 2, E3), + Man3 = leveled_manifest:insert_manifest_entry(Man2, 1, 2, E4), + Man4 = leveled_manifest:insert_manifest_entry(Man3, 1, 2, E5), + Man5 = leveled_manifest:insert_manifest_entry(Man4, 2, 1, E1), {Man6, _Dels} = perform_merge(Man5, E1, [E2, E3, E4, E5], 1, "../test", 3),