Skip to content

Commit d98d1cb

Browse files
evoskuilevoskuil
committed
Rename arraymap/array_map to nomap/no_map.
1 parent f63ca25 commit d98d1cb

File tree

17 files changed

+106
-106
lines changed

17 files changed

+106
-106
lines changed

‎Makefile.am‎

Lines changed: 4 additions & 4 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/arraymap.cpp \
8079
test/primitives/hashmap.cpp \
8180
test/primitives/hashmap2.cpp \
8281
test/primitives/head.cpp \
8382
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/arraymap.ipp \
163162
include/bitcoin/database/impl/primitives/hashmap.ipp \
164163
include/bitcoin/database/impl/primitives/hashmap2.ipp \
165164
include/bitcoin/database/impl/primitives/head.ipp \
166165
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/arraymap.hpp \
210209
include/bitcoin/database/primitives/hashmap.hpp \
211210
include/bitcoin/database/primitives/hashmap2.hpp \
212211
include/bitcoin/database/primitives/head.hpp \
213212
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: 1 addition & 1 deletion
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/arraymap.cpp"
288287
"../../test/primitives/hashmap.cpp"
289288
"../../test/primitives/hashmap2.cpp"
290289
"../../test/primitives/head.cpp"
291290
"../../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: 1 addition & 1 deletion
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\arraymap.cpp" />
8988
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp" />
9089
<ClCompile Include="..\..\..\..\test\primitives\hashmap2.cpp" />
9190
<ClCompile Include="..\..\..\..\test\primitives\head.cpp" />
9291
<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: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,9 +78,6 @@
7878
<ClCompile Include="..\..\..\..\test\mocks\chunk_storage.cpp">
7979
<Filter>src\mocks</Filter>
8080
</ClCompile>
81-
<ClCompile Include="..\..\..\..\test\primitives\arraymap.cpp">
82-
<Filter>src\primitives</Filter>
83-
</ClCompile>
8481
<ClCompile Include="..\..\..\..\test\primitives\hashmap.cpp">
8582
<Filter>src\primitives</Filter>
8683
</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: 2 additions & 2 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\arraymap.hpp" />
117116
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp" />
118117
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap2.hpp" />
119118
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\head.hpp" />
120119
<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\arraymap.ipp" />
157156
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp" />
158157
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap2.ipp" />
159158
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\head.ipp" />
160159
<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: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,9 +182,6 @@
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">
186-
<Filter>include\bitcoin\database\primitives</Filter>
187-
</ClInclude>
188185
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\hashmap.hpp">
189186
<Filter>include\bitcoin\database\primitives</Filter>
190187
</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,9 +298,6 @@
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">
302-
<Filter>include\bitcoin\database\impl\primitives</Filter>
303-
</None>
304301
<None Include="..\..\..\..\include\bitcoin\database\impl\primitives\hashmap.ipp">
305302
<Filter>include\bitcoin\database\impl\primitives</Filter>
306303
</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: 1 addition & 1 deletion
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/arraymap.hpp>
4645
#include <bitcoin/database/primitives/hashmap.hpp>
4746
#include <bitcoin/database/primitives/hashmap2.hpp>
4847
#include <bitcoin/database/primitives/head.hpp>
4948
#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/manager.ipp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ Link CLASS::allocate(const Link& size) NOEXCEPT
6464
if (start == storage::eof)
6565
return Link::terminal;
6666

67-
// Callers (arraymap and hashmap) handle terminal allocation.
67+
// Callers (nomap and hashmap) handle terminal allocation.
6868
return position_to_link(start);
6969
}
7070

include/bitcoin/database/impl/primitives/arraymap.ipp renamed to include/bitcoin/database/impl/primitives/nomap.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_ARRAYMAP_IPP
20-
#define LIBBITCOIN_DATABASE_PRIMITIVES_ARRAYMAP_IPP
19+
#ifndef LIBBITCOIN_DATABASE_PRIMITIVES_NOMAP_IPP
20+
#define LIBBITCOIN_DATABASE_PRIMITIVES_NOMAP_IPP
2121

2222
#include <bitcoin/system.hpp>
2323
#include <bitcoin/database/define.hpp>
@@ -26,7 +26,7 @@ namespace libbitcoin {
2626
namespace database {
2727

2828
TEMPLATE
29-
CLASS::arraymap(storage& header, storage& body) NOEXCEPT
29+
CLASS::nomap(storage& header, storage& body) NOEXCEPT
3030
: head_(header, 0), manager_(body)
3131
{
3232
}

include/bitcoin/database/primitives/arraymap.hpp renamed to include/bitcoin/database/primitives/nomap.hpp

Lines changed: 8 additions & 8 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_ARRAYMAP_HPP
20-
#define LIBBITCOIN_DATABASE_PRIMITIVES_ARRAYMAP_HPP
19+
#ifndef LIBBITCOIN_DATABASE_PRIMITIVES_NOMAP_HPP
20+
#define LIBBITCOIN_DATABASE_PRIMITIVES_NOMAP_HPP
2121

2222
#include <bitcoin/system.hpp>
2323
#include <bitcoin/database/define.hpp>
@@ -32,14 +32,14 @@ namespace database {
3232
/// Caution: reader/writer hold body remap lock until disposed.
3333
/// These handles should be used for serialization and immediately disposed.
3434
template <typename Link, size_t Size>
35-
class arraymap
35+
class nomap
3636
{
3737
public:
38-
DEFAULT_COPY_MOVE_DESTRUCT(arraymap);
38+
DEFAULT_COPY_MOVE_DESTRUCT(nomap);
3939

4040
using link = Link;
4141

42-
arraymap(storage& header, storage& body) NOEXCEPT;
42+
nomap(storage& header, storage& body) NOEXCEPT;
4343

4444
/// Setup, not thread safe.
4545
/// -----------------------------------------------------------------------
@@ -111,15 +111,15 @@ class arraymap
111111
};
112112

113113
template <typename Element>
114-
using array_map = arraymap<linkage<Element::pk>, Element::size>;
114+
using no_map = nomap<linkage<Element::pk>, Element::size>;
115115

116116
} // namespace database
117117
} // namespace libbitcoin
118118

119119
#define TEMPLATE template <typename Link, size_t Size>
120-
#define CLASS arraymap<Link, Size>
120+
#define CLASS nomap<Link, Size>
121121

122-
#include <bitcoin/database/impl/primitives/arraymap.ipp>
122+
#include <bitcoin/database/impl/primitives/nomap.ipp>
123123

124124
#undef CLASS
125125
#undef TEMPLATE

0 commit comments

Comments
 (0)