Page MenuHomePhabricator

[backport#17410] Rename `db` log category to `walletdb` (like `coindb`)
ClosedPublic

Authored by majcosta on Oct 1 2020, 14:45.

Details

Summary

e2c03c1156a1a8cb2c04c180f2ddbd3535126a46 doc: Add relase note for db→walletdb rename (Wladimir J. van der Laan)
4c1d263d93988ceed53e8f6b5decaf034b68137e scripted-diff: Change BCLog::DB to BCLog::WALLETDB (Wladimir J. van der Laan)
6b42b3ba9087225fddb91dd764c42c28d0c42d0f Rename db log category to walletdb (like coindb) (Wladimir J. van der Laan)

Pull request description:

Rename the `db` log category to `walletdb` (in the style of, and to distinguish from `coindb`). Deprecate (but still accept) '-debug=db'.

Second commit is a scripted commit that changes the enum item name.

Backport of Core PR17410

Test Plan
ninja check check-functional

Diff Detail

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

Event Timeline

majcosta requested review of this revision.Oct 1 2020, 14:45

[Bot Message]
One or more PR numbers were detected in the summary.
Links to those PRs have been inserted into the summary for reference.

Fabien added a subscriber: Fabien.
Fabien added inline comments.
doc/release-notes.md
14 ↗(On Diff #24138)

newline

src/logging.cpp
320 ↗(On Diff #24138)

0.22.3 => 0.22.4

This revision is now accepted and ready to land.Oct 1 2020, 15:02
This revision was landed with ongoing or failed builds.Oct 1 2020, 15:07
This revision was automatically updated to reflect the committed changes.

Snippet of first build failure:

[319/482] Building CXX object src/CMakeFiles/bitcoinconsensus.dir/consensus/tx_check.cpp.o
[320/482] Building CXX object src/CMakeFiles/script.dir/script/descriptor.cpp.o
[321/482] Building CXX object src/CMakeFiles/util.dir/util/error.cpp.o
[322/482] Building CXX object src/test/CMakeFiles/testutil.dir/util/transaction_utils.cpp.o
[323/482] Building CXX object src/test/CMakeFiles/testutil.dir/util/blockfilter.cpp.o
[324/482] Building CXX object src/test/CMakeFiles/testutil.dir/util/logging.cpp.o
[325/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/db.cpp.o
FAILED: src/wallet/CMakeFiles/wallet.dir/db.cpp.o 
/usr/bin/cmake -E __run_co_compile --launcher=/usr/bin/ccache --tidy="/usr/bin/clang-tidy-8;-warnings-as-errors=*" --source=../../src/wallet/db.cpp -- /usr/bin/clang++  -DBOOST_AC_USE_STD_ATOMIC -DBOOST_SP_USE_STD_ATOMIC -DBUILD_BITCOIN_INTERNAL -DENABLE_AVX2 -DENABLE_SHANI -DENABLE_SSE41 -DHAVE_BUILD_INFO -DHAVE_CONFIG_H -DHAVE_CONSENSUS_LIB -I../../src/. -Isrc -I../../src/univalue/include -Isrc/crypto/.. -I../../src/secp256k1/include -isystem /usr/include/jemalloc -g -O2 -fPIC -fvisibility=hidden   -fstack-protector-all -Wstack-protector -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wall -Wextra -Wformat -Wvla -Wcast-align -Wunused-parameter -Wmissing-braces -Wthread-safety-analysis -Wshadow -Wshadow-field -Wrange-loop-analysis -Wredundant-decls -Wformat-security -Wredundant-move -Wno-unused-parameter -Wno-implicit-fallthrough -pthread -std=gnu++14 -MD -MT src/wallet/CMakeFiles/wallet.dir/db.cpp.o -MF src/wallet/CMakeFiles/wallet.dir/db.cpp.o.d -o src/wallet/CMakeFiles/wallet.dir/db.cpp.o -c ../../src/wallet/db.cpp
/work/abc-ci-builds/build-clang-tidy/../../src/wallet/db.cpp:869:30: error: statement should be inside braces [readability-braces-around-statements,-warnings-as-errors]
                if (!fMockDb) dbenv->lsn_reset(strFile.c_str(), 0);
                             ^
                              {
2458 warnings generated.
Suppressed 2457 warnings (2457 in non-user code).
Use -header-filter=.* to display errors from all non-system headers. Use -system-headers to display errors from system headers as well.
1 warning treated as error
[326/482] Building CXX object src/CMakeFiles/util.dir/util/time.cpp.o
[327/482] Building CXX object src/CMakeFiles/bitcoin-tx.dir/bitcoin-tx.cpp.o
[328/482] Building CXX object src/CMakeFiles/server.dir/validation.cpp.o
[329/482] Building CXX object src/test/CMakeFiles/testutil.dir/util/mining.cpp.o
[330/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/coincontrol.cpp.o
[331/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/crypter.cpp.o
[332/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/coinselection.cpp.o
[333/482] Building CXX object src/test/CMakeFiles/testutil.dir/util/wallet.cpp.o
[334/482] Building CXX object src/CMakeFiles/util.dir/util/system.cpp.o
[335/482] Linking CXX static library src/libutil.a
[336/482] Linking CXX static library src/libscript.a
[337/482] Building CXX object src/zmq/CMakeFiles/zmq.dir/zmqabstractnotifier.cpp.o
[338/482] Linking CXX static library src/librpcclient.a
[339/482] Linking CXX static library src/libcommon.a
[340/482] Linking CXX executable src/bitcoin-cli
[341/482] Linking CXX static library src/libbitcoinconsensus.a
[342/482] Linking CXX shared library src/libbitcoinconsensus.so.0.22.4
[343/482] Creating library symlink src/libbitcoinconsensus.so.0 src/libbitcoinconsensus.so
[344/482] Linking CXX executable src/bitcoin-tx
[345/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/fees.cpp.o
[346/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletutil.cpp.o
[347/482] Building CXX object src/wallet/CMakeFiles/wallet-tool.dir/wallettool.cpp.o
[348/482] Building CXX object src/test/CMakeFiles/testutil.dir/util/setup_common.cpp.o
[349/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/psbtwallet.cpp.o
[350/482] Building CXX object src/seeder/CMakeFiles/seeder.dir/bitcoin.cpp.o
[351/482] Building CXX object src/seeder/CMakeFiles/seeder.dir/db.cpp.o
[352/482] Building CXX object src/seeder/CMakeFiles/seeder.dir/dns.cpp.o
[353/482] Linking CXX static library src/seeder/libseeder.a
[354/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/load.cpp.o
[355/482] Building CXX object src/zmq/CMakeFiles/zmq.dir/zmqnotificationinterface.cpp.o
[356/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/__/interfaces/wallet.cpp.o
[357/482] Building CXX object src/zmq/CMakeFiles/zmq.dir/zmqpublishnotifier.cpp.o
[358/482] Building CXX object src/zmq/CMakeFiles/zmq.dir/zmqrpc.cpp.o
[359/482] Linking CXX static library src/zmq/libzmq.a
[360/482] Building CXX object src/seeder/CMakeFiles/bitcoin-seeder.dir/main.cpp.o
[361/482] Linking CXX executable src/seeder/bitcoin-seeder
[362/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/walletdb.cpp.o
[363/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/scriptpubkeyman.cpp.o
[364/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcdump.cpp.o
[365/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/wallet.cpp.o
[366/482] Building CXX object src/wallet/CMakeFiles/wallet.dir/rpcwallet.cpp.o
ninja: build stopped: cannot make progress due to previous errors.
Build build-clang-tidy failed with exit code 1

Snippet of first build failure:

[348/409] Running utility command for check-bitcoin-checkdatasig_tests
[349/409] bitcoin: testing settings_tests
[350/409] bitcoin: testing checkqueue_tests
[351/409] bitcoin: testing streams_tests
[352/409] bitcoin: testing timedata_tests
[353/409] Running utility command for check-bitcoin-settings_tests
[354/409] Running utility command for check-bitcoin-checkqueue_tests
[355/409] Running utility command for check-bitcoin-streams_tests
[356/409] Running utility command for check-bitcoin-timedata_tests
[357/409] bitcoin: testing undo_tests
[358/409] bitcoin: testing uint256_tests
[359/409] Running utility command for check-bitcoin-undo_tests
[360/409] Running utility command for check-bitcoin-uint256_tests
[361/409] bitcoin: testing walletdb_tests
[362/409] bitcoin: testing sigencoding_tests
[363/409] Running utility command for check-bitcoin-sigencoding_tests
[364/409] Running utility command for check-bitcoin-walletdb_tests
[365/409] bitcoin: testing serialize_tests
[366/409] Running utility command for check-bitcoin-serialize_tests
[367/409] bitcoin: testing util_threadnames_tests
[368/409] Running utility command for check-bitcoin-util_threadnames_tests
[369/409] bitcoin: testing script_standard_tests
[370/409] bitcoin: testing blockcheck_tests
[371/409] Running utility command for check-bitcoin-script_standard_tests
[372/409] Running utility command for check-bitcoin-blockcheck_tests
[373/409] bitcoin: testing radix_tests
[374/409] bitcoin: testing blockstatus_tests
[375/409] Running utility command for check-bitcoin-radix_tests
[376/409] Running utility command for check-bitcoin-blockstatus_tests
[377/409] bitcoin: testing crypto_tests
[378/409] Running utility command for check-bitcoin-crypto_tests
[379/409] bitcoin: testing ismine_tests
[380/409] bitcoin: testing versionbits_tests
[381/409] Running utility command for check-bitcoin-ismine_tests
[382/409] Running utility command for check-bitcoin-versionbits_tests
[383/409] bitcoin: testing cashaddr_tests
[384/409] bitcoin: testing getarg_tests
[385/409] Running utility command for check-bitcoin-cashaddr_tests
[386/409] Running utility command for check-bitcoin-getarg_tests
[387/409] bitcoin: testing validation_block_tests
[388/409] bitcoin: testing bswap_tests
[389/409] Running utility command for check-bitcoin-validation_block_tests
[390/409] Running utility command for check-bitcoin-bswap_tests
[391/409] bitcoin: testing script_tests
[392/409] bitcoin: testing validation_tests
[393/409] Running utility command for check-bitcoin-script_tests
[394/409] Running utility command for check-bitcoin-validation_tests
[395/409] bitcoin: testing skiplist_tests
[396/409] Running utility command for check-bitcoin-skiplist_tests
[397/409] bitcoin: testing util_tests
[398/409] Running utility command for check-bitcoin-util_tests
[399/409] bitcoin: testing op_reversebytes_tests
[400/409] Running utility command for check-bitcoin-op_reversebytes_tests
[401/409] bitcoin: testing cuckoocache_tests
[402/409] Running utility command for check-bitcoin-cuckoocache_tests
[403/409] bitcoin: testing coins_tests
[404/409] Running utility command for check-bitcoin-coins_tests
[405/409] bitcoin: testing transaction_tests
[406/409] Running utility command for check-bitcoin-transaction_tests
Build build-clang timed out after 1200.0s