umgeher/leveled
0
Fork 0
Code Issues Pull requests Releases Activity Actions
leveled/src/leveled_pmem.erl

640 lines
26 KiB
Erlang
Raw Normal View History

Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
%% -------- PENCILLER MEMORY ---------
%%
%% Module that provides functions for maintaining the L0 memory of the
%% Penciller.
%%
%% It is desirable that the L0Mem can efficiently handle the push of new trees
%% whilst maintaining the capability to quickly snapshot the memory for clones
%% of the Penciller.
%%
Minor quibbles Move legacy CDB code used only in unit tests into test area. Fix column width in pmem and comment out the unused case statement (in healthy tests) from the penciller test code
2016-11-03 16:46:25 +00:00
%% ETS tables are not used due to complications with managing their mutability,
%% as the database is snapshotted.
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
%%
%% An attempt was made to merge all trees into a single tree on push (in a
%% spawned process), but this proved to have an expensive impact as the tree
%% got larger.
%%
%% This approach is to keep a list of trees which have been received in the
%% order which they were received. There is then a fixed-size array of hashes
%% used to either point lookups at the right tree in the list, or inform the
%% requestor it is not present avoiding any lookups.
%%
%% Tests show this takes one third of the time at push (when compared to
%% merging to a single tree), and is an order of magnitude more efficient as
%% the tree reaches peak size. It is also an order of magnitude more
%% efficient to use the hash index when compared to looking through all the
%% trees.
%%
%% Total time for single_tree 217000 microseconds
%% Total time for array_tree 209000 microseconds
%% Total time for array_list 142000 microseconds
%% Total time for array_filter 69000 microseconds
Minor quibbles Move legacy CDB code used only in unit tests into test area. Fix column width in pmem and comment out the unused case statement (in healthy tests) from the penciller test code
2016-11-03 16:46:25 +00:00
%% List of 2000 checked without array - success count of 90 in 36000 microsecs
%% List of 2000 checked with array - success count of 90 in 1000 microsecs
L0 cache size counter improved This is now accurate save for hash collisions. It may now be a small under-estimate, whereas previously it could be a large over-estimate.
2016-11-03 16:22:51 +00:00
%%
%% The trade-off taken with the approach is that the size of the L0Cache is
%% uncertain. The Size count is incremented if the hash is not already
%% present, so the size may be lower than the actual size due to hash
%% collisions
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
-module(leveled_pmem).
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
-include("include/leveled.hrl").
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
-export([
add_to_index/5,
Handle gen_server:cast slowness There was some unpredictable performance in tests, that was related to the amount of time it took the sft gen_server to accept a cast whihc passed the levelzero_cache. The response time looked to be broadly proportional to the size of the cache - so it appeared to be an issue with passing the large object to the process queue. To avoid this, the penciller now instructs the SFT gen_server to callback to the server for each tree in the cache in turn as it is building the list from the cache. Each of these requests should be reltaively short, and the processing in-between should space out the requests so the Pencille ris not blocked from answering queries when pompting a L0 write.
2016-10-31 01:33:33 +00:00
to_list/2,
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
new_index/0,
check_levelzero/3,
Penciller Memory Refactor Plugged the ne wpencille rmemory into the Penciller, and took advantage of the increased speed to simplify the callbacks involved. The outcome is much simpler code
2016-10-30 18:25:30 +00:00
merge_trees/4
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
]).
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
-include_lib("eunit/include/eunit.hrl").
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
-define(SLOT_WIDTH, {2048, 11}).
-define(SKIP_WIDTH, 32).
-define(INFINITE_KEY, {null, null, null, null, null}).
-define(EMPTY_SKIPLIST, [{?INFINITE_KEY, []}]).
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
%%%============================================================================
%%% API
%%%============================================================================
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
add_to_index(L0Index, L0Size, LevelMinus1, LedgerSQN, TreeList) ->
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
SW = os:timestamp(),
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
SlotInTreeList = length(TreeList) + 1,
L0 cache size counter improved This is now accurate save for hash collisions. It may now be a small under-estimate, whereas previously it could be a large over-estimate.
2016-11-03 16:22:51 +00:00
FoldFun = fun({K, V}, {AccMinSQN, AccMaxSQN, AccCount, HashIndex}) ->
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
SQN = leveled_codec:strip_to_seqonly({K, V}),
{Hash, Slot} = hash_to_slot(K),
L = array:get(Slot, HashIndex),
L0 cache size counter improved This is now accurate save for hash collisions. It may now be a small under-estimate, whereas previously it could be a large over-estimate.
2016-11-03 16:22:51 +00:00
Count0 = case lists:keymember(Hash, 1, L) of
true ->
AccCount;
false ->
AccCount + 1
end,
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
{min(SQN, AccMinSQN),
max(SQN, AccMaxSQN),
L0 cache size counter improved This is now accurate save for hash collisions. It may now be a small under-estimate, whereas previously it could be a large over-estimate.
2016-11-03 16:22:51 +00:00
Count0,
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
array:set(Slot, [{Hash, SlotInTreeList}|L], HashIndex)}
end,
LM1List = gb_trees:to_list(LevelMinus1),
L0 cache size counter improved This is now accurate save for hash collisions. It may now be a small under-estimate, whereas previously it could be a large over-estimate.
2016-11-03 16:22:51 +00:00
StartingT = {infinity, 0, L0Size, L0Index},
{MinSQN, MaxSQN, NewL0Size, UpdL0Index} = lists:foldl(FoldFun,
StartingT,
LM1List),
Log improvements Continuation of log review and conversion to using central log function. Fixup of convoluted shutdown process between Bookie, Inker and Inker's Clerk
2016-11-03 16:05:43 +00:00
leveled_log:log_timer("PM001", [NewL0Size], SW),
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
if
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
MinSQN > LedgerSQN ->
{MaxSQN,
NewL0Size,
UpdL0Index,
lists:append(TreeList, [LevelMinus1])}
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
end.
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
Handle gen_server:cast slowness There was some unpredictable performance in tests, that was related to the amount of time it took the sft gen_server to accept a cast whihc passed the levelzero_cache. The response time looked to be broadly proportional to the size of the cache - so it appeared to be an issue with passing the large object to the process queue. To avoid this, the penciller now instructs the SFT gen_server to callback to the server for each tree in the cache in turn as it is building the list from the cache. Each of these requests should be reltaively short, and the processing in-between should space out the requests so the Pencille ris not blocked from answering queries when pompting a L0 write.
2016-10-31 01:33:33 +00:00
to_list(Slots, FetchFun) ->
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
SW = os:timestamp(),
Handle gen_server:cast slowness There was some unpredictable performance in tests, that was related to the amount of time it took the sft gen_server to accept a cast whihc passed the levelzero_cache. The response time looked to be broadly proportional to the size of the cache - so it appeared to be an issue with passing the large object to the process queue. To avoid this, the penciller now instructs the SFT gen_server to callback to the server for each tree in the cache in turn as it is building the list from the cache. Each of these requests should be reltaively short, and the processing in-between should space out the requests so the Pencille ris not blocked from answering queries when pompting a L0 write.
2016-10-31 01:33:33 +00:00
SlotList = lists:reverse(lists:seq(1, Slots)),
FullList = lists:foldl(fun(Slot, Acc) ->
Tree = FetchFun(Slot),
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
L = gb_trees:to_list(Tree),
Handle gen_server:cast slowness There was some unpredictable performance in tests, that was related to the amount of time it took the sft gen_server to accept a cast whihc passed the levelzero_cache. The response time looked to be broadly proportional to the size of the cache - so it appeared to be an issue with passing the large object to the process queue. To avoid this, the penciller now instructs the SFT gen_server to callback to the server for each tree in the cache in turn as it is building the list from the cache. Each of these requests should be reltaively short, and the processing in-between should space out the requests so the Pencille ris not blocked from answering queries when pompting a L0 write.
2016-10-31 01:33:33 +00:00
lists:ukeymerge(1, Acc, L)
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
end,
[],
Handle gen_server:cast slowness There was some unpredictable performance in tests, that was related to the amount of time it took the sft gen_server to accept a cast whihc passed the levelzero_cache. The response time looked to be broadly proportional to the size of the cache - so it appeared to be an issue with passing the large object to the process queue. To avoid this, the penciller now instructs the SFT gen_server to callback to the server for each tree in the cache in turn as it is building the list from the cache. Each of these requests should be reltaively short, and the processing in-between should space out the requests so the Pencille ris not blocked from answering queries when pompting a L0 write.
2016-10-31 01:33:33 +00:00
SlotList),
Log improvements Continuation of log review and conversion to using central log function. Fixup of convoluted shutdown process between Bookie, Inker and Inker's Clerk
2016-11-03 16:05:43 +00:00
leveled_log:log_timer("PM002", [length(FullList)], SW),
Handle gen_server:cast slowness There was some unpredictable performance in tests, that was related to the amount of time it took the sft gen_server to accept a cast whihc passed the levelzero_cache. The response time looked to be broadly proportional to the size of the cache - so it appeared to be an issue with passing the large object to the process queue. To avoid this, the penciller now instructs the SFT gen_server to callback to the server for each tree in the cache in turn as it is building the list from the cache. Each of these requests should be reltaively short, and the processing in-between should space out the requests so the Pencille ris not blocked from answering queries when pompting a L0 write.
2016-10-31 01:33:33 +00:00
FullList.
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
new_index() ->
array:new(element(1, ?SLOT_WIDTH), [{default, []}, fixed]).
check_levelzero(Key, L0Index, TreeList) ->
{Hash, Slot} = hash_to_slot(Key),
CheckList = array:get(Slot, L0Index),
SlotList = lists:foldl(fun({H0, S0}, SL) ->
case H0 of
Hash ->
[S0|SL];
_ ->
SL
end
end,
[],
CheckList),
lists:foldl(fun(SlotToCheck, {Found, KV}) ->
case Found of
true ->
{Found, KV};
false ->
CheckTree = lists:nth(SlotToCheck, TreeList),
case gb_trees:lookup(Key, CheckTree) of
none ->
{Found, KV};
{value, Value} ->
{true, {Key, Value}}
end
end
end,
{false, not_found},
lists:reverse(lists:usort(SlotList))).
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
Penciller Memory Refactor Plugged the ne wpencille rmemory into the Penciller, and took advantage of the increased speed to simplify the callbacks involved. The outcome is much simpler code
2016-10-30 18:25:30 +00:00
merge_trees(StartKey, EndKey, TreeList, LevelMinus1) ->
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
lists:foldl(fun(Tree, TreeAcc) ->
merge_nexttree(Tree, TreeAcc, StartKey, EndKey) end,
gb_trees:empty(),
Penciller Memory Refactor Plugged the ne wpencille rmemory into the Penciller, and took advantage of the increased speed to simplify the callbacks involved. The outcome is much simpler code
2016-10-30 18:25:30 +00:00
lists:append(TreeList, [LevelMinus1])).
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
Initial Commit for SkipLists To speed check on alternate platform
2016-11-22 23:21:47 +00:00
%%%============================================================================
%%% SkipList
%%%============================================================================
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
addhash_to_index(HashIndex, Hash, Slot, Count) ->
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
L = array:get(Slot, HashIndex),
case lists:member(Hash, L) of
true ->
{HashIndex, Count};
false ->
{array:set(Slot, [Hash|L], HashIndex), Count + 1}
end.
merge_indexes(HashIndex, MergedIndex, Count, L0Slot) ->
lists:foldl(fun(Slot, {MHI, AccCount}) ->
HashList = array:get(Slot, HashIndex),
case length(HashList) > 0 of
true ->
merge_indexes_singleslot(HashList,
Slot,
MHI,
L0Slot,
AccCount);
false ->
{MHI, AccCount}
end end,
{MergedIndex, Count},
lists:seq(0, element(1, ?SLOT_WIDTH) - 1)).
merge_indexes_singleslot(HashList, IndexSlot, MergedIndex, L0Slot, Count) ->
L = array:get(IndexSlot, MergedIndex),
{UpdHL, UpdCount} = lists:foldl(fun(H, {HL, C}) ->
case lists:keymember(H, 1, L) of
true ->
{[{H, L0Slot}|HL], C + 1};
false ->
{[{H, L0Slot}|HL], C}
end end,
{L, Count},
HashList),
{array:set(IndexSlot, UpdHL, MergedIndex), UpdCount}.
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
skiplist_put(SkipList, Key, Value, Hash) ->
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
{MarkerKey, SubList} = lists:foldl(fun({Marker, SL}, Acc) ->
case Acc of
false ->
case Marker >= Key of
true ->
{Marker, SL};
false ->
Acc
end;
_ ->
Acc
end end,
false,
SkipList),
case Hash rem ?SKIP_WIDTH of
0 ->
{LHS, RHS} = lists:splitwith(fun({K, _V}) -> K < Key end, SubList),
SkpL1 = lists:keyreplace(MarkerKey, 1, SkipList, {MarkerKey, RHS}),
SkpL2 = [{Key, lists:ukeysort(1, [{Key, Value}|LHS])}|SkpL1],
lists:ukeysort(1, SkpL2);
_ ->
UpdSubList = lists:ukeysort(1, [{Key, Value}|SubList]),
lists:keyreplace(MarkerKey, 1, SkipList, {MarkerKey, UpdSubList})
end.
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
skiplist_generate(UnsortedKVL) ->
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
KVL = lists:ukeysort(1, UnsortedKVL),
Initial Commit for SkipLists To speed check on alternate platform
2016-11-22 23:21:47 +00:00
Slots = length(KVL) div ?SKIP_WIDTH,
SkipList0 = lists:map(fun(X) ->
N = X * ?SKIP_WIDTH,
{K, _V} = lists:nth(N, KVL),
{K, lists:sublist(KVL,
N - ?SKIP_WIDTH + 1,
?SKIP_WIDTH)}
end,
lists:seq(1, length(KVL) div ?SKIP_WIDTH)),
case Slots * ?SKIP_WIDTH < length(KVL) of
true ->
{LastK, _V} = lists:last(KVL),
SkipList0 ++ [{LastK, lists:nthtail(Slots * ?SKIP_WIDTH, KVL)}];
false ->
SkipList0
end.
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
skiplist_get(SkipList, Key) ->
Initial Commit for SkipLists To speed check on alternate platform
2016-11-22 23:21:47 +00:00
SubList = lists:foldl(fun({SkipKey, SL}, Acc) ->
case {Acc, SkipKey} of
{null, SkipKey} when SkipKey >= Key ->
SL;
_ ->
Acc
end end,
null,
SkipList),
case SubList of
null ->
not_found;
SubList ->
case lists:keyfind(Key, 1, SubList) of
false ->
not_found;
{Key, V} ->
{Key, V}
end
end.
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
skiplist_range(SkipList, Start, End) ->
R = lists:foldl(fun({Mark, SL}, {PassedStart, PassedEnd, Acc, PrevList}) ->
case {PassedStart, PassedEnd} of
{true, true} ->
{true, true, Acc, null};
{false, false} ->
case Start > Mark of
true ->
{false, false, Acc, SL};
false ->
RHS = splitlist_start(Start, PrevList ++ SL),
case leveled_codec:endkey_passed(End, Mark) of
true ->
EL = splitlist_end(End, RHS),
{true, true, EL, null};
false ->
{true, false, RHS, null}
end
end;
{true, false} ->
case leveled_codec:endkey_passed(End, Mark) of
true ->
EL = splitlist_end(End, SL),
{true, true, Acc ++ EL, null};
false ->
{true, false, Acc ++ SL, null}
end
end end,
{false, false, [], []},
SkipList),
{_Bool1, _Bool2, SubList, _PrevList} = R,
Initial Commit for SkipLists To speed check on alternate platform
2016-11-22 23:21:47 +00:00
SubList.
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
splitlist_start(StartKey, SL) ->
{_LHS, RHS} = lists:splitwith(fun({K, _V}) -> K < StartKey end, SL),
RHS.
splitlist_end(EndKey, SL) ->
{LHS, _RHS} = lists:splitwith(fun({K, _V}) ->
not leveled_codec:endkey_passed(EndKey, K)
end,
SL),
LHS.
Initial Commit for SkipLists To speed check on alternate platform
2016-11-22 23:21:47 +00:00
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
%%%============================================================================
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
%%% Internal Functions
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
%%%============================================================================
hash_to_slot(Key) ->
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
H = erlang:phash2(Key),
{H bsr element(2, ?SLOT_WIDTH), H band (element(1, ?SLOT_WIDTH) - 1)}.
merge_nexttree(Tree, TreeAcc, StartKey, EndKey) ->
Iter = gb_trees:iterator_from(StartKey, Tree),
merge_nexttree(Iter, TreeAcc, EndKey).
merge_nexttree(Iter, TreeAcc, EndKey) ->
case gb_trees:next(Iter) of
none ->
TreeAcc;
{Key, Value, NewIter} ->
case leveled_codec:endkey_passed(EndKey, Key) of
true ->
TreeAcc;
false ->
merge_nexttree(NewIter,
gb_trees:enter(Key, Value, TreeAcc),
EndKey)
end
end.
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
%%%============================================================================
%%% Test
%%%============================================================================
-ifdef(TEST).
generate_randomkeys(Seqn, Count, BucketRangeLow, BucketRangeHigh) ->
generate_randomkeys(Seqn,
Count,
gb_trees:empty(),
BucketRangeLow,
BucketRangeHigh).
generate_randomkeys(_Seqn, 0, Acc, _BucketLow, _BucketHigh) ->
Acc;
generate_randomkeys(Seqn, Count, Acc, BucketLow, BRange) ->
Add out of range tests for skiplist range
2016-11-24 23:22:19 +00:00
BNumber =
case BRange of
0 ->
string:right(integer_to_list(BucketLow), 4, $0);
_ ->
BRand = random:uniform(BRange),
string:right(integer_to_list(BucketLow + BRand), 4, $0)
end,
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
KNumber = string:right(integer_to_list(random:uniform(1000)), 4, $0),
{K, V} = {{o, "Bucket" ++ BNumber, "Key" ++ KNumber, null},
{Seqn, {active, infinity}, null}},
generate_randomkeys(Seqn + 1,
Count - 1,
gb_trees:enter(K, V, Acc),
BucketLow,
BRange).
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
compare_method_test() ->
R = lists:foldl(fun(_X, {LedgerSQN, L0Size, L0Index, L0TreeList}) ->
Minor quibbles Move legacy CDB code used only in unit tests into test area. Fix column width in pmem and comment out the unused case statement (in healthy tests) from the penciller test code
2016-11-03 16:46:25 +00:00
LM1 = generate_randomkeys(LedgerSQN + 1,
2000, 1, 500),
add_to_index(L0Index, L0Size, LM1, LedgerSQN,
L0TreeList)
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
end,
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
{0, 0, new_index(), []},
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
lists:seq(1, 16)),
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
L0 cache size counter improved This is now accurate save for hash collisions. It may now be a small under-estimate, whereas previously it could be a large over-estimate.
2016-11-03 16:22:51 +00:00
{SQN, Size, Index, TreeList} = R,
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
?assertMatch(32000, SQN),
L0 cache size counter improved This is now accurate save for hash collisions. It may now be a small under-estimate, whereas previously it could be a large over-estimate.
2016-11-03 16:22:51 +00:00
?assertMatch(true, Size =< 32000),
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
TestList = gb_trees:to_list(generate_randomkeys(1, 2000, 1, 800)),
S0 = lists:foldl(fun({Key, _V}, Acc) ->
R0 = lists:foldr(fun(Tree, {Found, KV}) ->
case Found of
true ->
{true, KV};
false ->
L0 = gb_trees:lookup(Key, Tree),
case L0 of
none ->
{false, not_found};
{value, Value} ->
{true, {Key, Value}}
end
end
end,
{false, not_found},
TreeList),
[R0|Acc]
end,
[],
TestList),
S1 = lists:foldl(fun({Key, _V}, Acc) ->
R0 = check_levelzero(Key, Index, TreeList),
[R0|Acc]
end,
[],
TestList),
?assertMatch(S0, S1),
StartKey = {o, "Bucket0100", null, null},
EndKey = {o, "Bucket0200", null, null},
SWa = os:timestamp(),
Handle gen_server:cast slowness There was some unpredictable performance in tests, that was related to the amount of time it took the sft gen_server to accept a cast whihc passed the levelzero_cache. The response time looked to be broadly proportional to the size of the cache - so it appeared to be an issue with passing the large object to the process queue. To avoid this, the penciller now instructs the SFT gen_server to callback to the server for each tree in the cache in turn as it is building the list from the cache. Each of these requests should be reltaively short, and the processing in-between should space out the requests so the Pencille ris not blocked from answering queries when pompting a L0 write.
2016-10-31 01:33:33 +00:00
FetchFun = fun(Slot) -> lists:nth(Slot, TreeList) end,
DumpList = to_list(length(TreeList), FetchFun),
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
Q0 = lists:foldl(fun({K, V}, Acc) ->
P = leveled_codec:endkey_passed(EndKey, K),
case {K, P} of
{K, false} when K >= StartKey ->
gb_trees:enter(K, V, Acc);
_ ->
Acc
end
end,
gb_trees:empty(),
DumpList),
Sz0 = gb_trees:size(Q0),
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
io:format(user, "Crude method took ~w microseconds resulting in tree of "
++ "size ~w~n",
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
[timer:now_diff(os:timestamp(), SWa), Sz0]),
SWb = os:timestamp(),
Penciller Memory Refactor Plugged the ne wpencille rmemory into the Penciller, and took advantage of the increased speed to simplify the callbacks involved. The outcome is much simpler code
2016-10-30 18:25:30 +00:00
Q1 = merge_trees(StartKey, EndKey, TreeList, gb_trees:empty()),
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
Sz1 = gb_trees:size(Q1),
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
io:format(user, "Merge method took ~w microseconds resulting in tree of "
++ "size ~w~n",
Refactor of L0 memory Not yet integrated, but there is now unit-tested module for the new way of managing L0 memory cache in the Penciller. This mechansim is considerably more efficient than previous efforts and should allow for further simplification of the code.
2016-10-29 13:27:21 +01:00
[timer:now_diff(os:timestamp(), SWb), Sz1]),
?assertMatch(Sz0, Sz1).
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
Initial Commit for SkipLists To speed check on alternate platform
2016-11-22 23:21:47 +00:00
skiplist_test() ->
KL = gb_trees:to_list(generate_randomkeys(1, 4000, 1, 200)),
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
SWaD = os:timestamp(),
_D = lists:foldl(fun({K, V}, AccD) -> dict:store(K, V, AccD) end,
Initial Commit for SkipLists To speed check on alternate platform
2016-11-22 23:21:47 +00:00
dict:new(),
KL),
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
io:format(user, "Loading dict with 4000 keys in ~w microseconds~n",
[timer:now_diff(os:timestamp(), SWaD)]),
Initial Commit for SkipLists To speed check on alternate platform
2016-11-22 23:21:47 +00:00
SWa = os:timestamp(),
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
SkipList = skiplist_generate(KL),
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
io:format(user, "Generating skip list with 4000 keys in ~w microseconds~n",
Initial Commit for SkipLists To speed check on alternate platform
2016-11-22 23:21:47 +00:00
[timer:now_diff(os:timestamp(), SWa)]),
CheckList1 = lists:sublist(KL, 1200, 100),
CheckList2 = lists:sublist(KL, 1600, 100),
CheckList3 = lists:sublist(KL, 2000, 100),
CheckList4 = lists:sublist(KL, 2400, 100),
CheckList5 = lists:sublist(KL, 2800, 100),
CheckList6 = lists:sublist(KL, 1, 10),
CheckList7 = lists:nthtail(3800, KL),
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
CheckList8 = lists:sublist(KL, 3000, 1),
Initial Commit for SkipLists To speed check on alternate platform
2016-11-22 23:21:47 +00:00
CheckAll = CheckList1 ++ CheckList2 ++ CheckList3 ++
CheckList4 ++ CheckList5 ++ CheckList6 ++ CheckList7,
SWb = os:timestamp(),
lists:foreach(fun({K, V}) ->
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
?assertMatch({K, V}, skiplist_get(SkipList, K))
Initial Commit for SkipLists To speed check on alternate platform
2016-11-22 23:21:47 +00:00
end,
CheckAll),
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
io:format(user, "Finding 520 keys took ~w microseconds~n",
Initial Commit for SkipLists To speed check on alternate platform
2016-11-22 23:21:47 +00:00
[timer:now_diff(os:timestamp(), SWb)]),
SWc = os:timestamp(),
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
KR1 = skiplist_range(SkipList,
element(1, lists:nth(1, CheckList1)),
element(1, lists:last(CheckList1))),
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
io:format("Result length ~w ~n", [length(KR1)]),
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
CompareL1 = length(lists:usort(CheckList1)),
?assertMatch(CompareL1, length(KR1)),
KR2 = skiplist_range(SkipList,
element(1, lists:nth(1, CheckList2)),
element(1, lists:last(CheckList2))),
CompareL2 = length(lists:usort(CheckList2)),
?assertMatch(CompareL2, length(KR2)),
KR3 = skiplist_range(SkipList,
element(1, lists:nth(1, CheckList3)),
element(1, lists:last(CheckList3))),
CompareL3 = length(lists:usort(CheckList3)),
?assertMatch(CompareL3, length(KR3)),
KR4 = skiplist_range(SkipList,
element(1, lists:nth(1, CheckList4)),
element(1, lists:last(CheckList4))),
CompareL4 = length(lists:usort(CheckList4)),
?assertMatch(CompareL4, length(KR4)),
KR5 = skiplist_range(SkipList,
element(1, lists:nth(1, CheckList5)),
element(1, lists:last(CheckList5))),
CompareL5 = length(lists:usort(CheckList5)),
?assertMatch(CompareL5, length(KR5)),
KR6 = skiplist_range(SkipList,
element(1, lists:nth(1, CheckList6)),
element(1, lists:last(CheckList6))),
CompareL6 = length(lists:usort(CheckList6)),
?assertMatch(CompareL6, length(KR6)),
KR7 = skiplist_range(SkipList,
element(1, lists:nth(1, CheckList7)),
element(1, lists:last(CheckList7))),
CompareL7 = length(lists:usort(CheckList7)),
?assertMatch(CompareL7, length(KR7)),
KR8 = skiplist_range(SkipList,
element(1, lists:nth(1, CheckList8)),
element(1, lists:last(CheckList8))),
CompareL8 = length(lists:usort(CheckList8)),
?assertMatch(CompareL8, length(KR8)),
Add out of range tests for skiplist range
2016-11-24 23:22:19 +00:00
KL_OOR1 = gb_trees:to_list(generate_randomkeys(1, 4, 201, 202)),
KR9 = skiplist_range(SkipList,
element(1, lists:nth(1, KL_OOR1)),
element(1, lists:last(KL_OOR1))),
?assertMatch([], KR9),
KL_OOR2 = gb_trees:to_list(generate_randomkeys(1, 4, 0, 0)),
KR10 = skiplist_range(SkipList,
element(1, lists:nth(1, KL_OOR2)),
element(1, lists:last(KL_OOR2))),
?assertMatch([], KR10),
io:format(user, "Finding 10 ranges took ~w microseconds~n",
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
[timer:now_diff(os:timestamp(), SWc)]).
hash_index_test() ->
KeyCount = 4000,
SlotWidth = element(1, ?SLOT_WIDTH),
HI0 = new_index(),
MHI0 = new_index(),
KL0 = gb_trees:to_list(generate_randomkeys(1, KeyCount, 1, 200)),
CheckList1 = lists:sublist(KL0, 1200, 100),
CheckList2 = lists:sublist(KL0, 1600, 100),
CheckList3 = lists:sublist(KL0, 2000, 100),
CheckList4 = lists:sublist(KL0, 2400, 100),
CheckList5 = lists:sublist(KL0, 2800, 100),
CheckList6 = lists:sublist(KL0, 1, 10),
CheckList7 = lists:nthtail(3800, KL0),
CheckAll = CheckList1 ++ CheckList2 ++ CheckList3 ++
CheckList4 ++ CheckList5 ++ CheckList6 ++ CheckList7,
Initial Commit for SkipLists To speed check on alternate platform
2016-11-22 23:21:47 +00:00
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
SWa = os:timestamp(),
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
{HashIndex1, SkipList1, _TC} =
lists:foldl(fun({K, V}, {HI, SL, C}) ->
{H, S} = hash_to_slot(K),
{UpdHI, UpdC} = addhash_to_index(HI, H, S, C),
UpdSL = skiplist_put(SL, K, V, H),
{UpdHI, UpdSL, UpdC} end,
{HI0, ?EMPTY_SKIPLIST, 0},
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
KL0),
io:format(user, "Dynamic load of skiplist took ~w microseconds~n",
[timer:now_diff(os:timestamp(), SWa)]),
{LL, LN} = lists:foldl(fun({K, SL}, {Count, Number}) ->
{Count + length(SL), Number + 1} end,
{0, 0},
SkipList1),
io:format(user,
"Skip list has ~w markers with total members of ~w~n",
[LN, LL]),
?assertMatch(true, LL / LN > ?SKIP_WIDTH / 2 ),
?assertMatch(true, LL / LN < ?SKIP_WIDTH * 2 ),
SWb = os:timestamp(),
lists:foreach(fun({K, V}) ->
?assertMatch({K, V},
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
skiplist_get(SkipList1, K))
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
end,
CheckAll),
io:format(user, "Fetching ~w keys from skiplist took ~w microseconds~n",
[KeyCount, timer:now_diff(os:timestamp(), SWb)]),
SWc = os:timestamp(),
{HI1, _C1} = lists:foldl(fun({K, _V}, {HI, C}) ->
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
{H, S} = hash_to_slot(K),
addhash_to_index(HI, H, S, C) end,
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
{HI0, 0},
KL0),
io:format(user, "Adding ~w keys to hashindex took ~w microseconds~n",
[KeyCount, timer:now_diff(os:timestamp(), SWc)]),
?assertMatch(SlotWidth, array:size(HI1)),
SWd = os:timestamp(),
{MHI1, TC1} = merge_indexes(HI1, MHI0, 0, 0),
io:format(user, "First merge to hashindex took ~w microseconds~n",
[timer:now_diff(os:timestamp(), SWd)]),
?assertMatch(SlotWidth, array:size(MHI1)),
KL1 = gb_trees:to_list(generate_randomkeys(1, KeyCount, 1, 200)),
SWe = os:timestamp(),
HI2 = new_index(),
{HI3, _C2} = lists:foldl(fun({K, _V}, {HI, C}) ->
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
{H, S} = hash_to_slot(K),
addhash_to_index(HI, H, S, C) end,
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
{HI2, 0},
KL1),
io:format(user, "Adding ~w keys to hashindex took ~w microseconds~n",
[KeyCount, timer:now_diff(os:timestamp(), SWe)]),
SWf = os:timestamp(),
{MHI2, TC2} = merge_indexes(HI3, MHI1, TC1, 1),
io:format(user, "Second merge to hashindex took ~w microseconds~n",
[timer:now_diff(os:timestamp(), SWf)]),
?assertMatch(SlotWidth, array:size(MHI2)),
SWg = os:timestamp(),
HI4 = new_index(),
{HI5, _C3} = lists:foldl(fun({K, _V}, {HI, C}) ->
Tighten SkipList range Make SkipList range accurate - trim the edges
2016-11-24 23:09:17 +00:00
{H, S} = hash_to_slot(K),
addhash_to_index(HI, H, S, C) end,
Ongoing work on skip lists Initial rough implementation with some timing tests
2016-11-24 20:16:41 +00:00
{HI4, 0},
KL1),
io:format(user, "Adding ~w keys to hashindex took ~w microseconds~n",
[KeyCount, timer:now_diff(os:timestamp(), SWg)]),
SWh = os:timestamp(),
{MHI3, _TC3} = merge_indexes(HI5, MHI2, TC2, 2),
io:format(user, "Third merge to hashindex took ~w microseconds~n",
[timer:now_diff(os:timestamp(), SWh)]),
?assertMatch(SlotWidth, array:size(MHI2)).
Pneciller Memory Test The current penciller memory setup is inefficient. Is there an alternative which is still relatively simple and but more efficient?
2016-10-29 01:06:00 +01:00
-endif.
Reference in a new issue Copy permalink