-
Notifications
You must be signed in to change notification settings - Fork 37.7k
Minor changes to dbwrapper to simplify support for other databases #7927
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
Minor changes to dbwrapper to simplify support for other databases #7927
Conversation
Using throw() specifications in function signatures is not only not required in C++, it is considered deprecated for [various reasons](https://stackoverflow.com/questions/1055387/throw-keyword-in-functions-signature). It is not implemented by any of the common C++ compilers. The usage is also inconsistent with the rest of the source code.
It is an unnecessary method as it is used only two times and only internally, and the whole implementation is HexStr(obfuscate_key).
Pass parent wrapper directly instead of obfuscation key. This makes it possible for other databases which re-use this code to use other properties from the database. Add a namespace dbwrapper_private for private functions to be used only in dbwrapper.h/cpp and dbwrapper_tests.
HandleError is implementation-specific.
utACK 869cf12 |
utACK 869cf12 |
Tested ACK 869cf12 |
ACK 869cf12
but it is not for this PR. |
utACK 869cf12 |
utACK |
Thanks for mentioning, although I think these are of a different class. They use |
… databases 869cf12 dbwrapper: Move `HandleError` to `dbwrapper_private` (Wladimir J. van der Laan) b69836d dbwrapper: Pass parent CDBWrapper into CDBBatch and CDBIterator (Wladimir J. van der Laan) 878bf48 dbwrapper: Remove CDBWrapper::GetObfuscateKeyHex (Wladimir J. van der Laan) 74f7b12 dbwrapper: Remove throw keywords in function signatures (Wladimir J. van der Laan)
…r other databases 869cf12 dbwrapper: Move `HandleError` to `dbwrapper_private` (Wladimir J. van der Laan) b69836d dbwrapper: Pass parent CDBWrapper into CDBBatch and CDBIterator (Wladimir J. van der Laan) 878bf48 dbwrapper: Remove CDBWrapper::GetObfuscateKeyHex (Wladimir J. van der Laan) 74f7b12 dbwrapper: Remove throw keywords in function signatures (Wladimir J. van der Laan)
Bitcoin 0.12+ dbwrapper improvements Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6650 - Only refactor - excludes obfuscation - bitcoin/bitcoin#6777 - Excluding obfuscation-related changes - bitcoin/bitcoin#6865 - bitcoin/bitcoin#6823 - bitcoin/bitcoin#6873 - bitcoin/bitcoin#7927 - Excluding first commit (already included) and second commit (obfuscation-related) - bitcoin/bitcoin#8467 Part of #2074.
Bitcoin 0.12+ dbwrapper improvements Cherry-picked from the following upstream PRs: - bitcoin/bitcoin#6650 - Only refactor - excludes obfuscation - bitcoin/bitcoin#6777 - Excluding obfuscation-related changes - bitcoin/bitcoin#6865 - bitcoin/bitcoin#6823 - bitcoin/bitcoin#6873 - bitcoin/bitcoin#7927 - Excluding first commit (already included) and second commit (obfuscation-related) - bitcoin/bitcoin#8467 Part of #2074.
82f9088 Refactor: Remove using namespace <xxx> from /dbwrapper_tests (random-zebra) 6db0b37 rpc: make `gettxoutsettinfo` run lock-free (random-zebra) f009cf4 Do not shadow members in dbwrapper (random-zebra) b7e540c dbwrapper: Move `HandleError` to `dbwrapper_private` (random-zebra) 43004d0 leveldbwrapper file rename to dbwrapper.* (random-zebra) c882dd9 leveldbwrapper symbol rename: Remove "Level" from class, etc. names (random-zebra) f6496da leveldbwrapper: Remove unused .Prev(), .SeekToLast() methods (random-zebra) cacf3c2 Fix chainstate serialized_size computation (random-zebra) a2a3d33 Add tests for CLevelDBBatch, CLevelDBIterator (random-zebra) 94150ac Encapsulate CLevelDB iterators cleanly (random-zebra) 21df7cc [DB] Refactor leveldbwrapper (random-zebra) 2251db3 change hardcoded character constants to a set of descriptive named co… (random-zebra) Pull request description: This backports a series of updates and cleanups to the LevelDB wrapper from: - bitcoin#5707 - bitcoin#6650 [`*`] - bitcoin#6777 [`*`] - bitcoin#6865 - bitcoin#6873 - bitcoin#7927 [`*`] - bitcoin#8467 - bitcoin#6290 - bitcoin#9281 PIVX-specific edits were required to keep the sporks and zerocoin databases in line. [`*`] NOTE: excluding the obfuscation of databases by xoring data, as we might not want this feature (e.g. as zcash/zcash#2598). Otherwise it can be discussed, and added, with a separate PR. ACKs for top commit: furszy: Re ACK 82f9088 . Fuzzbawls: ACK 82f9088 Tree-SHA512: 1e4a75621d2ec2eb68e01523d15321d1d2176b81aac0525617852899ab38c9b4980daecb9056d054e7961fc758a22143edf914c40d1819144a394f2869a8ad57
During my experiment with using LMDB as database I came across these database-agnostic changes to dbwrapper which make it easier to support other databases, or are small common-sense (I think) cleanups at most:
GetObfuscateKeyHex
- It is an unnecessary method as it is used only two times and only internally, and the whole implementation isHexStr(obfuscate_key)
.throw
keywords in function signatures - Using throw() specifications in function signatures is not only not required in C++, it is considered deprecated for various reasons. It is not implemented by any of the common C++ compilers. Their usage is also inconsistent with the rest of the source code.