Skip to content

Update storage interface, impl, test to support dynamic head. #531

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 10 commits into from
Jan 8, 2025
Merged

Update storage interface, impl, test to support dynamic head. #531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
c44e827
Move and rename table files and their tests.
evoskuil Jan 6, 2025
f91d721
Style.
evoskuil Jan 6, 2025
b2ea049
Update storage interface, impl, test to support dynamic head.
evoskuil Jan 7, 2025
5871dcf
Comment typo.
evoskuil Jan 7, 2025
ac16458
Style.
evoskuil Jan 7, 2025
7b36d15
Add hashmap2 and head2 with tests (to be renamed).
evoskuil Jan 7, 2025
563f734
Regenerate artifacts.
evoskuil Jan 7, 2025
5f140df
Delint.
evoskuil Jan 7, 2025
ecb35cc
Backfill to logical on set() head expand.
evoskuil Jan 7, 2025
c322741
Comments.
evoskuil Jan 7, 2025
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
20 changes: 13 additions & 7 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,9 @@ test_libbitcoin_database_test_SOURCES = \
test/mocks/map_store.hpp \
test/primitives/arraymap.cpp \
test/primitives/hashmap.cpp \
test/primitives/hashmap2.cpp \
test/primitives/head.cpp \
test/primitives/head2.cpp \
test/primitives/iterator.cpp \
test/primitives/linkage.cpp \
test/primitives/manager.cpp \
Expand All @@ -95,17 +97,17 @@ test_libbitcoin_database_test_SOURCES = \
test/tables/archives/output.cpp \
test/tables/archives/point.cpp \
test/tables/archives/puts.cpp \
test/tables/archives/spend.cpp \
test/tables/archives/transaction.cpp \
test/tables/archives/txs.cpp \
test/tables/caches/bootstrap.cpp \
test/tables/caches/buffer.cpp \
test/tables/caches/neutrino.cpp \
test/tables/caches/prevouts.cpp \
test/tables/caches/validated_bk.cpp \
test/tables/caches/validated_tx.cpp \
test/tables/indexes/address.cpp \
test/tables/indexes/height.cpp \
test/tables/indexes/spend.cpp \
test/tables/indexes/strong_tx.cpp
test/tables/indexes/strong_tx.cpp \
test/tables/optional/address.cpp \
test/tables/optional/bootstrap.cpp \
test/tables/optional/neutrino.cpp

endif WITH_TESTS

Expand Down Expand Up @@ -159,7 +161,9 @@ include_bitcoin_database_impl_primitivesdir = ${includedir}/bitcoin/database/imp
include_bitcoin_database_impl_primitives_HEADERS = \
include/bitcoin/database/impl/primitives/arraymap.ipp \
include/bitcoin/database/impl/primitives/hashmap.ipp \
include/bitcoin/database/impl/primitives/hashmap2.ipp \
include/bitcoin/database/impl/primitives/head.ipp \
include/bitcoin/database/impl/primitives/head2.ipp \
include/bitcoin/database/impl/primitives/iterator.ipp \
include/bitcoin/database/impl/primitives/linkage.ipp \
include/bitcoin/database/impl/primitives/manager.ipp
Expand Down Expand Up @@ -204,7 +208,9 @@ include_bitcoin_database_primitivesdir = ${includedir}/bitcoin/database/primitiv
include_bitcoin_database_primitives_HEADERS = \
include/bitcoin/database/primitives/arraymap.hpp \
include/bitcoin/database/primitives/hashmap.hpp \
include/bitcoin/database/primitives/hashmap2.hpp \
include/bitcoin/database/primitives/head.hpp \
include/bitcoin/database/primitives/head2.hpp \
include/bitcoin/database/primitives/iterator.hpp \
include/bitcoin/database/primitives/linkage.hpp \
include/bitcoin/database/primitives/manager.hpp \
Expand All @@ -231,6 +237,7 @@ include_bitcoin_database_tables_archives_HEADERS = \

include_bitcoin_database_tables_cachesdir = ${includedir}/bitcoin/database/tables/caches
include_bitcoin_database_tables_caches_HEADERS = \
include/bitcoin/database/tables/caches/prevouts.hpp \
include/bitcoin/database/tables/caches/validated_bk.hpp \
include/bitcoin/database/tables/caches/validated_tx.hpp

Expand All @@ -243,7 +250,6 @@ include_bitcoin_database_tables_optionalsdir = ${includedir}/bitcoin/database/ta
include_bitcoin_database_tables_optionals_HEADERS = \
include/bitcoin/database/tables/optionals/address.hpp \
include/bitcoin/database/tables/optionals/bootstrap.hpp \
include/bitcoin/database/tables/optionals/buffer.hpp \
include/bitcoin/database/tables/optionals/neutrino.hpp


Expand Down
14 changes: 8 additions & 6 deletions builds/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,7 +286,9 @@ if (with-tests)
"../../test/mocks/map_store.hpp"
"../../test/primitives/arraymap.cpp"
"../../test/primitives/hashmap.cpp"
"../../test/primitives/hashmap2.cpp"
"../../test/primitives/head.cpp"
"../../test/primitives/head2.cpp"
"../../test/primitives/iterator.cpp"
"../../test/primitives/linkage.cpp"
"../../test/primitives/manager.cpp"
Expand All @@ -303,17 +305,17 @@ if (with-tests)
"../../test/tables/archives/output.cpp"
"../../test/tables/archives/point.cpp"
"../../test/tables/archives/puts.cpp"
"../../test/tables/archives/spend.cpp"
"../../test/tables/archives/transaction.cpp"
"../../test/tables/archives/txs.cpp"
"../../test/tables/caches/bootstrap.cpp"
"../../test/tables/caches/buffer.cpp"
"../../test/tables/caches/neutrino.cpp"
"../../test/tables/caches/prevouts.cpp"
"../../test/tables/caches/validated_bk.cpp"
"../../test/tables/caches/validated_tx.cpp"
"../../test/tables/indexes/address.cpp"
"../../test/tables/indexes/height.cpp"
"../../test/tables/indexes/spend.cpp"
"../../test/tables/indexes/strong_tx.cpp" )
"../../test/tables/indexes/strong_tx.cpp"
"../../test/tables/optional/address.cpp"
"../../test/tables/optional/bootstrap.cpp"
"../../test/tables/optional/neutrino.cpp" )

add_test( NAME libbitcoin-database-test COMMAND libbitcoin-database-test
--run_test=*
Expand Down
12 changes: 7 additions & 5 deletions 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 @@ -87,7 +87,9 @@
<ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\hashmap2.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\head.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\head2.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\iterator.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\linkage.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\manager.cpp" />
Expand All @@ -106,17 +108,17 @@
<ClCompile Include="..\..\..\..\test\tables\archives\output.cpp" />
<ClCompile Include="..\..\..\..\test\tables\archives\point.cpp" />
<ClCompile Include="..\..\..\..\test\tables\archives\puts.cpp" />
<ClCompile Include="..\..\..\..\test\tables\archives\spend.cpp" />
<ClCompile Include="..\..\..\..\test\tables\archives\transaction.cpp" />
<ClCompile Include="..\..\..\..\test\tables\archives\txs.cpp" />
<ClCompile Include="..\..\..\..\test\tables\caches\bootstrap.cpp" />
<ClCompile Include="..\..\..\..\test\tables\caches\buffer.cpp" />
<ClCompile Include="..\..\..\..\test\tables\caches\neutrino.cpp" />
<ClCompile Include="..\..\..\..\test\tables\caches\prevouts.cpp" />
<ClCompile Include="..\..\..\..\test\tables\caches\validated_bk.cpp" />
<ClCompile Include="..\..\..\..\test\tables\caches\validated_tx.cpp" />
<ClCompile Include="..\..\..\..\test\tables\indexes\address.cpp" />
<ClCompile Include="..\..\..\..\test\tables\indexes\height.cpp" />
<ClCompile Include="..\..\..\..\test\tables\indexes\spend.cpp" />
<ClCompile Include="..\..\..\..\test\tables\indexes\strong_tx.cpp" />
<ClCompile Include="..\..\..\..\test\tables\optional\address.cpp" />
<ClCompile Include="..\..\..\..\test\tables\optional\bootstrap.cpp" />
<ClCompile Include="..\..\..\..\test\tables\optional\neutrino.cpp" />
<ClCompile Include="..\..\..\..\test\test.cpp" />
</ItemGroup>
<ItemGroup>
Expand Down
35 changes: 22 additions & 13 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 @@ -40,6 +40,9 @@
<Filter Include="src\tables\indexes">
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-00000000000A}</UniqueIdentifier>
</Filter>
<Filter Include="src\tables\optional">
<UniqueIdentifier>{5C4DA53A-8C06-4DA6-0000-00000000000B}</UniqueIdentifier>
</Filter>
</ItemGroup>
<ItemGroup>
<ClCompile Include="..\..\..\..\test\error.cpp">
Expand Down Expand Up @@ -81,9 +84,15 @@
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\hashmap2.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\head.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\head2.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\iterator.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
Expand Down Expand Up @@ -138,19 +147,16 @@
<ClCompile Include="..\..\..\..\test\tables\archives\puts.cpp">
<Filter>src\tables\archives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\tables\archives\spend.cpp">
<Filter>src\tables\archives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\tables\archives\transaction.cpp">
<Filter>src\tables\archives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\tables\archives\txs.cpp">
<Filter>src\tables\archives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\tables\caches\bootstrap.cpp">
<Filter>src\tables\caches</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\tables\caches\buffer.cpp">
<Filter>src\tables\caches</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\tables\caches\neutrino.cpp">
<ClCompile Include="..\..\..\..\test\tables\caches\prevouts.cpp">
<Filter>src\tables\caches</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\tables\caches\validated_bk.cpp">
Expand All @@ -159,18 +165,21 @@
<ClCompile Include="..\..\..\..\test\tables\caches\validated_tx.cpp">
<Filter>src\tables\caches</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\tables\indexes\address.cpp">
<Filter>src\tables\indexes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\tables\indexes\height.cpp">
<Filter>src\tables\indexes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\tables\indexes\spend.cpp">
<Filter>src\tables\indexes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\tables\indexes\strong_tx.cpp">
<Filter>src\tables\indexes</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\tables\optional\address.cpp">
<Filter>src\tables\optional</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\tables\optional\bootstrap.cpp">
<Filter>src\tables\optional</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\tables\optional\neutrino.cpp">
<Filter>src\tables\optional</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\test.cpp">
<Filter>src</Filter>
</ClCompile>
Expand Down
6 changes: 5 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 @@ -115,7 +115,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\utilities.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap2.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head2.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\iterator.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\linkage.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\manager.hpp" />
Expand All @@ -131,6 +133,7 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\spend.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\transaction.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\txs.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\prevouts.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\validated_bk.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\validated_tx.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\context.hpp" />
Expand All @@ -139,7 +142,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\indexes\strong_tx.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\address.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\bootstrap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\buffer.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\neutrino.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\schema.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\table.hpp" />
Expand All @@ -153,7 +155,9 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\simple_writer.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arraymap.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap2.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head2.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\iterator.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\linkage.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\manager.ipp" />
Expand Down
18 changes: 15 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 @@ -188,9 +188,15 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap2.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head2.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\iterator.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
Expand Down Expand Up @@ -236,6 +242,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\txs.hpp">
<Filter>include\bitcoin\database\tables\archives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\prevouts.hpp">
<Filter>include\bitcoin\database\tables\caches</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\caches\validated_bk.hpp">
<Filter>include\bitcoin\database\tables\caches</Filter>
</ClInclude>
Expand All @@ -260,9 +269,6 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\bootstrap.hpp">
<Filter>include\bitcoin\database\tables\optionals</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\buffer.hpp">
<Filter>include\bitcoin\database\tables\optionals</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\optionals\neutrino.hpp">
<Filter>include\bitcoin\database\tables\optionals</Filter>
</ClInclude>
Expand Down Expand Up @@ -298,9 +304,15 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap2.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head2.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\iterator.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
Expand Down
4 changes: 3 additions & 1 deletion include/bitcoin/database.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,9 @@
#include <bitcoin/database/memory/interfaces/storage.hpp>
#include <bitcoin/database/primitives/arraymap.hpp>
#include <bitcoin/database/primitives/hashmap.hpp>
#include <bitcoin/database/primitives/hashmap2.hpp>
#include <bitcoin/database/primitives/head.hpp>
#include <bitcoin/database/primitives/head2.hpp>
#include <bitcoin/database/primitives/iterator.hpp>
#include <bitcoin/database/primitives/linkage.hpp>
#include <bitcoin/database/primitives/manager.hpp>
Expand All @@ -62,13 +64,13 @@
#include <bitcoin/database/tables/archives/spend.hpp>
#include <bitcoin/database/tables/archives/transaction.hpp>
#include <bitcoin/database/tables/archives/txs.hpp>
#include <bitcoin/database/tables/caches/prevouts.hpp>
#include <bitcoin/database/tables/caches/validated_bk.hpp>
#include <bitcoin/database/tables/caches/validated_tx.hpp>
#include <bitcoin/database/tables/indexes/height.hpp>
#include <bitcoin/database/tables/indexes/strong_tx.hpp>
#include <bitcoin/database/tables/optionals/address.hpp>
#include <bitcoin/database/tables/optionals/bootstrap.hpp>
#include <bitcoin/database/tables/optionals/buffer.hpp>
#include <bitcoin/database/tables/optionals/neutrino.hpp>

#endif
8 changes: 6 additions & 2 deletions include/bitcoin/database/impl/primitives/hashmap.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,7 @@ typename CLASS::iterator CLASS::it(const Key& key) const NOEXCEPT
{
return { get_memory(), head_.top(key), key };
}

TEMPLATE
Link CLASS::allocate(const Link& size) NOEXCEPT
{
Expand Down Expand Up @@ -307,7 +308,6 @@ bool CLASS::put(const Link& link, const Key& key,
const Element& element) NOEXCEPT
{
using namespace system;
const auto count = element.count();
const auto ptr = manager_.get(link);
if (!ptr)
return false;
Expand All @@ -318,7 +318,11 @@ bool CLASS::put(const Link& link, const Key& key,
sink.skip_bytes(Link::size);
sink.write_bytes(key);

if constexpr (!is_slab) { BC_DEBUG_ONLY(sink.set_limit(Size * count);) }
if constexpr (!is_slab)
{
BC_DEBUG_ONLY(sink.set_limit(Size * element.count());)
}

auto& next = unsafe_array_cast<uint8_t, Link::size>(ptr->begin());
return element.to_data(sink) && head_.push(link, next, head_.index(key));
}
Expand Down
Loading
Loading