New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Alter assumptions in CCoinsViewCache::BatchWrite #5967

Merged
merged 1 commit into from Nov 27, 2015

Conversation

Projects
None yet
4 participants
@morcos
Member

morcos commented Apr 3, 2015

Previously it would break if you flushed a parent cache while there was a child cache referring to it. This change will allow the flushing of parent caches.

It also modifies the unit test to include flushing of intermediate caches.

@morcos morcos closed this Apr 23, 2015

@morcos morcos deleted the morcos:AllowIntermediateFlushes branch Apr 23, 2015

@morcos morcos restored the morcos:AllowIntermediateFlushes branch Apr 23, 2015

@morcos morcos reopened this Apr 23, 2015

Show outdated Hide outdated src/coins.cpp
// would have pulled it in at first GetCoins).
assert(it->second.flags & CCoinsCacheEntry::FRESH);
// The parent cache does not have an entry, while the child does
// We can ignore it if its both FRESH and pruned in the child

This comment has been minimized.

@sipa

sipa Apr 27, 2015

Member

Nit: s/its/it's/

@sipa

sipa Apr 27, 2015

Member

Nit: s/its/it's/

@sipa

This comment has been minimized.

Show comment
Hide comment
@sipa

sipa Apr 27, 2015

Member

Untested ACK, but the unit test should cover it.

Member

sipa commented Apr 27, 2015

Untested ACK, but the unit test should cover it.

@morcos

This comment has been minimized.

Show comment
Hide comment
@morcos

morcos May 18, 2015

Member

Needed rebase (nit fixed)

Member

morcos commented May 18, 2015

Needed rebase (nit fixed)

@MarcoFalke

This comment has been minimized.

Show comment
Hide comment
@MarcoFalke

MarcoFalke Nov 10, 2015

Member

@morcos This needs an update/rebase?

Member

MarcoFalke commented Nov 10, 2015

@morcos This needs an update/rebase?

@morcos

This comment has been minimized.

Show comment
Hide comment
@morcos

morcos Nov 12, 2015

Member

rebased

Member

morcos commented Nov 12, 2015

rebased

@sipa

This comment has been minimized.

Show comment
Hide comment
@sipa

sipa Nov 13, 2015

Member

Code review & lightly tested ACK.

Member

sipa commented Nov 13, 2015

Code review & lightly tested ACK.

Alter assumptions in CCoinsViewCache::BatchWrite
Previously it would break if you flushed a parent cache while there was a child cache referring to it.  This change will allow the flushing of parent caches.
@morcos

This comment has been minimized.

Show comment
Hide comment
@morcos

morcos Nov 18, 2015

Member

This was rebased to modify the new unit test added from #6932 as well.

Member

morcos commented Nov 18, 2015

This was rebased to modify the new unit test added from #6932 as well.

@morcos morcos referenced this pull request Nov 18, 2015

Merged

Save last db read #7056

@laanwj laanwj merged commit 072e2f8 into bitcoin:master Nov 27, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

laanwj added a commit that referenced this pull request Nov 27, 2015

Merge pull request #5967
072e2f8 Alter assumptions in CCoinsViewCache::BatchWrite (Alex Morcos)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment