Page MenuHomePhabricator
Differential D3588

[4 of 5] scripted-diff: Rename CBlockDiskPos to FlatFilePos.
ClosedPublic
Actions

Authored by markblundeberg on Jul 7 2019, 22:41.

Details

Reviewers
deadalnix
Fabien
jasonbcox
Group Reviewers
Restricted Project
Maniphest Tasks
T631: Backport PR 15118 "Refactor block file logic"
Commits
rSTAGING2530507308ac: [4 of 5] scripted-diff: Rename CBlockDiskPos to FlatFilePos.
rABC2530507308ac: [4 of 5] scripted-diff: Rename CBlockDiskPos to FlatFilePos.
Summary

partial PR15118 backport
https://github.com/bitcoin/bitcoin/pull/15118/commits/65a489e93d181d3c0f7a9cf79f7c11ff8cf2b0f0

-BEGIN VERIFY SCRIPT-
sed -i 's/CDiskBlockPos/FlatFilePos/g' $(git ls-files 'src/*.h' 'src/*.cpp')
-END VERIFY SCRIPT-

Backport note: I simply re-ran the script, instead of merging the changes.

Depends on D3587

Test Plan

make check

Diff Detail

Repository
rABC Bitcoin ABC
Lint
Lint Not Applicable
Unit
Tests Not Applicable

Event Timeline

markblundeberg created this revision.Jul 7 2019, 22:41
Herald added a reviewer: Restricted Project. · View Herald TranscriptJul 7 2019, 22:41
teamcity added a comment.Jul 7 2019, 22:41

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

markblundeberg added a task: T631: Backport PR 15118 "Refactor block file logic".Jul 7 2019, 22:48
markblundeberg added a child revision: D3589: [5 of 5] Style cleanup..Jul 7 2019, 22:49
teamcity added a comment.Jul 7 2019, 22:49

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B6721: Diff 10066.Jul 7 2019, 22:49
markblundeberg updated this revision to Diff 10154.Jul 9 2019, 19:03

rebase

teamcity added a comment.Jul 9 2019, 19:03

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

teamcity added a comment.Jul 9 2019, 19:12

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B6773: Diff 10154.Jul 9 2019, 19:13
markblundeberg updated this revision to Diff 10278.Jul 13 2019, 02:02

minor conflict from parent

teamcity added a comment.Jul 13 2019, 02:02

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing started.

teamcity added a comment.Jul 13 2019, 02:13

Build Bitcoin-ABC / Diffs / Bitcoin-ABC Diff Testing passed.

Harbormaster completed remote builds in B6850: Diff 10278.Jul 13 2019, 02:13
jasonbcox requested changes to this revision.Jul 16 2019, 21:42

This is clearly missing at least one (if not more) backports. See ReadRawBlockFromDisk in the original PR.

This revision now requires changes to proceed.Jul 16 2019, 21:42
markblundeberg added a comment.Jul 19 2019, 15:31
In D3588#86855, @jasonbcox wrote:

This is clearly missing at least one (if not more) backports. See ReadRawBlockFromDisk in the original PR.

Hmm, is that terribly important for scripted renames like this? It should be fairly obvious what to do when the ReadRawBlockFromDisk is backported later...

markblundeberg requested review of this revision.Jul 19 2019, 15:31
deadalnix accepted this revision.Jul 21 2019, 13:29
In D3588#87160, @markblundeberg wrote:
In D3588#86855, @jasonbcox wrote:

This is clearly missing at least one (if not more) backports. See ReadRawBlockFromDisk in the original PR.

Hmm, is that terribly important for scripted renames like this? It should be fairly obvious what to do when the ReadRawBlockFromDisk is backported later...

It is indeed not very relevant, but would make that backport easier.

jasonbcox accepted this revision.Aug 14 2019, 23:36
This revision is now accepted and ready to land.Aug 14 2019, 23:36
Closed by commit rABC2530507308ac: [4 of 5] scripted-diff: Rename CBlockDiskPos to FlatFilePos. (authored by jimpo, committed by Mark Lundeberg <36528214+markblundeberg@users.noreply.github.com>). · Explain WhyAug 14 2019, 23:51
This revision was automatically updated to reflect the committed changes.
Mark Lundeberg <36528214+markblundeberg@users.noreply.github.com> added a commit: rABC2530507308ac: [4 of 5] scripted-diff: Rename CBlockDiskPos to FlatFilePos..
Mark Lundeberg <36528214+markblundeberg@users.noreply.github.com> added a commit: rSTAGING2530507308ac: [4 of 5] scripted-diff: Rename CBlockDiskPos to FlatFilePos..Sep 19 2019, 01:50

Revision Contents
Changeset List

PathSize
src/
8 lines
18 lines
14 lines
index/
10 lines
2 lines
test/
8 lines
36 lines
10 lines
73 lines

Diff 10806

View Options

src/chain.h

Loading...
View Options

src/flatfile.h

Loading...
View Options

src/flatfile.cpp

Loading...
View Options

src/index/txindex.cpp

Loading...
View Options

src/init.cpp

Loading...
View Options

src/test/blockindex_tests.cpp

Loading...
View Options

src/test/flatfile_tests.cpp

Loading...
View Options

src/validation.h

Loading...
View Options

src/validation.cpp

Loading...