Skip to content

Rename primitives/hash to /hashhead, style. #534

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 1 commit into from
Jan 8, 2025
Merged

Rename primitives/hash to /hashhead, style. #534

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Makefile.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,8 @@ test_libbitcoin_database_test_SOURCES = \
test/mocks/map_store.hpp \
test/primitives/arrayhead.cpp \
test/primitives/arraymap.cpp \
test/primitives/hashhead.cpp \
test/primitives/hashmap.cpp \
test/primitives/head.cpp \
test/primitives/iterator.cpp \
test/primitives/linkage.cpp \
test/primitives/manager.cpp \
Expand Down Expand Up @@ -161,8 +161,8 @@ include_bitcoin_database_impl_primitivesdir = ${includedir}/bitcoin/database/imp
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/hashhead.ipp \
include/bitcoin/database/impl/primitives/hashmap.ipp \
include/bitcoin/database/impl/primitives/head.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 @@ -208,8 +208,8 @@ include_bitcoin_database_primitivesdir = ${includedir}/bitcoin/database/primitiv
include_bitcoin_database_primitives_HEADERS = \
include/bitcoin/database/primitives/arrayhead.hpp \
include/bitcoin/database/primitives/arraymap.hpp \
include/bitcoin/database/primitives/hashhead.hpp \
include/bitcoin/database/primitives/hashmap.hpp \
include/bitcoin/database/primitives/head.hpp \
include/bitcoin/database/primitives/iterator.hpp \
include/bitcoin/database/primitives/linkage.hpp \
include/bitcoin/database/primitives/manager.hpp \
Expand Down
2 changes: 1 addition & 1 deletion builds/cmake/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ if (with-tests)
"../../test/mocks/map_store.hpp"
"../../test/primitives/arrayhead.cpp"
"../../test/primitives/arraymap.cpp"
"../../test/primitives/hashhead.cpp"
"../../test/primitives/hashmap.cpp"
"../../test/primitives/head.cpp"
"../../test/primitives/iterator.cpp"
"../../test/primitives/linkage.cpp"
"../../test/primitives/manager.cpp"
Expand Down
2 changes: 1 addition & 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 @@ -87,8 +87,8 @@
<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" />
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\head.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\iterator.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\linkage.cpp" />
<ClCompile Include="..\..\..\..\test\primitives\manager.cpp" />
Expand Down
4 changes: 2 additions & 2 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 @@ -84,10 +84,10 @@
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp">
<ClCompile Include="..\..\..\..\test\primitives\hashhead.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\head.cpp">
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp">
<Filter>src\primitives</Filter>
</ClCompile>
<ClCompile Include="..\..\..\..\test\primitives\iterator.cpp">
Expand Down
4 changes: 2 additions & 2 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 @@ -115,8 +115,8 @@
<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\hashhead.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp" />
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head.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 Down Expand Up @@ -155,8 +155,8 @@
<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\hashhead.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp" />
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head.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
8 changes: 4 additions & 4 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,10 +188,10 @@
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp">
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashhead.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head.hpp">
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp">
<Filter>include\bitcoin\database\primitives</Filter>
</ClInclude>
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\iterator.hpp">
Expand Down Expand Up @@ -304,10 +304,10 @@
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arraymap.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\hashhead.ipp">
<Filter>include\bitcoin\database\impl\primitives</Filter>
</None>
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head.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\iterator.ipp">
Expand Down
2 changes: 1 addition & 1 deletion include/bitcoin/database.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@
#include <bitcoin/database/memory/interfaces/storage.hpp>
#include <bitcoin/database/primitives/arrayhead.hpp>
#include <bitcoin/database/primitives/arraymap.hpp>
#include <bitcoin/database/primitives/hashhead.hpp>
#include <bitcoin/database/primitives/hashmap.hpp>
#include <bitcoin/database/primitives/head.hpp>
#include <bitcoin/database/primitives/iterator.hpp>
#include <bitcoin/database/primitives/linkage.hpp>
#include <bitcoin/database/primitives/manager.hpp>
Expand Down
30 changes: 15 additions & 15 deletions include/bitcoin/database/impl/primitives/arraymap.ipp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace database {

TEMPLATE
CLASS::arraymap(storage& header, storage& body, const Link& buckets) NOEXCEPT
: head_(header, buckets), manager_(body)
: head_(header, buckets), body_(body)
{
}

Expand All @@ -40,35 +40,35 @@ bool CLASS::create() NOEXCEPT
{
Link count{};
return head_.create() && head_.get_body_count(count) &&
manager_.truncate(count);
body_.truncate(count);
}

TEMPLATE
bool CLASS::close() NOEXCEPT
{
return head_.set_body_count(manager_.count());
return head_.set_body_count(body_.count());
}

TEMPLATE
bool CLASS::backup() NOEXCEPT
{
return head_.set_body_count(manager_.count());
return head_.set_body_count(body_.count());
}

TEMPLATE
bool CLASS::restore() NOEXCEPT
{
Link count{};
return head_.verify() && head_.get_body_count(count) &&
manager_.truncate(count);
body_.truncate(count);
}

TEMPLATE
bool CLASS::verify() const NOEXCEPT
{
Link count{};
return head_.verify() && head_.get_body_count(count) &&
(count == manager_.count());
(count == body_.count());
}

// sizing
Expand All @@ -95,13 +95,13 @@ size_t CLASS::head_size() const NOEXCEPT
TEMPLATE
size_t CLASS::body_size() const NOEXCEPT
{
return manager_.size();
return body_.size();
}

TEMPLATE
Link CLASS::count() const NOEXCEPT
{
return manager_.count();
return body_.count();
}

// query interface
Expand All @@ -110,19 +110,19 @@ Link CLASS::count() const NOEXCEPT
TEMPLATE
code CLASS::get_fault() const NOEXCEPT
{
return manager_.get_fault();
return body_.get_fault();
}

TEMPLATE
size_t CLASS::get_space() const NOEXCEPT
{
return manager_.get_space();
return body_.get_space();
}

TEMPLATE
code CLASS::reload() NOEXCEPT
{
return manager_.reload();
return body_.reload();
}

// query interface
Expand Down Expand Up @@ -154,7 +154,7 @@ template <typename Element, if_equal<Element::size, Size>>
bool CLASS::find(const Key& key, Element& element) const NOEXCEPT
{
// This override avoids duplicated memory_ptr construct in get(first()).
const auto ptr = manager_.get();
const auto ptr = body_.get();
return read(ptr, first(ptr, head_.top(key), key), element);
}

Expand All @@ -163,7 +163,7 @@ template <typename Element, if_equal<Element::size, Size>>
bool CLASS::get(const Link& link, Element& element) const NOEXCEPT
{
// This override is the normal form.
return read(manager_.get(), link, element);
return read(body_.get(), link, element);
}

TEMPLATE
Expand All @@ -173,7 +173,7 @@ bool CLASS::put(const Key& key, const Element& element) NOEXCEPT
using namespace system;
const auto count = element.count();
const auto link = allocate(count);
const auto ptr = manager_.get(link);
const auto ptr = body_.get(link);
if (!ptr)
return false;

Expand All @@ -199,7 +199,7 @@ bool CLASS::read(const memory_ptr& ptr, const Link& link,
return false;

using namespace system;
const auto start = manager::link_to_position(link);
const auto start = body::link_to_position(link);
if (is_limited<ptrdiff_t>(start))
return false;

Expand Down
6 changes: 3 additions & 3 deletions ...bitcoin/database/impl/primitives/head.ipp → ...oin/database/impl/primitives/hashhead.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_HEAD_IPP
#define LIBBITCOIN_DATABASE_PRIMITIVES_HEAD_IPP
#ifndef LIBBITCOIN_DATABASE_PRIMITIVES_HASHHEAD_IPP
#define LIBBITCOIN_DATABASE_PRIMITIVES_HASHHEAD_IPP

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

TEMPLATE
CLASS::head(storage& head, const Link& buckets) NOEXCEPT
CLASS::hashhead(storage& head, const Link& buckets) NOEXCEPT
: file_(head), buckets_(buckets)
{
}
Expand Down
Loading
Loading