Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

JournalDB with in-memory overlay (option2) #634

Merged
merged 10 commits into from Mar 12, 2016
Merged

JournalDB with in-memory overlay (option2) #634

merged 10 commits into from Mar 12, 2016

Conversation

arkpar
Copy link
Collaborator

@arkpar arkpar commented Mar 8, 2016

#630

See code comments for description

@arkpar arkpar added the A0-pleasereview 🤓 Pull request needs code review. label Mar 8, 2016
{
if canon_id == journal.id {
for h in &journal.insertions {
match journal_overlay.backing_overlay.raw(&h) {
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

& is probably not needed here, cause h is already a reference.

@debris debris added A8-looksgood 🦄 Pull request is reviewed well. and removed A0-pleasereview 🤓 Pull request needs code review. labels Mar 9, 2016
@debris
Copy link
Collaborator

debris commented Mar 9, 2016

LGTM, but it probably needs additional review by @gavofyork

@gavofyork gavofyork added the A1-onice 🌨 Pull request is reviewed well, but should not yet be merged. label Mar 9, 2016
@gavofyork
Copy link
Contributor

will reconsider option2 tomorrow after option1 has tested through the night.

would like to have the --archive option default anyway.

@gavofyork gavofyork added A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. and removed A8-looksgood 🦄 Pull request is reviewed well. labels Mar 10, 2016
@gavofyork
Copy link
Contributor

needs a merge

@gavofyork gavofyork added A8-looksgood 🦄 Pull request is reviewed well. and removed A7-looksgoodcantmerge 🙄 Pull request is reviewed well, but cannot be merged due to conflicts. A1-onice 🌨 Pull request is reviewed well, but should not yet be merged. labels Mar 10, 2016
}
overlay_deletions.append(&mut journal.insertions);
}
index +=1;
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

missing space.

@gavofyork gavofyork added A1-onice 🌨 Pull request is reviewed well, but should not yet be merged. and removed A8-looksgood 🦄 Pull request is reviewed well. labels Mar 11, 2016
@gavofyork
Copy link
Contributor

waiting on additional tests

@arkpar arkpar added the A0-pleasereview 🤓 Pull request needs code review. label Mar 11, 2016
gavofyork added a commit that referenced this pull request Mar 12, 2016
JournalDB with in-memory overlay (option2)
@gavofyork gavofyork merged commit 88e23fc into master Mar 12, 2016
@gavofyork gavofyork deleted the jdb_option2 branch March 12, 2016 09:01
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
A0-pleasereview 🤓 Pull request needs code review. A1-onice 🌨 Pull request is reviewed well, but should not yet be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants