Skip to content

Rename primitives. #532

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

Rename primitives. #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d98d1cb
Rename arraymap/array_map to nomap/no_map.
evoskuil Jan 8, 2025
8f61a1f
Rename hashmap2 to arraymap.
evoskuil Jan 8, 2025
a5b6e4e
Rename head2 to arrayhead, allow empty files in validate().
evoskuil Jan 8, 2025
9d9f483
Use arrayhead (vs hashhead) in nomap.
evoskuil Jan 8, 2025
8a2cb3f
Comment.
evoskuil Jan 8, 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
14 changes: 7 additions & 7 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,14 +76,14 @@ test_libbitcoin_database_test_SOURCES = \
test/mocks/chunk_storage.hpp \
test/mocks/chunk_store.hpp \
test/mocks/map_store.hpp \
test/primitives/arrayhead.cpp \
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 \
test/primitives/nomap.cpp \
test/query/archive.cpp \
test/query/confirm.cpp \
test/query/context.cpp \
Expand Down Expand Up @@ -159,14 +159,14 @@ include_bitcoin_database_impl_memory_HEADERS = \

include_bitcoin_database_impl_primitivesdir = ${includedir}/bitcoin/database/impl/primitives
include_bitcoin_database_impl_primitives_HEADERS = \
include/bitcoin/database/impl/primitives/arrayhead.ipp \
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
include/bitcoin/database/impl/primitives/manager.ipp \
include/bitcoin/database/impl/primitives/nomap.ipp

include_bitcoin_database_impl_querydir = ${includedir}/bitcoin/database/impl/query
include_bitcoin_database_impl_query_HEADERS = \
Expand Down Expand Up @@ -206,14 +206,14 @@ include_bitcoin_database_memory_interfaces_HEADERS = \

include_bitcoin_database_primitivesdir = ${includedir}/bitcoin/database/primitives
include_bitcoin_database_primitives_HEADERS = \
include/bitcoin/database/primitives/arrayhead.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 \
include/bitcoin/database/primitives/nomap.hpp \
include/bitcoin/database/primitives/primitives.hpp

include_bitcoin_database_tablesdir = ${includedir}/bitcoin/database/tables
Expand Down
4 changes: 2 additions & 2 deletions builds/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,14 +284,14 @@ if (with-tests)
"../../test/mocks/chunk_storage.hpp"
"../../test/mocks/chunk_store.hpp"
"../../test/mocks/map_store.hpp"
"../../test/primitives/arrayhead.cpp"
"../../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"
"../../test/primitives/nomap.cpp"
"../../test/query/archive.cpp"
"../../test/query/confirm.cpp"
"../../test/query/context.cpp"
Expand Down
4 changes: 2 additions & 2 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 @@ -85,14 +85,14 @@
<ObjectFileName>$(IntDir)test_memory_utilities.obj</ObjectFileName>
</ClCompile>
<ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\arrayhead.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" />
<ClCompile Include="..\..\..\..\test\primitives\nomap.cpp" />
<ClCompile Include="..\..\..\..\test\query\archive.cpp" />
<ClCompile Include="..\..\..\..\test\query\confirm.cpp" />
<ClCompile Include="..\..\..\..\test\query\context.cpp" />
Expand Down
12 changes: 6 additions & 6 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 @@ -78,21 +78,18 @@
<ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp">
<Filter>src\mocks</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp">
<ClCompile Include="..\..\..\..\test\primitives\arrayhead.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp">
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\hashmap2.cpp">
<ClCompile Include="..\..\..\..\test\primitives\hashmap.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 All @@ -102,6 +99,9 @@
<ClCompile Include="..\..\..\..\test\primitives\manager.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\nomap.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\query\archive.cpp">
<Filter>src\query</Filter>
</ClCompile>
Expand Down
8 changes: 4 additions & 4 deletions 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 @@ -113,14 +113,14 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\simple_writer.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\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" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\primitives.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\query.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\settings.hpp" />
Expand Down Expand Up @@ -153,14 +153,14 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\accessor.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\simple_reader.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\simple_writer.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arrayhead.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" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomap.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\query\archive.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\query\confirm.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\query\context.ipp" />
Expand Down
24 changes: 12 additions & 12 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,21 +182,18 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\utilities.hpp">
<Filter>include\bitcoin\database\memory</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp">
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arrayhead.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp">
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap2.hpp">
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.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 All @@ -206,6 +203,9 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\manager.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomap.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\primitives.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
Expand Down Expand Up @@ -298,21 +298,18 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\simple_writer.ipp">
<Filter>include\bitcoin\database\impl\memory</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arraymap.ipp">
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arrayhead.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp">
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arraymap.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap2.ipp">
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.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 All @@ -322,6 +319,9 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\manager.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomap.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\query\archive.ipp">
<Filter>include\bitcoin\database\impl\query</Filter>
</None>
Expand Down
4 changes: 2 additions & 2 deletions include/bitcoin/database.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,14 +42,14 @@
#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/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>
#include <bitcoin/database/primitives/nomap.hpp>
#include <bitcoin/database/primitives/primitives.hpp>
#include <bitcoin/database/tables/context.hpp>
#include <bitcoin/database/tables/event.hpp>
Expand Down
10 changes: 5 additions & 5 deletions ...itcoin/database/impl/primitives/head2.ipp → ...in/database/impl/primitives/arrayhead.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef LIBBITCOIN_DATABASE_PRIMITIVES_HEAD2_IPP
#define LIBBITCOIN_DATABASE_PRIMITIVES_HEAD2_IPP
#ifndef LIBBITCOIN_DATABASE_PRIMITIVES_ARRAYHEAD_IPP
#define LIBBITCOIN_DATABASE_PRIMITIVES_ARRAYHEAD_IPP

#include <algorithm>
#include <bitcoin/system.hpp>
Expand All @@ -27,7 +27,7 @@ namespace libbitcoin {
namespace database {

TEMPLATE
CLASS::head2(storage& head, const Link& buckets) NOEXCEPT
CLASS::arrayhead(storage& head, const Link& buckets) NOEXCEPT
: file_(head), initial_buckets_(buckets)
{
}
Expand Down Expand Up @@ -98,7 +98,7 @@ TEMPLATE
bool CLASS::get_body_count(Link& count) const NOEXCEPT
{
const auto ptr = file_.get();
if (!ptr)
if (!ptr || Link::size > file_.size())
return false;

count = array_cast<Link::size>(ptr->data());
Expand All @@ -109,7 +109,7 @@ TEMPLATE
bool CLASS::set_body_count(const Link& count) NOEXCEPT
{
const auto ptr = file_.get();
if (!ptr)
if (!ptr || Link::size > file_.size())
return false;

array_cast<Link::size>(ptr->data()) = count;
Expand Down
Loading
Loading