Skip to content

Optimize verticalization. #850

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.

Sign up for GitHub

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

Merged
evoskuil merged 19 commits into from
Jul 8, 2026
Merged

Optimize verticalization. #850

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
27c56be
Fix disk full space handling across mmaps.
evoskuil Jul 1, 2026
ac1b6ac
Line length (style).
evoskuil Jul 1, 2026
edf9a2c
Rename to_bytes() to to_width().
evoskuil Jul 1, 2026
0a658bd
Style, comments.
evoskuil Jul 2, 2026
0cdfb5d
Add get_at(col) to storage interface, simplify mmap.
evoskuil Jul 2, 2026
a8c89d7
Integrate SoA single lock tables.
evoskuil Jul 5, 2026
6312c17
Fix macos mmap flaws and regressions.
evoskuil Jul 7, 2026
c9f3045
mmap regression fixes, macos.
evoskuil Jul 7, 2026
9a6c78e
Instrument test diagnostic.
evoskuil Jul 7, 2026
f45f05d
Fix regression in capacity sizing.
evoskuil Jul 7, 2026
9b0f615
Style, comments.
evoskuil Jul 7, 2026
a94a24c
Delint, comments.
evoskuil Jul 7, 2026
eadc882
Fix rebase drift.
evoskuil Jul 7, 2026
a5599d8
Remove diagnostic probes.
evoskuil Jul 7, 2026
b5eba37
Style, comments.
evoskuil Jul 7, 2026
d0b98c6
Add multicolumn mmap test.
evoskuil Jul 7, 2026
8dd8162
Fix mmap leaks on store failure paths.
evoskuil Jul 7, 2026
e532adb
Fix allocating silent table in schnorr query.
evoskuil Jul 7, 2026
ee0e8ff
Remove dead code.
evoskuil Jul 7, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 33 additions & 32 deletions builds/gnu/Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ include_bitcoin_database_impl_primitives_HEADERS = \
${srcdir}/../../include/bitcoin/database/impl/primitives/linkage.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/manager.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/nohead.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/nomap.ipp
${srcdir}/../../include/bitcoin/database/impl/primitives/nomap.ipp \
${srcdir}/../../include/bitcoin/database/impl/primitives/nomaps.ipp

include_bitcoin_database_impl_querydir = \
${includedir}/bitcoin/database/impl/query
Expand Down Expand Up @@ -149,6 +150,15 @@ include_bitcoin_database_impl_query_archive_HEADERS = \
${srcdir}/../../include/bitcoin/database/impl/query/archive/wire_reader.ipp \
${srcdir}/../../include/bitcoin/database/impl/query/archive/wire_writer.ipp

include_bitcoin_database_impl_query_batchdir = \
${includedir}/bitcoin/database/impl/query/batch

include_bitcoin_database_impl_query_batch_HEADERS = \
${srcdir}/../../include/bitcoin/database/impl/query/batch/ecdsa.ipp \
${srcdir}/../../include/bitcoin/database/impl/query/batch/prevalid.ipp \
${srcdir}/../../include/bitcoin/database/impl/query/batch/schnorr.ipp \
${srcdir}/../../include/bitcoin/database/impl/query/batch/silent.ipp

include_bitcoin_database_impl_query_consensusdir = \
${includedir}/bitcoin/database/impl/query/consensus

Expand All @@ -174,15 +184,6 @@ include_bitcoin_database_impl_query_navigate_HEADERS = \
${srcdir}/../../include/bitcoin/database/impl/query/navigate/navigate_natural.ipp \
${srcdir}/../../include/bitcoin/database/impl/query/navigate/navigate_reverse.ipp

include_bitcoin_database_impl_query_batchdir = \
${includedir}/bitcoin/database/impl/query/batch

include_bitcoin_database_impl_query_batch_HEADERS = \
${srcdir}/../../include/bitcoin/database/impl/query/batch/ecdsa.ipp \
${srcdir}/../../include/bitcoin/database/impl/query/batch/prevalid.ipp \
${srcdir}/../../include/bitcoin/database/impl/query/batch/schnorr.ipp \
${srcdir}/../../include/bitcoin/database/impl/query/batch/silent.ipp

include_bitcoin_database_impl_storedir = \
${includedir}/bitcoin/database/impl/store

Expand Down Expand Up @@ -218,10 +219,10 @@ include_bitcoin_database_memorydir = \
include_bitcoin_database_memory_HEADERS = \
${srcdir}/../../include/bitcoin/database/memory/accessor.hpp \
${srcdir}/../../include/bitcoin/database/memory/finalizer.hpp \
${srcdir}/../../include/bitcoin/database/memory/maps.hpp \
${srcdir}/../../include/bitcoin/database/memory/memory.hpp \
${srcdir}/../../include/bitcoin/database/memory/mman.hpp \
${srcdir}/../../include/bitcoin/database/memory/mmap.hpp \
${srcdir}/../../include/bitcoin/database/memory/mmaps.hpp \
${srcdir}/../../include/bitcoin/database/memory/reader.hpp \
${srcdir}/../../include/bitcoin/database/memory/streamers.hpp \
${srcdir}/../../include/bitcoin/database/memory/utilities.hpp
Expand All @@ -239,6 +240,7 @@ include_bitcoin_database_primitivesdir = \
include_bitcoin_database_primitives_HEADERS = \
${srcdir}/../../include/bitcoin/database/primitives/arrayhead.hpp \
${srcdir}/../../include/bitcoin/database/primitives/arraymap.hpp \
${srcdir}/../../include/bitcoin/database/primitives/column.hpp \
${srcdir}/../../include/bitcoin/database/primitives/hashhead.hpp \
${srcdir}/../../include/bitcoin/database/primitives/hashmap.hpp \
${srcdir}/../../include/bitcoin/database/primitives/iterator.hpp \
Expand Down Expand Up @@ -359,7 +361,6 @@ test_libbitcoin_database_test_SOURCES = \
${srcdir}/../../test/memory/mmap.cpp \
${srcdir}/../../test/memory/utilities.cpp \
${srcdir}/../../test/mocks/blocks.cpp \
${srcdir}/../../test/mocks/chunk_storage.cpp \
${srcdir}/../../test/primitives/arrayhead.cpp \
${srcdir}/../../test/primitives/arraymap.cpp \
${srcdir}/../../test/primitives/hashhead.cpp \
Expand Down Expand Up @@ -391,6 +392,10 @@ test_libbitcoin_database_test_SOURCES = \
${srcdir}/../../test/query/archive/chain_writer.cpp \
${srcdir}/../../test/query/archive/wire_reader.cpp \
${srcdir}/../../test/query/archive/wire_writer.cpp \
${srcdir}/../../test/query/batch/ecdsa.cpp \
${srcdir}/../../test/query/batch/prevalid.cpp \
${srcdir}/../../test/query/batch/schnorr.cpp \
${srcdir}/../../test/query/batch/silent.cpp \
${srcdir}/../../test/query/consensus/consensus_block.cpp \
${srcdir}/../../test/query/consensus/consensus_chain_state.cpp \
${srcdir}/../../test/query/consensus/consensus_compact.cpp \
Expand All @@ -406,10 +411,21 @@ test_libbitcoin_database_test_SOURCES = \
${srcdir}/../../test/query/navigate/navigate_hashmap.cpp \
${srcdir}/../../test/query/navigate/navigate_natural.cpp \
${srcdir}/../../test/query/navigate/navigate_reverse.cpp \
${srcdir}/../../test/query/batch/ecdsa.cpp \
${srcdir}/../../test/query/batch/prevalid.cpp \
${srcdir}/../../test/query/batch/schnorr.cpp \
${srcdir}/../../test/query/batch/silent.cpp \
${srcdir}/../../test/store/store.cpp \
${srcdir}/../../test/store/store_backup.cpp \
${srcdir}/../../test/store/store_close.cpp \
${srcdir}/../../test/store/store_create.cpp \
${srcdir}/../../test/store/store_dump.cpp \
${srcdir}/../../test/store/store_events.cpp \
${srcdir}/../../test/store/store_open.cpp \
${srcdir}/../../test/store/store_open_load.cpp \
${srcdir}/../../test/store/store_prune.cpp \
${srcdir}/../../test/store/store_reload.cpp \
${srcdir}/../../test/store/store_report.cpp \
${srcdir}/../../test/store/store_restore.cpp \
${srcdir}/../../test/store/store_snapshot.cpp \
${srcdir}/../../test/store/store_tables.cpp \
${srcdir}/../../test/store/store_unload_close.cpp \
${srcdir}/../../test/tables/archives/header.cpp \
${srcdir}/../../test/tables/archives/input.cpp \
${srcdir}/../../test/tables/archives/ins.cpp \
Expand All @@ -433,22 +449,7 @@ test_libbitcoin_database_test_SOURCES = \
${srcdir}/../../test/tables/optional/filter_tx.cpp \
${srcdir}/../../test/types/history.cpp \
${srcdir}/../../test/types/span.cpp \
${srcdir}/../../test/types/unspent.cpp \
${srcdir}/../../test/store/store.cpp \
${srcdir}/../../test/store/store_backup.cpp \
${srcdir}/../../test/store/store_close.cpp \
${srcdir}/../../test/store/store_create.cpp \
${srcdir}/../../test/store/store_dump.cpp \
${srcdir}/../../test/store/store_events.cpp \
${srcdir}/../../test/store/store_open.cpp \
${srcdir}/../../test/store/store_open_load.cpp \
${srcdir}/../../test/store/store_prune.cpp \
${srcdir}/../../test/store/store_reload.cpp \
${srcdir}/../../test/store/store_report.cpp \
${srcdir}/../../test/store/store_restore.cpp \
${srcdir}/../../test/store/store_snapshot.cpp \
${srcdir}/../../test/store/store_tables.cpp \
${srcdir}/../../test/store/store_unload_close.cpp
${srcdir}/../../test/types/unspent.cpp

TESTS = test_runner.sh

Expand Down
1 change: 0 additions & 1 deletion builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@
<ObjectFileName>$(IntDir)test_memory_utilities.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\..\..\test\mocks\blocks.cpp" />
<ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\arrayhead.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\hashhead.cpp" />
Expand Down
3 changes: 0 additions & 3 deletions builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@
<ClCompile Include="..\..\..\..\test\mocks\blocks.cpp">
<Filter>src\mocks</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp">
<Filter>src\mocks</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\arrayhead.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
Expand Down
4 changes: 3 additions & 1 deletion builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,16 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\finalizer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\memory.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\storage.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\maps.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\memory.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mman.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mmap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mmaps.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\reader.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\streamers.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\utilities.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arrayhead.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\column.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashhead.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\iterator.hpp" />
Expand Down Expand Up @@ -236,6 +237,7 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\manager.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nohead.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomap.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomaps.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\query\address\address_balance.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\query\address\address_history.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\query\address\address_outpoints.ipp" />
Expand Down
12 changes: 9 additions & 3 deletions builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\storage.hpp">
<Filter>include\bitcoin\database\memory\interfaces</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\maps.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\memory.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
Expand All @@ -194,6 +191,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mmap.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mmaps.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\reader.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
Expand All @@ -209,6 +209,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\column.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashhead.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
Expand Down Expand Up @@ -421,6 +424,9 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomap.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomaps.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\query\address\address_balance.ipp">
<Filter>include\bitcoin\database\impl\query\address</Filter>
</None>
Expand Down
1 change: 0 additions & 1 deletion builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,6 @@
<ObjectFileName>$(IntDir)test_memory_utilities.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\..\..\test\mocks\blocks.cpp" />
<ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\arrayhead.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\hashhead.cpp" />
Expand Down
3 changes: 0 additions & 3 deletions builds/msvc/vs2026/libbitcoin-database-test/libbitcoin-database-test.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,9 +99,6 @@
<ClCompile Include="..\..\..\..\test\mocks\blocks.cpp">
<Filter>src\mocks</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp">
<Filter>src\mocks</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\arrayhead.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
Expand Down
4 changes: 3 additions & 1 deletion builds/msvc/vs2026/libbitcoin-database/libbitcoin-database.vcxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,15 +155,16 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\finalizer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\memory.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\storage.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\maps.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\memory.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mman.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mmap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mmaps.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\reader.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\streamers.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\utilities.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arrayhead.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\column.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashhead.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\iterator.hpp" />
Expand Down Expand Up @@ -236,6 +237,7 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\manager.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nohead.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomap.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomaps.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\query\address\address_balance.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\query\address\address_history.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\query\address\address_outpoints.ipp" />
Expand Down
12 changes: 9 additions & 3 deletions builds/msvc/vs2026/libbitcoin-database/libbitcoin-database.vcxproj.filters
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,9 +182,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\storage.hpp">
<Filter>include\bitcoin\database\memory\interfaces</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\maps.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\memory.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
Expand All @@ -194,6 +191,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mmap.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\mmaps.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\reader.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
Expand All @@ -209,6 +209,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\column.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashhead.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
Expand Down Expand Up @@ -421,6 +424,9 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomap.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomaps.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\query\address\address_balance.ipp">
<Filter>include\bitcoin\database\impl\query\address</Filter>
</None>
Expand Down
3 changes: 2 additions & 1 deletion include/bitcoin/database.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,18 @@
#include <bitcoin/database/locks/locks.hpp>
#include <bitcoin/database/memory/accessor.hpp>
#include <bitcoin/database/memory/finalizer.hpp>
#include <bitcoin/database/memory/maps.hpp>
#include <bitcoin/database/memory/memory.hpp>
#include <bitcoin/database/memory/mman.hpp>
#include <bitcoin/database/memory/mmap.hpp>
#include <bitcoin/database/memory/mmaps.hpp>
#include <bitcoin/database/memory/reader.hpp>
#include <bitcoin/database/memory/streamers.hpp>
#include <bitcoin/database/memory/utilities.hpp>
#include <bitcoin/database/memory/interfaces/memory.hpp>
#include <bitcoin/database/memory/interfaces/storage.hpp>
#include <bitcoin/database/primitives/arrayhead.hpp>
#include <bitcoin/database/primitives/arraymap.hpp>
#include <bitcoin/database/primitives/column.hpp>
#include <bitcoin/database/primitives/hashhead.hpp>
#include <bitcoin/database/primitives/hashmap.hpp>
#include <bitcoin/database/primitives/iterator.hpp>
Expand Down
35 changes: 14 additions & 21 deletions include/bitcoin/database/impl/memory/mmap.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ namespace database {
TEMPLATE
CLASS::mmap(const path& filename, size_t minimum, size_t expansion,
bool random) NOEXCEPT
requires (columns == one)
requires (is_one(columns))
: filenames_{ filename },
minimum_(minimum),
minimum_(to_rows(minimum)),
expansion_(expansion),
random_(random),
opened_{ file::invalid }
Expand All @@ -48,7 +48,7 @@ CLASS::mmap(const paths& filenames, size_t minimum, size_t expansion,
bool random) NOEXCEPT
requires (columns > one)
: filenames_(filenames),
minimum_(minimum),
minimum_(to_rows(minimum)),
expansion_(expansion),
random_(random),
opened_{}
Expand All @@ -59,17 +59,13 @@ CLASS::mmap(const paths& filenames, size_t minimum, size_t expansion,
TEMPLATE
CLASS::~mmap() NOEXCEPT
{
BC_ASSERT_MSG(!loaded_, "...");
BC_ASSERT_MSG(is_zero(logical_), "...");

BC_ASSERT_MSG(std::ranges::all_of(memory_map_,
[](auto map) NOEXCEPT { return is_null(map); }), "...");

BC_ASSERT_MSG(std::ranges::all_of(capacity_,
[](auto closed) NOEXCEPT { return is_zero(closed); }), "...");

BC_ASSERT_MSG(std::ranges::all_of(opened_,
[](auto opened) NOEXCEPT { return opened == file::invalid; }), "...");
BC_ASSERT(!loaded_);
BC_ASSERT(is_zero(logical_));
BC_ASSERT(is_zero(capacity_));
BC_ASSERT(std::ranges::all_of(memory_map_,
[](auto map) NOEXCEPT { return is_null(map); }));
BC_ASSERT(std::ranges::all_of(opened_,
[](auto opened) NOEXCEPT { return opened == file::invalid; }));
}

TEMPLATE
Expand All @@ -92,13 +88,10 @@ bool CLASS::is_loaded() const NOEXCEPT
TEMPLATE
size_t CLASS::to_capacity(size_t required) const NOEXCEPT
{
BC_PUSH_WARNING(NO_STATIC_CAST)
const auto resize = required * ((expansion_ + 100.0) / 100.0);
const auto target = std::max(minimum_, static_cast<size_t>(resize));
BC_POP_WARNING()

BC_ASSERT(target >= required);
return target;
// Covert required rows to capacity-padded rows.
using namespace system;
const auto growth = ceilinged_multiply(required, expansion_) / 100u;
return std::max(minimum_, ceilinged_add(required, growth));
}

// Read-write protected by atomic, write-write protected by remap_mutex.
Expand Down
Loading
Loading