umgeher/leveled
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Allow add_kv to output segment

Browse source 
Make it easier to spot clashes with dirty segments in kv_index_tictactree
This commit is contained in:
Martin Sumner 2018-05-24 20:03:53 +01:00
parent ca2b857e36
commit 9f9da77398
1 changed files with 27 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

30
src/leveled_tictac.erl
View file

@ -58,6 +58,7 @@
new_tree/1, new_tree/1,
new_tree/2, new_tree/2,
add_kv/4, add_kv/4,
add_kv/5,
alter_segment/3, alter_segment/3,
find_dirtyleaves/2, find_dirtyleaves/2,
find_dirtysegments/2, find_dirtysegments/2,
@ -192,6 +193,13 @@ import_tree(ExportedTree) ->
%% BinExtractFun will also need to do any canonicalisation necessary to make %% BinExtractFun will also need to do any canonicalisation necessary to make
%% the hash consistent (such as whitespace removal, or sorting) %% the hash consistent (such as whitespace removal, or sorting)
add_kv(TicTacTree, Key, Value, BinExtractFun) -> add_kv(TicTacTree, Key, Value, BinExtractFun) ->
add_kv(TicTacTree, Key, Value, BinExtractFun, false).
-spec add_kv(tictactree(), tuple(), tuple(), fun(), boolean())
-> tictactree()|{tictactree(), integer()}.
%% @doc
%% add_kv with ability to return segment ID of Key added
add_kv(TicTacTree, Key, Value, BinExtractFun, ReturnSegment) ->
{BinK, BinV} = BinExtractFun(Key, Value), {BinK, BinV} = BinExtractFun(Key, Value),
{SegHash, SegChangeHash} = tictac_hash(BinK, BinV), {SegHash, SegChangeHash} = tictac_hash(BinK, BinV),
Segment = get_segment(SegHash, TicTacTree#tictactree.segment_count), Segment = get_segment(SegHash, TicTacTree#tictactree.segment_count),
@ -202,8 +210,15 @@ add_kv(TicTacTree, Key, Value, BinExtractFun) ->
SegLeaf2Upd = SegLeaf2 bxor SegChangeHash, SegLeaf2Upd = SegLeaf2 bxor SegChangeHash,
SegLeaf1Upd = SegLeaf1 bxor SegChangeHash, SegLeaf1Upd = SegLeaf1 bxor SegChangeHash,
replace_segment(SegLeaf1Upd, SegLeaf2Upd, case ReturnSegment of
L1Extract, L2Extract, TicTacTree). true ->
{replace_segment(SegLeaf1Upd, SegLeaf2Upd,
L1Extract, L2Extract, TicTacTree),
Segment};
false ->
replace_segment(SegLeaf1Upd, SegLeaf2Upd,
L1Extract, L2Extract, TicTacTree)
end.
-spec alter_segment(integer(), integer(), tictactree()) -> tictactree(). -spec alter_segment(integer(), integer(), tictactree()) -> tictactree().
%% @doc %% @doc
@ -641,9 +656,18 @@ alter_segment_test() ->
TreeX4A = alter_segment(DeltaSegment, 0, TreeX4), TreeX4A = alter_segment(DeltaSegment, 0, TreeX4),
TreeY5A = alter_segment(DeltaSegment, 0, TreeY5), TreeY5A = alter_segment(DeltaSegment, 0, TreeY5),
CompareResult = compare_trees_maxonedelta(TreeX4A, TreeY5A), CompareResult = compare_trees_maxonedelta(TreeX4A, TreeY5A),
io:format("Compare Result ~w~n", [CompareResult]),
?assertMatch([], CompareResult). ?assertMatch([], CompareResult).
return_segment_test() ->
BinFun = fun(K, V) -> {term_to_binary(K), term_to_binary(V)} end,
TreeX0 = new_tree(0, small),
{TreeX1, SegID}
= add_kv(TreeX0, {o, "B1", "X1", null}, {caine, 1}, BinFun, true),
TreeX2 = alter_segment(SegID, 0, TreeX1),
?assertMatch(1, length(compare_trees_maxonedelta(TreeX1, TreeX0))),
?assertMatch(1, length(compare_trees_maxonedelta(TreeX1, TreeX2))).
compare_trees_maxonedelta(Tree0, Tree1) -> compare_trees_maxonedelta(Tree0, Tree1) ->
Root1 = fetch_root(Tree1), Root1 = fetch_root(Tree1),