Manifest refactor - STILL BROKEN

Some working tests now, but sitll broken
This commit is contained in:
martinsumner 2017-01-14 16:36:05 +00:00
parent 0204a23a58
commit 76bdd83346
4 changed files with 186 additions and 84 deletions

View file

@ -111,7 +111,7 @@ requestandhandle_work(State) ->
Manifest,
State#state.root_path),
leveled_log:log("PC007", []),
ok = leveled_penciller:pcl_commitmanifestchange(State#state.owner,
ok = leveled_penciller:pcl_manifestchange(State#state.owner,
UpdManifest),
ok = leveled_manifest:save_manifest(UpdManifest,
State#state.root_path),
@ -171,7 +171,7 @@ perform_merge(Manifest, Src, SinkList, SrcLevel, RootPath, NewSQN) ->
SinkPointerList = leveled_manifest:pointer_convert(Manifest, SinkList),
MaxSQN = leveled_sst:sst_getmaxsequencenumber(Src#manifest_entry.owner),
SinkLevel = SrcLevel + 1,
SinkBasement = leveled_basement:is_basement(Manifest, SinkLevel),
SinkBasement = leveled_manifest:is_basement(Manifest, SinkLevel),
Man0 = do_merge(SrcList, SinkPointerList,
SinkLevel, SinkBasement,
RootPath, NewSQN, MaxSQN,