From 0868c85fd576a34355539da037f99f2c41639cad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C5=91rinc?= Date: Tue, 23 Jun 2026 15:40:05 -0700 Subject: [PATCH] refactor: rename async coin compaction Rename the `CCoinsViewDB` async compaction wrapper to `CompactFullAsync()` so it is distinct from the blocking `CDBWrapper::CompactFull()` primitive it calls. --- src/test/coins_tests.cpp | 2 +- src/txdb.cpp | 2 +- src/txdb.h | 2 +- src/validation.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/test/coins_tests.cpp b/src/test/coins_tests.cpp index 3487a1789da..6ae5f2b7cbc 100644 --- a/src/test/coins_tests.cpp +++ b/src/test/coins_tests.cpp @@ -1078,7 +1078,7 @@ BOOST_FIXTURE_TEST_CASE(coins_db_leveldb_layout, FlushTest) cache.Sync(); BOOST_CHECK_EQUAL(level2_files(base), 0); - WITH_LOCK(::cs_main, return base.CompactFull()).wait(); + WITH_LOCK(::cs_main, return base.CompactFullAsync()).wait(); BOOST_CHECK_EQUAL(level2_files(base), 1); BOOST_CHECK(*Assert(base.GetCoin(outpoint)) == coin); diff --git a/src/txdb.cpp b/src/txdb.cpp index 632c554cd03..8ea0407bac1 100644 --- a/src/txdb.cpp +++ b/src/txdb.cpp @@ -195,7 +195,7 @@ std::optional CCoinsViewDB::GetDBProperty(const std::string& proper return m_db->GetProperty(property); } -std::shared_future CCoinsViewDB::CompactFull() +std::shared_future CCoinsViewDB::CompactFullAsync() { AssertLockHeld(::cs_main); if (m_compaction.valid() && m_compaction.wait_for(std::chrono::seconds{0}) != std::future_status::ready) return m_compaction; diff --git a/src/txdb.h b/src/txdb.h index e89864213e0..8d4e2cc8271 100644 --- a/src/txdb.h +++ b/src/txdb.h @@ -62,7 +62,7 @@ public: void ResizeCache(size_t new_cache_size) EXCLUSIVE_LOCKS_REQUIRED(cs_main, !m_db_mutex); //! Perform a full compaction of the underlying LevelDB on a one-shot background thread. - std::shared_future CompactFull() EXCLUSIVE_LOCKS_REQUIRED(cs_main, !m_db_mutex); + std::shared_future CompactFullAsync() EXCLUSIVE_LOCKS_REQUIRED(cs_main, !m_db_mutex); //! Return an underlying LevelDB property value, if available. std::optional GetDBProperty(const std::string& property); diff --git a/src/validation.cpp b/src/validation.cpp index d3f832f41e9..87cf646b8b9 100644 --- a/src/validation.cpp +++ b/src/validation.cpp @@ -2840,7 +2840,7 @@ bool Chainstate::FlushStateToDisk( if (!m_chainman.m_interrupt && ShouldCompactChainstate(m_chainman.IsInitialBlockDownload())) { try { - CoinsDB().CompactFull(); + CoinsDB().CompactFullAsync(); } catch (const std::exception& e) { LogWarning("Failed to start chainstate compaction (%s)", e.what()); }