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

Passing ETS reference not tree

Browse source 
ETS reference gets converted to tree by Penciller
This commit is contained in:
martinsumner 2017-03-13 11:54:46 +00:00
parent 121f410b8f
commit 62c3ba8b6f
2 changed files with 12 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/leveled_bookie.erl
View file

@ -1181,7 +1181,7 @@ maybepush_ledgercache(MaxCacheSize, Cache, Penciller) ->
TimeToPush = maybe_withjitter(CacheSize, MaxCacheSize), TimeToPush = maybe_withjitter(CacheSize, MaxCacheSize),
if if
TimeToPush -> TimeToPush ->
CacheToLoad = {leveled_tree:from_orderedset(Tab, ?CACHE_TYPE), CacheToLoad = {Tab,
Cache#ledger_cache.index, Cache#ledger_cache.index,
Cache#ledger_cache.min_sqn, Cache#ledger_cache.min_sqn,
Cache#ledger_cache.max_sqn}, Cache#ledger_cache.max_sqn},

11
src/leveled_penciller.erl
View file

@ -341,7 +341,7 @@ init([PCLopts]) ->
end. end.
handle_call({push_mem, {PushedTree, PushedIdx, MinSQN, MaxSQN}}, handle_call({push_mem, {LedgerTable, PushedIdx, MinSQN, MaxSQN}},
From, From,
State=#state{is_snapshot=Snap}) when Snap == false -> State=#state{is_snapshot=Snap}) when Snap == false ->
% The push_mem process is as follows: % The push_mem process is as follows:
@ -370,6 +370,15 @@ handle_call({push_mem, {PushedTree, PushedIdx, MinSQN, MaxSQN}},
{reply, returned, State}; {reply, returned, State};
false -> false ->
leveled_log:log("P0018", [ok, false, false]), leveled_log:log("P0018", [ok, false, false]),
PushedTree =
case is_tuple(LedgerTable) of
true ->
LedgerTable;
false ->
leveled_tree:from_orderedset(LedgerTable,
?CACHE_TYPE)
end,
% Reply ust happen after the table has been converted
gen_server:reply(From, ok), gen_server:reply(From, ok),
{noreply, {noreply,
update_levelzero(State#state.levelzero_size, update_levelzero(State#state.levelzero_size,