Skip to content

Commit 537f725

Browse files
evoskuilevoskuil
authored
Merge pull request #532 from evoskuil/master
Rename primitives.
2 parents f63ca25 + 8a2cb3f commit 537f725

File tree

25 files changed

+1921
-1923
lines changed

25 files changed

+1921
-1923
lines changed

‎Makefile.am‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ test_libbitcoin_database_test_SOURCES = \
7676
test/mocks/chunk_storage.hpp \
7777
test/mocks/chunk_store.hpp \
7878
test/mocks/map_store.hpp \
79+
test/primitives/arrayhead.cpp \
7980
test/primitives/arraymap.cpp \
8081
test/primitives/hashmap.cpp \
81-
test/primitives/hashmap2.cpp \
8282
test/primitives/head.cpp \
83-
test/primitives/head2.cpp \
8483
test/primitives/iterator.cpp \
8584
test/primitives/linkage.cpp \
8685
test/primitives/manager.cpp \
86+
test/primitives/nomap.cpp \
8787
test/query/archive.cpp \
8888
test/query/confirm.cpp \
8989
test/query/context.cpp \
@@ -159,14 +159,14 @@ include_bitcoin_database_impl_memory_HEADERS = \
159159

160160
include_bitcoin_database_impl_primitivesdir = ${includedir}/bitcoin/database/impl/primitives
161161
include_bitcoin_database_impl_primitives_HEADERS = \
162+
include/bitcoin/database/impl/primitives/arrayhead.ipp \
162163
include/bitcoin/database/impl/primitives/arraymap.ipp \
163164
include/bitcoin/database/impl/primitives/hashmap.ipp \
164-
include/bitcoin/database/impl/primitives/hashmap2.ipp \
165165
include/bitcoin/database/impl/primitives/head.ipp \
166-
include/bitcoin/database/impl/primitives/head2.ipp \
167166
include/bitcoin/database/impl/primitives/iterator.ipp \
168167
include/bitcoin/database/impl/primitives/linkage.ipp \
169-
include/bitcoin/database/impl/primitives/manager.ipp
168+
include/bitcoin/database/impl/primitives/manager.ipp \
169+
include/bitcoin/database/impl/primitives/nomap.ipp
170170

171171
include_bitcoin_database_impl_querydir = ${includedir}/bitcoin/database/impl/query
172172
include_bitcoin_database_impl_query_HEADERS = \
@@ -206,14 +206,14 @@ include_bitcoin_database_memory_interfaces_HEADERS = \
206206

207207
include_bitcoin_database_primitivesdir = ${includedir}/bitcoin/database/primitives
208208
include_bitcoin_database_primitives_HEADERS = \
209+
include/bitcoin/database/primitives/arrayhead.hpp \
209210
include/bitcoin/database/primitives/arraymap.hpp \
210211
include/bitcoin/database/primitives/hashmap.hpp \
211-
include/bitcoin/database/primitives/hashmap2.hpp \
212212
include/bitcoin/database/primitives/head.hpp \
213-
include/bitcoin/database/primitives/head2.hpp \
214213
include/bitcoin/database/primitives/iterator.hpp \
215214
include/bitcoin/database/primitives/linkage.hpp \
216215
include/bitcoin/database/primitives/manager.hpp \
216+
include/bitcoin/database/primitives/nomap.hpp \
217217
include/bitcoin/database/primitives/primitives.hpp
218218

219219
include_bitcoin_database_tablesdir = ${includedir}/bitcoin/database/tables

‎builds/cmake/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,14 +284,14 @@ if (with-tests)
284284
"../../test/mocks/chunk_storage.hpp"
285285
"../../test/mocks/chunk_store.hpp"
286286
"../../test/mocks/map_store.hpp"
287+
"../../test/primitives/arrayhead.cpp"
287288
"../../test/primitives/arraymap.cpp"
288289
"../../test/primitives/hashmap.cpp"
289-
"../../test/primitives/hashmap2.cpp"
290290
"../../test/primitives/head.cpp"
291-
"../../test/primitives/head2.cpp"
292291
"../../test/primitives/iterator.cpp"
293292
"../../test/primitives/linkage.cpp"
294293
"../../test/primitives/manager.cpp"
294+
"../../test/primitives/nomap.cpp"
295295
"../../test/query/archive.cpp"
296296
"../../test/query/confirm.cpp"
297297
"../../test/query/context.cpp"

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,14 +85,14 @@
8585
<ObjectFileName>$(IntDir)test_memory_utilities.obj</ObjectFileName>
8686
</ClCompile>
8787
<ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp" />
88+
<ClCompile Include="..\..\..\..\test\primitives\arrayhead.cpp" />
8889
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp" />
8990
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp" />
90-
<ClCompile Include="..\..\..\..\test\primitives\hashmap2.cpp" />
9191
<ClCompile Include="..\..\..\..\test\primitives\head.cpp" />
92-
<ClCompile Include="..\..\..\..\test\primitives\head2.cpp" />
9392
<ClCompile Include="..\..\..\..\test\primitives\iterator.cpp" />
9493
<ClCompile Include="..\..\..\..\test\primitives\linkage.cpp" />
9594
<ClCompile Include="..\..\..\..\test\primitives\manager.cpp" />
95+
<ClCompile Include="..\..\..\..\test\primitives\nomap.cpp" />
9696
<ClCompile Include="..\..\..\..\test\query\archive.cpp" />
9797
<ClCompile Include="..\..\..\..\test\query\confirm.cpp" />
9898
<ClCompile Include="..\..\..\..\test\query\context.cpp" />

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,18 @@
7878
<ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp">
7979
<Filter>src\mocks</Filter>
8080
</ClCompile>
81-
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp">
81+
<ClCompile Include="..\..\..\..\test\primitives\arrayhead.cpp">
8282
<Filter>src\primitives</Filter>
8383
</ClCompile>
84-
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp">
84+
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp">
8585
<Filter>src\primitives</Filter>
8686
</ClCompile>
87-
<ClCompile Include="..\..\..\..\test\primitives\hashmap2.cpp">
87+
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp">
8888
<Filter>src\primitives</Filter>
8989
</ClCompile>
9090
<ClCompile Include="..\..\..\..\test\primitives\head.cpp">
9191
<Filter>src\primitives</Filter>
9292
</ClCompile>
93-
<ClCompile Include="..\..\..\..\test\primitives\head2.cpp">
94-
<Filter>src\primitives</Filter>
95-
</ClCompile>
9693
<ClCompile Include="..\..\..\..\test\primitives\iterator.cpp">
9794
<Filter>src\primitives</Filter>
9895
</ClCompile>
@@ -102,6 +99,9 @@
10299
<ClCompile Include="..\..\..\..\test\primitives\manager.cpp">
103100
<Filter>src\primitives</Filter>
104101
</ClCompile>
102+
<ClCompile Include="..\..\..\..\test\primitives\nomap.cpp">
103+
<Filter>src\primitives</Filter>
104+
</ClCompile>
105105
<ClCompile Include="..\..\..\..\test\query\archive.cpp">
106106
<Filter>src\query</Filter>
107107
</ClCompile>

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,14 +113,14 @@
113113
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\simple_writer.hpp" />
114114
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\streamers.hpp" />
115115
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\utilities.hpp" />
116+
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arrayhead.hpp" />
116117
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp" />
117118
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp" />
118-
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap2.hpp" />
119119
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head.hpp" />
120-
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head2.hpp" />
121120
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\iterator.hpp" />
122121
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\linkage.hpp" />
123122
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\manager.hpp" />
123+
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomap.hpp" />
124124
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\primitives.hpp" />
125125
<ClInclude Include="..\..\..\..\include\bitcoin\database\query.hpp" />
126126
<ClInclude Include="..\..\..\..\include\bitcoin\database\settings.hpp" />
@@ -153,14 +153,14 @@
153153
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\accessor.ipp" />
154154
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\simple_reader.ipp" />
155155
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\simple_writer.ipp" />
156+
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arrayhead.ipp" />
156157
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arraymap.ipp" />
157158
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp" />
158-
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap2.ipp" />
159159
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head.ipp" />
160-
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head2.ipp" />
161160
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\iterator.ipp" />
162161
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\linkage.ipp" />
163162
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\manager.ipp" />
163+
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomap.ipp" />
164164
<None Include="..\..\..\..\include\bitcoin\database\impl\query\archive.ipp" />
165165
<None Include="..\..\..\..\include\bitcoin\database\impl\query\confirm.ipp" />
166166
<None Include="..\..\..\..\include\bitcoin\database\impl\query\context.ipp" />

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

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -182,21 +182,18 @@
182182
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\utilities.hpp">
183183
<Filter>include\bitcoin\database\memory</Filter>
184184
</ClInclude>
185-
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp">
185+
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arrayhead.hpp">
186186
<Filter>include\bitcoin\database\primitives</Filter>
187187
</ClInclude>
188-
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp">
188+
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\arraymap.hpp">
189189
<Filter>include\bitcoin\database\primitives</Filter>
190190
</ClInclude>
191-
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap2.hpp">
191+
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp">
192192
<Filter>include\bitcoin\database\primitives</Filter>
193193
</ClInclude>
194194
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head.hpp">
195195
<Filter>include\bitcoin\database\primitives</Filter>
196196
</ClInclude>
197-
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head2.hpp">
198-
<Filter>include\bitcoin\database\primitives</Filter>
199-
</ClInclude>
200197
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\iterator.hpp">
201198
<Filter>include\bitcoin\database\primitives</Filter>
202199
</ClInclude>
@@ -206,6 +203,9 @@
206203
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\manager.hpp">
207204
<Filter>include\bitcoin\database\primitives</Filter>
208205
</ClInclude>
206+
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomap.hpp">
207+
<Filter>include\bitcoin\database\primitives</Filter>
208+
</ClInclude>
209209
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\primitives.hpp">
210210
<Filter>include\bitcoin\database\primitives</Filter>
211211
</ClInclude>
@@ -298,21 +298,18 @@
298298
<None Include="..\..\..\..\include\bitcoin\database\impl\memory\simple_writer.ipp">
299299
<Filter>include\bitcoin\database\impl\memory</Filter>
300300
</None>
301-
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arraymap.ipp">
301+
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\arrayhead.ipp">
302302
<Filter>include\bitcoin\database\impl\primitives</Filter>
303303
</None>
304-
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp">
304+
<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\hashmap2.ipp">
307+
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp">
308308
<Filter>include\bitcoin\database\impl\primitives</Filter>
309309
</None>
310310
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head.ipp">
311311
<Filter>include\bitcoin\database\impl\primitives</Filter>
312312
</None>
313-
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head2.ipp">
314-
<Filter>include\bitcoin\database\impl\primitives</Filter>
315-
</None>
316313
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\iterator.ipp">
317314
<Filter>include\bitcoin\database\impl\primitives</Filter>
318315
</None>
@@ -322,6 +319,9 @@
322319
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\manager.ipp">
323320
<Filter>include\bitcoin\database\impl\primitives</Filter>
324321
</None>
322+
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\nomap.ipp">
323+
<Filter>include\bitcoin\database\impl\primitives</Filter>
324+
</None>
325325
<None Include="..\..\..\..\include\bitcoin\database\impl\query\archive.ipp">
326326
<Filter>include\bitcoin\database\impl\query</Filter>
327327
</None>

‎include/bitcoin/database.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,14 +42,14 @@
4242
#include <bitcoin/database/memory/utilities.hpp>
4343
#include <bitcoin/database/memory/interfaces/memory.hpp>
4444
#include <bitcoin/database/memory/interfaces/storage.hpp>
45+
#include <bitcoin/database/primitives/arrayhead.hpp>
4546
#include <bitcoin/database/primitives/arraymap.hpp>
4647
#include <bitcoin/database/primitives/hashmap.hpp>
47-
#include <bitcoin/database/primitives/hashmap2.hpp>
4848
#include <bitcoin/database/primitives/head.hpp>
49-
#include <bitcoin/database/primitives/head2.hpp>
5049
#include <bitcoin/database/primitives/iterator.hpp>
5150
#include <bitcoin/database/primitives/linkage.hpp>
5251
#include <bitcoin/database/primitives/manager.hpp>
52+
#include <bitcoin/database/primitives/nomap.hpp>
5353
#include <bitcoin/database/primitives/primitives.hpp>
5454
#include <bitcoin/database/tables/context.hpp>
5555
#include <bitcoin/database/tables/event.hpp>

include/bitcoin/database/impl/primitives/head2.ipp renamed to include/bitcoin/database/impl/primitives/arrayhead.ipp

Lines changed: 5 additions & 5 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_HEAD2_IPP
20-
#define LIBBITCOIN_DATABASE_PRIMITIVES_HEAD2_IPP
19+
#ifndef LIBBITCOIN_DATABASE_PRIMITIVES_ARRAYHEAD_IPP
20+
#define LIBBITCOIN_DATABASE_PRIMITIVES_ARRAYHEAD_IPP
2121

2222
#include <algorithm>
2323
#include <bitcoin/system.hpp>
@@ -27,7 +27,7 @@ namespace libbitcoin {
2727
namespace database {
2828

2929
TEMPLATE
30-
CLASS::head2(storage& head, const Link& buckets) NOEXCEPT
30+
CLASS::arrayhead(storage& head, const Link& buckets) NOEXCEPT
3131
: file_(head), initial_buckets_(buckets)
3232
{
3333
}
@@ -98,7 +98,7 @@ TEMPLATE
9898
bool CLASS::get_body_count(Link& count) const NOEXCEPT
9999
{
100100
const auto ptr = file_.get();
101-
if (!ptr)
101+
if (!ptr || Link::size > file_.size())
102102
return false;
103103

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

115115
array_cast<Link::size>(ptr->data()) = count;

0 commit comments

Comments
 (0)