Skip to content

Commit dc6b5be

Browse files
evoskuilevoskuil
authored
Merge pull request #534 from evoskuil/master
Rename primitives/hash to /hashhead, style.
2 parents 4221eaf + 33015bf commit dc6b5be

File tree

15 files changed

+79
-79
lines changed

15 files changed

+79
-79
lines changed

‎Makefile.am‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,8 +78,8 @@ test_libbitcoin_database_test_SOURCES = \
7878
test/mocks/map_store.hpp \
7979
test/primitives/arrayhead.cpp \
8080
test/primitives/arraymap.cpp \
81+
test/primitives/hashhead.cpp \
8182
test/primitives/hashmap.cpp \
82-
test/primitives/head.cpp \
8383
test/primitives/iterator.cpp \
8484
test/primitives/linkage.cpp \
8585
test/primitives/manager.cpp \
@@ -161,8 +161,8 @@ include_bitcoin_database_impl_primitivesdir = ${includedir}/bitcoin/database/imp
161161
include_bitcoin_database_impl_primitives_HEADERS = \
162162
include/bitcoin/database/impl/primitives/arrayhead.ipp \
163163
include/bitcoin/database/impl/primitives/arraymap.ipp \
164+
include/bitcoin/database/impl/primitives/hashhead.ipp \
164165
include/bitcoin/database/impl/primitives/hashmap.ipp \
165-
include/bitcoin/database/impl/primitives/head.ipp \
166166
include/bitcoin/database/impl/primitives/iterator.ipp \
167167
include/bitcoin/database/impl/primitives/linkage.ipp \
168168
include/bitcoin/database/impl/primitives/manager.ipp \
@@ -208,8 +208,8 @@ include_bitcoin_database_primitivesdir = ${includedir}/bitcoin/database/primitiv
208208
include_bitcoin_database_primitives_HEADERS = \
209209
include/bitcoin/database/primitives/arrayhead.hpp \
210210
include/bitcoin/database/primitives/arraymap.hpp \
211+
include/bitcoin/database/primitives/hashhead.hpp \
211212
include/bitcoin/database/primitives/hashmap.hpp \
212-
include/bitcoin/database/primitives/head.hpp \
213213
include/bitcoin/database/primitives/iterator.hpp \
214214
include/bitcoin/database/primitives/linkage.hpp \
215215
include/bitcoin/database/primitives/manager.hpp \

‎builds/cmake/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,8 +286,8 @@ if (with-tests)
286286
"../../test/mocks/map_store.hpp"
287287
"../../test/primitives/arrayhead.cpp"
288288
"../../test/primitives/arraymap.cpp"
289+
"../../test/primitives/hashhead.cpp"
289290
"../../test/primitives/hashmap.cpp"
290-
"../../test/primitives/head.cpp"
291291
"../../test/primitives/iterator.cpp"
292292
"../../test/primitives/linkage.cpp"
293293
"../../test/primitives/manager.cpp"

‎builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,8 +87,8 @@
8787
<ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp" />
8888
<ClCompile Include="..\..\..\..\test\primitives\arrayhead.cpp" />
8989
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp" />
90+
<ClCompile Include="..\..\..\..\test\primitives\hashhead.cpp" />
9091
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp" />
91-
<ClCompile Include="..\..\..\..\test\primitives\head.cpp" />
9292
<ClCompile Include="..\..\..\..\test\primitives\iterator.cpp" />
9393
<ClCompile Include="..\..\..\..\test\primitives\linkage.cpp" />
9494
<ClCompile Include="..\..\..\..\test\primitives\manager.cpp" />

‎builds/msvc/vs2022/libbitcoin-database-test/libbitcoin-database-test.vcxproj.filters‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,10 +84,10 @@
8484
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp">
8585
<Filter>src\primitives</Filter>
8686
</ClCompile>
87-
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp">
87+
<ClCompile Include="..\..\..\..\test\primitives\hashhead.cpp">
8888
<Filter>src\primitives</Filter>
8989
</ClCompile>
90-
<ClCompile Include="..\..\..\..\test\primitives\head.cpp">
90+
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp">
9191
<Filter>src\primitives</Filter>
9292
</ClCompile>
9393
<ClCompile Include="..\..\..\..\test\primitives\iterator.cpp">

‎builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,8 @@
115115
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\utilities.hpp" />
116116
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arrayhead.hpp" />
117117
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp" />
118+
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashhead.hpp" />
118119
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp" />
119-
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head.hpp" />
120120
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\iterator.hpp" />
121121
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\linkage.hpp" />
122122
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\manager.hpp" />
@@ -155,8 +155,8 @@
155155
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\simple_writer.ipp" />
156156
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arrayhead.ipp" />
157157
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arraymap.ipp" />
158+
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashhead.ipp" />
158159
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp" />
159-
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head.ipp" />
160160
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\iterator.ipp" />
161161
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\linkage.ipp" />
162162
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\manager.ipp" />

‎builds/msvc/vs2022/libbitcoin-database/libbitcoin-database.vcxproj.filters‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,10 +188,10 @@
188188
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp">
189189
<Filter>include\bitcoin\database\primitives</Filter>
190190
</ClInclude>
191-
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp">
191+
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashhead.hpp">
192192
<Filter>include\bitcoin\database\primitives</Filter>
193193
</ClInclude>
194-
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head.hpp">
194+
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp">
195195
<Filter>include\bitcoin\database\primitives</Filter>
196196
</ClInclude>
197197
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\iterator.hpp">
@@ -304,10 +304,10 @@
304304
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arraymap.ipp">
305305
<Filter>include\bitcoin\database\impl\primitives</Filter>
306306
</None>
307-
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp">
307+
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashhead.ipp">
308308
<Filter>include\bitcoin\database\impl\primitives</Filter>
309309
</None>
310-
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head.ipp">
310+
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp">
311311
<Filter>include\bitcoin\database\impl\primitives</Filter>
312312
</None>
313313
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\iterator.ipp">

‎include/bitcoin/database.hpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@
4444
#include <bitcoin/database/memory/interfaces/storage.hpp>
4545
#include <bitcoin/database/primitives/arrayhead.hpp>
4646
#include <bitcoin/database/primitives/arraymap.hpp>
47+
#include <bitcoin/database/primitives/hashhead.hpp>
4748
#include <bitcoin/database/primitives/hashmap.hpp>
48-
#include <bitcoin/database/primitives/head.hpp>
4949
#include <bitcoin/database/primitives/iterator.hpp>
5050
#include <bitcoin/database/primitives/linkage.hpp>
5151
#include <bitcoin/database/primitives/manager.hpp>

‎include/bitcoin/database/impl/primitives/arraymap.ipp‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ namespace database {
2828

2929
TEMPLATE
3030
CLASS::arraymap(storage& header, storage& body, const Link& buckets) NOEXCEPT
31-
: head_(header, buckets), manager_(body)
31+
: head_(header, buckets), body_(body)
3232
{
3333
}
3434

@@ -40,35 +40,35 @@ bool CLASS::create() NOEXCEPT
4040
{
4141
Link count{};
4242
return head_.create() && head_.get_body_count(count) &&
43-
manager_.truncate(count);
43+
body_.truncate(count);
4444
}
4545

4646
TEMPLATE
4747
bool CLASS::close() NOEXCEPT
4848
{
49-
return head_.set_body_count(manager_.count());
49+
return head_.set_body_count(body_.count());
5050
}
5151

5252
TEMPLATE
5353
bool CLASS::backup() NOEXCEPT
5454
{
55-
return head_.set_body_count(manager_.count());
55+
return head_.set_body_count(body_.count());
5656
}
5757

5858
TEMPLATE
5959
bool CLASS::restore() NOEXCEPT
6060
{
6161
Link count{};
6262
return head_.verify() && head_.get_body_count(count) &&
63-
manager_.truncate(count);
63+
body_.truncate(count);
6464
}
6565

6666
TEMPLATE
6767
bool CLASS::verify() const NOEXCEPT
6868
{
6969
Link count{};
7070
return head_.verify() && head_.get_body_count(count) &&
71-
(count == manager_.count());
71+
(count == body_.count());
7272
}
7373

7474
// sizing
@@ -95,13 +95,13 @@ size_t CLASS::head_size() const NOEXCEPT
9595
TEMPLATE
9696
size_t CLASS::body_size() const NOEXCEPT
9797
{
98-
return manager_.size();
98+
return body_.size();
9999
}
100100

101101
TEMPLATE
102102
Link CLASS::count() const NOEXCEPT
103103
{
104-
return manager_.count();
104+
return body_.count();
105105
}
106106

107107
// query interface
@@ -110,19 +110,19 @@ Link CLASS::count() const NOEXCEPT
110110
TEMPLATE
111111
code CLASS::get_fault() const NOEXCEPT
112112
{
113-
return manager_.get_fault();
113+
return body_.get_fault();
114114
}
115115

116116
TEMPLATE
117117
size_t CLASS::get_space() const NOEXCEPT
118118
{
119-
return manager_.get_space();
119+
return body_.get_space();
120120
}
121121

122122
TEMPLATE
123123
code CLASS::reload() NOEXCEPT
124124
{
125-
return manager_.reload();
125+
return body_.reload();
126126
}
127127

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

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

169169
TEMPLATE
@@ -173,7 +173,7 @@ bool CLASS::put(const Key& key, const Element& element) NOEXCEPT
173173
using namespace system;
174174
const auto count = element.count();
175175
const auto link = allocate(count);
176-
const auto ptr = manager_.get(link);
176+
const auto ptr = body_.get(link);
177177
if (!ptr)
178178
return false;
179179

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

201201
using namespace system;
202-
const auto start = manager::link_to_position(link);
202+
const auto start = body::link_to_position(link);
203203
if (is_limited<ptrdiff_t>(start))
204204
return false;
205205

include/bitcoin/database/impl/primitives/head.ipp renamed to include/bitcoin/database/impl/primitives/hashhead.ipp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616
* You should have received a copy of the GNU Affero General Public License
1717
* along with this program. If not, see <http://www.gnu.org/licenses/>.
1818
*/
19-
#ifndef LIBBITCOIN_DATABASE_PRIMITIVES_HEAD_IPP
20-
#define LIBBITCOIN_DATABASE_PRIMITIVES_HEAD_IPP
19+
#ifndef LIBBITCOIN_DATABASE_PRIMITIVES_HASHHEAD_IPP
20+
#define LIBBITCOIN_DATABASE_PRIMITIVES_HASHHEAD_IPP
2121

2222
#include <algorithm>
2323
#include <bitcoin/system.hpp>
@@ -30,7 +30,7 @@ namespace libbitcoin {
3030
namespace database {
3131

3232
TEMPLATE
33-
CLASS::head(storage& head, const Link& buckets) NOEXCEPT
33+
CLASS::hashhead(storage& head, const Link& buckets) NOEXCEPT
3434
: file_(head), buckets_(buckets)
3535
{
3636
}

0 commit comments

Comments
 (0)