wallet: move BDB specific classes to bdb.{cpp/h} #19290

pull achow101 wants to merge 5 commits into bitcoin:master from achow101:move-bdb changing 9 files +1159 −1116

achow101 commented at 12:49 AM on June 16, 2020: member

Moves the BDB specific classes from db.{cpp/h} to bdb.{cpp/h}.

To do this, SplitWalletFilePath is first made non-static. Then IsWalletLoaded functionality is moved to IsBDBWalletLoaded which is called by IsWalletLoaded. Then the bulk of db.{cpp/h} is moved to a new file bdb.{cpp/h}.

While doing some moveonly stuff, an additional commit moves the *Cursor and Txn* implementations out of the header file and into the cpp file.

Part of #18971
walletdb: Make SpliWalletFilePath non-static c3538f435a
walletdb: Add IsBDBWalletLoaded to look for BDB wallets specifically f6fc5f3849
walletdb: move IsWalletLoaded to walletdb.cpp 25a655794a
walletdb: moveonly: Move BerkeleyBatch Cursor and Txn funcs to cpp
Put the implementation in the cpp, not the h file.
8f033642a8

walletdb: Move BDB specific things into bdb.{cpp/h}

Leave wallet/db.{cpp/h} for generic WalletDatabase stuff. The BDB
specific stuff goes into bdb.{cpp/h}

61c16339da

fanquake added the label Wallet on Jun 16, 2020
achow101 cross-referenced this on Jun 16, 2020 from issue wallet: Refactor BerkeleyBatch Read, Write, Erase, and Exists functions into non-template functions by achow101
achow101 cross-referenced this on Jun 16, 2020 from issue wallet: Refactor the classes in wallet/db.{cpp/h} by achow101
DrahtBot commented at 9:48 AM on June 16, 2020: contributor


The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.



Conflicts

Reviewers, this pull request conflicts with the following ones:
- #19245 ([WIP DONOTMERGE] Replace boost::filesystem with std::filesystem (in c++17) by kiminuo)
- #19137 (wallettool: Add dump and createfromdump commands by achow101)
- #19085 (Refactor: clean up PeriodicFlush() by jnewbery)
- #18907 (walletdb: Don't remove database transaction logs and instead error by achow101)
- #18904 (Don't call lsn_reset in periodic flush by bvbfan)
- #18618 (gui: Drop RecentRequestsTableModel dependency to WalletModel by promag)
- #18608 (refactor: Remove CAddressBookData::destdata by ryanofsky)
If you consider this pull request important, please also help to review the conflicting pull requests. Ideally, start with the one that should be merged first.
DrahtBot cross-referenced this on Jun 16, 2020 from issue wallettool: Add dump and createfromdump commands by achow101
DrahtBot cross-referenced this on Jun 16, 2020 from issue wallet: Introduce and use DummyDatabase instead of dummy BerkeleyDatabase by achow101
DrahtBot cross-referenced this on Jun 16, 2020 from issue Refactor: clean up PeriodicFlush() by jnewbery
DrahtBot cross-referenced this on Jun 16, 2020 from issue walletdb: Don't remove database transaction logs and instead error by achow101
DrahtBot cross-referenced this on Jun 16, 2020 from issue Don't call lsn_reset in periodic flush by bvbfan
DrahtBot cross-referenced this on Jun 16, 2020 from issue gui: Drop RecentRequestsTableModel dependency to WalletModel by promag
DrahtBot cross-referenced this on Jun 16, 2020 from issue refactor: Remove CAddressBookData::destdata by ryanofsky
laanwj commented at 5:02 PM on June 16, 2020: member

Code review ACK 61c16339da4e80b1320a6296df6d96cd7a84bb4e (you have a misspelling in your first commit message though "SpliWalletFilePath")
promag commented at 5:27 PM on June 16, 2020: member

Yesterday I was reviewing #18971 and thought about splitting it, and this PR is exactly it.

Code review ACK 61c16339da4e80b1320a6296df6d96cd7a84bb4e.

nit, typo in first commit, if you have to push again for some other reason.
DrahtBot cross-referenced this on Jun 16, 2020 from issue Replace boost::filesystem with std::filesystem by kiminuo
fanquake requested review from meshcollider on Jun 17, 2020
meshcollider commented at 9:18 AM on June 17, 2020: contributor

utACK 61c16339da4e80b1320a6296df6d96cd7a84bb4e
meshcollider merged this on Jun 17, 2020
meshcollider closed this on Jun 17, 2020
ryanofsky commented at 1:16 PM on June 17, 2020: contributor

Code review ACK 61c16339da4e80b1320a6296df6d96cd7a84bb4e
MarcoFalke referenced this in commit c7ebab12f9 on Jun 18, 2020
Fabcien referenced this in commit de2751c110 on Dec 7, 2020
Fabcien referenced this in commit 8343f7b0d3 on Dec 7, 2020
Fabcien referenced this in commit 2b7b2154f8 on Dec 7, 2020
Fabcien referenced this in commit 7fc87af922 on Dec 7, 2020
Fabcien referenced this in commit bde8352066 on Dec 7, 2020
bitcoin locked this on Feb 15, 2022

Contributors

Labels

Linked (view graph)

#18971 wallet: Refactor the classes in wallet/db.{cpp/h}#19292 wallet: Refactor BerkeleyBatch Read, Write, Erase, and Exists functions into non-template functions

wallet: move BDB specific classes to bdb.{cpp/h} #19290

Conflicts