Inker Manifest to be a two-level list
To eas seraching from front to back, change the inker manifest to be a two-level list
This commit is contained in:
martinsumner
parent
1f406c76dd
commit
853f113ee5
2 changed files with 208 additions and 74 deletions
|
|
@ -110,7 +110,6 @@
|
|||
ink_close/1,
|
||||
ink_doom/1,
|
||||
build_dummy_journal/0,
|
||||
simple_manifest_reader/2,
|
||||
clean_testdir/1,
|
||||
filepath/2,
|
||||
filepath/3]).
|
||||
|
|
@ -122,7 +121,6 @@
|
|||
-define(COMPACT_FP, "post_compact").
|
||||
-define(WASTE_FP, "waste").
|
||||
-define(JOURNAL_FILEX, "cdb").
|
||||
-define(MANIFEST_FILEX, "man").
|
||||
-define(PENDING_FILEX, "pnd").
|
||||
-define(LOADING_PAUSE, 1000).
|
||||
-define(LOADING_BATCH, 1000).
|
||||
|
|
@ -259,7 +257,7 @@ handle_call({get, Key, SQN}, _From, State) ->
|
|||
handle_call({key_check, Key, SQN}, _From, State) ->
|
||||
{reply, key_check(Key, SQN, State#state.manifest), State};
|
||||
handle_call({load_pcl, StartSQN, FilterFun, Penciller}, _From, State) ->
|
||||
Manifest = lists:reverse(State#state.manifest),
|
||||
Manifest = lists:reverse(leveled_imanifest:to_list(State#state.manifest)),
|
||||
Reply = load_from_sequence(StartSQN, FilterFun, Penciller, Manifest),
|
||||
{reply, Reply, State};
|
||||
handle_call({register_snapshot, Requestor}, _From , State) ->
|
||||
|
|
@ -281,29 +279,30 @@ handle_call({confirm_delete, ManSQN}, _From, State) ->
|
|||
State#state.registered_snapshots),
|
||||
{reply, Reply, State};
|
||||
handle_call(get_manifest, _From, State) ->
|
||||
{reply, State#state.manifest, State};
|
||||
{reply, leveled_imanifest:to_list(State#state.manifest), State};
|
||||
handle_call({update_manifest,
|
||||
ManifestSnippet,
|
||||
DeletedFiles}, _From, State) ->
|
||||
Man0 = lists:foldl(fun(ManEntry, AccMan) ->
|
||||
leveled_imanifest:remove_entry(AccMan, ManEntry)
|
||||
end,
|
||||
State#state.manifest,
|
||||
DeletedFiles),
|
||||
Man1 = lists:foldl(fun(ManEntry, AccMan) ->
|
||||
leveled_imanifest:add_entry(AccMan, ManEntry) end,
|
||||
Man0,
|
||||
ManifestSnippet),
|
||||
DropFun =
|
||||
fun(E, Acc) ->
|
||||
leveled_imanifest:remove_entry(Acc, E)
|
||||
end,
|
||||
Man0 = lists:foldl(DropFun, State#state.manifest, DeletedFiles),
|
||||
AddFun =
|
||||
fun(E, Acc) ->
|
||||
leveled_imanifest:add_entry(Acc, E, false)
|
||||
end,
|
||||
Man1 = lists:foldl(AddFun, Man0, ManifestSnippet),
|
||||
NewManifestSQN = State#state.manifest_sqn + 1,
|
||||
manifest_printer(Man1),
|
||||
simple_manifest_writer(Man1, NewManifestSQN, State#state.root_path),
|
||||
leveled_imanifest:printer(Man1),
|
||||
leveled_imanifest:writer(Man1, NewManifestSQN, State#state.root_path),
|
||||
{reply,
|
||||
{ok, NewManifestSQN},
|
||||
State#state{manifest=Man1,
|
||||
manifest_sqn=NewManifestSQN,
|
||||
pending_removals=DeletedFiles}};
|
||||
handle_call(print_manifest, _From, State) ->
|
||||
manifest_printer(State#state.manifest),
|
||||
leveled_imanifest:printer(State#state.manifest),
|
||||
{reply, ok, State};
|
||||
handle_call({compact,
|
||||
Checker,
|
||||
|
|
@ -353,8 +352,9 @@ terminate(Reason, State) ->
|
|||
lists:foreach(fun({Snap, _SQN}) -> ok = ink_close(Snap) end,
|
||||
State#state.registered_snapshots),
|
||||
leveled_log:log("I0007", []),
|
||||
manifest_printer(State#state.manifest),
|
||||
ok = close_allmanifest(State#state.manifest)
|
||||
leveled_imanifest:printer(State#state.manifest),
|
||||
ManAsList = leveled_imanifest:to_list(State#state.manifest),
|
||||
ok = close_allmanifest(ManAsList)
|
||||
end.
|
||||
|
||||
code_change(_OldVsn, State, _Extra) ->
|
||||
|
|
@ -439,10 +439,10 @@ put_object(LedgerKey, Object, KeyChanges, State) ->
|
|||
State#state.root_path,
|
||||
CDBopts),
|
||||
{_, _, NewJournalP, _} = ManEntry,
|
||||
Manifest1 = leveled_imanifest:add_entry(Manifest0, ManEntry),
|
||||
ok = simple_manifest_writer(Manifest1,
|
||||
State#state.manifest_sqn + 1,
|
||||
State#state.root_path),
|
||||
Manifest1 = leveled_imanifest:add_entry(Manifest0, ManEntry, true),
|
||||
ok = leveled_imanifest:writer(Manifest1,
|
||||
State#state.manifest_sqn + 1,
|
||||
State#state.root_path),
|
||||
ok = leveled_cdb:cdb_put(NewJournalP,
|
||||
JournalKey,
|
||||
JournalBin),
|
||||
|
|
@ -478,7 +478,7 @@ build_manifest(ManifestFilenames,
|
|||
CDBopts) ->
|
||||
% Find the manifest with a highest Manifest sequence number
|
||||
% Open it and read it to get the current Confirmed Manifest
|
||||
ManifestRegex = "(?<MSQN>[0-9]+)\\." ++ ?MANIFEST_FILEX,
|
||||
ManifestRegex = "(?<MSQN>[0-9]+)\\." ++ leveled_imanifest:complete_filex(),
|
||||
ValidManSQNs = sequencenumbers_fromfilenames(ManifestFilenames,
|
||||
ManifestRegex,
|
||||
'MSQN'),
|
||||
|
|
@ -488,7 +488,7 @@ build_manifest(ManifestFilenames,
|
|||
{[], 1};
|
||||
_ ->
|
||||
PersistedManSQN = lists:max(ValidManSQNs),
|
||||
M1 = simple_manifest_reader(PersistedManSQN,
|
||||
M1 = leveled_imanifest:reader(PersistedManSQN,
|
||||
RootPath),
|
||||
{M1, PersistedManSQN}
|
||||
end,
|
||||
|
|
@ -497,7 +497,10 @@ build_manifest(ManifestFilenames,
|
|||
% a valid active journal at the head of the manifest
|
||||
OpenManifest = open_all_manifest(Manifest, RootPath, CDBopts),
|
||||
|
||||
{ActiveLowSQN, _FN, ActiveJournal, _LK} = lists:nth(1, OpenManifest),
|
||||
{ActiveLowSQN,
|
||||
_FN,
|
||||
ActiveJournal,
|
||||
_LK} = leveled_imanifest:head_entry(OpenManifest),
|
||||
JournalSQN = case leveled_cdb:cdb_lastkey(ActiveJournal) of
|
||||
empty ->
|
||||
ActiveLowSQN;
|
||||
|
|
@ -511,13 +514,13 @@ build_manifest(ManifestFilenames,
|
|||
if
|
||||
length(OpenManifest) > length(Manifest) ->
|
||||
leveled_log:log("I0009", []),
|
||||
manifest_printer(OpenManifest),
|
||||
leveled_imanifest:printer(OpenManifest),
|
||||
NextSQN = ManifestSQN + 1,
|
||||
simple_manifest_writer(OpenManifest, NextSQN, RootPath),
|
||||
leveled_imanifest:writer(OpenManifest, NextSQN, RootPath),
|
||||
NextSQN;
|
||||
true ->
|
||||
leveled_log:log("I0010", []),
|
||||
manifest_printer(OpenManifest),
|
||||
leveled_imanifest:printer(OpenManifest),
|
||||
ManifestSQN
|
||||
end,
|
||||
{OpenManifest, UpdManifestSQN, JournalSQN, ActiveJournal}.
|
||||
|
|
@ -533,9 +536,11 @@ close_allmanifest([H|ManifestT]) ->
|
|||
|
||||
open_all_manifest([], RootPath, CDBOpts) ->
|
||||
leveled_log:log("I0011", []),
|
||||
leveled_imanifest:add_entry([], start_new_activejournal(1, RootPath, CDBOpts));
|
||||
leveled_imanifest:add_entry([],
|
||||
start_new_activejournal(1, RootPath, CDBOpts),
|
||||
true);
|
||||
open_all_manifest(Man0, RootPath, CDBOpts) ->
|
||||
Man1 = lists:reverse(lists:sort(Man0)),
|
||||
Man1 = leveled_imanifest:to_list(Man0),
|
||||
[{HeadSQN, HeadFN, _IgnorePid, HeadLK}|ManifestTail] = Man1,
|
||||
OpenJournalFun =
|
||||
fun(ManEntry) ->
|
||||
|
|
@ -559,7 +564,8 @@ open_all_manifest(Man0, RootPath, CDBOpts) ->
|
|||
ManEntry
|
||||
end
|
||||
end,
|
||||
OpenedTail = lists:map(OpenJournalFun, ManifestTail),
|
||||
OpenedTailAsList = lists:map(OpenJournalFun, ManifestTail),
|
||||
OpenedTail = leveled_imanifest:from_list(OpenedTailAsList),
|
||||
CompleteHeadFN = HeadFN ++ "." ++ ?JOURNAL_FILEX,
|
||||
PendingHeadFN = HeadFN ++ "." ++ ?PENDING_FILEX,
|
||||
case filelib:is_file(CompleteHeadFN) of
|
||||
|
|
@ -572,16 +578,20 @@ open_all_manifest(Man0, RootPath, CDBOpts) ->
|
|||
{HeadSQN,
|
||||
HeadFN,
|
||||
HeadR,
|
||||
LastKey}),
|
||||
LastKey},
|
||||
true),
|
||||
NewManEntry = start_new_activejournal(LastSQN + 1,
|
||||
RootPath,
|
||||
CDBOpts),
|
||||
leveled_imanifest:add_entry(ManToHead, NewManEntry);
|
||||
leveled_imanifest:add_entry(ManToHead,
|
||||
NewManEntry,
|
||||
true);
|
||||
false ->
|
||||
{ok, HeadW} = leveled_cdb:cdb_open_writer(PendingHeadFN,
|
||||
CDBOpts),
|
||||
leveled_imanifest:add_entry(OpenedTail,
|
||||
{HeadSQN, HeadFN, HeadW, HeadLK})
|
||||
{HeadSQN, HeadFN, HeadW, HeadLK},
|
||||
true)
|
||||
end.
|
||||
|
||||
|
||||
|
|
@ -707,35 +717,6 @@ filepath(CompactFilePath, NewSQN, compact_journal) ->
|
|||
++ "." ++ ?PENDING_FILEX).
|
||||
|
||||
|
||||
simple_manifest_reader(SQN, RootPath) ->
|
||||
ManifestPath = filepath(RootPath, manifest_dir),
|
||||
leveled_log:log("I0015", [ManifestPath, SQN]),
|
||||
{ok, MBin} = file:read_file(filename:join(ManifestPath,
|
||||
integer_to_list(SQN)
|
||||
++ ".man")),
|
||||
binary_to_term(MBin).
|
||||
|
||||
|
||||
simple_manifest_writer(Manifest, ManSQN, RootPath) ->
|
||||
ManPath = filepath(RootPath, manifest_dir),
|
||||
NewFN = filename:join(ManPath,
|
||||
integer_to_list(ManSQN) ++ "." ++ ?MANIFEST_FILEX),
|
||||
TmpFN = filename:join(ManPath,
|
||||
integer_to_list(ManSQN) ++ "." ++ ?PENDING_FILEX),
|
||||
MBin = term_to_binary(Manifest, [compressed]),
|
||||
case filelib:is_file(NewFN) of
|
||||
false ->
|
||||
leveled_log:log("I0016", [ManSQN]),
|
||||
ok = file:write_file(TmpFN, MBin),
|
||||
ok = file:rename(TmpFN, NewFN),
|
||||
ok
|
||||
end.
|
||||
|
||||
manifest_printer(Manifest) ->
|
||||
lists:foreach(fun({SQN, FN, _PID, _LK}) ->
|
||||
leveled_log:log("I0017", [SQN, FN]) end,
|
||||
Manifest).
|
||||
|
||||
initiate_penciller_snapshot(Bookie) ->
|
||||
{ok,
|
||||
{LedgerSnap, LedgerCache},
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue