Skip to content
This repository was archived by the owner on Mar 22, 2023. It is now read-only.

Commit 75d04ac

Browse files
tests: shorten radix containers' names
the usings' names were a bit to elaborate and they influence line limit.
1 parent edba52c commit 75d04ac

File tree

8 files changed

+238
-293
lines changed

8 files changed

+238
-293
lines changed

tests/radix_tree/radix.hpp

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -16,76 +16,73 @@ static std::mt19937_64 generator;
1616
namespace nvobj = pmem::obj;
1717
namespace nvobjex = pmem::obj::experimental;
1818

19-
using container_int =
19+
using cntr_int =
2020
nvobjex::radix_tree<nvobjex::inline_string, nvobj::p<unsigned>>;
21-
using container_string =
21+
using cntr_string =
2222
nvobjex::radix_tree<nvobjex::inline_string, nvobjex::inline_string>;
2323

24-
using container_int_int =
25-
nvobjex::radix_tree<unsigned, nvobj::p<unsigned>,
26-
nvobjex::bytes_view<unsigned>, false>;
27-
using container_int_string =
28-
nvobjex::radix_tree<unsigned, nvobjex::inline_string>;
24+
using cntr_int_int = nvobjex::radix_tree<unsigned, nvobj::p<unsigned>,
25+
nvobjex::bytes_view<unsigned>, false>;
26+
using cntr_int_string = nvobjex::radix_tree<unsigned, nvobjex::inline_string>;
2927

30-
using container_inline_s_wchart =
28+
using cntr_inline_s_wchart =
3129
nvobjex::radix_tree<nvobjex::basic_inline_string<wchar_t>,
3230
nvobj::p<unsigned>>;
33-
using container_inline_s_wchart_wchart =
31+
using cntr_inline_s_wchart_wchart =
3432
nvobjex::radix_tree<nvobjex::basic_inline_string<wchar_t>,
3533
nvobjex::basic_inline_string<wchar_t>>;
36-
using container_inline_s_u8t =
34+
using cntr_inline_s_u8t =
3735
nvobjex::radix_tree<nvobjex::basic_inline_string<uint8_t>,
3836
nvobjex::basic_inline_string<uint8_t>>;
3937

40-
using container_int_mt =
38+
using cntr_int_mt =
4139
nvobjex::radix_tree<nvobjex::inline_string, nvobj::p<unsigned>,
4240
nvobjex::bytes_view<nvobjex::inline_string>, true>;
43-
using container_string_mt =
41+
using cntr_string_mt =
4442
nvobjex::radix_tree<nvobjex::inline_string, nvobjex::inline_string,
4543
nvobjex::bytes_view<nvobjex::inline_string>, true>;
4644

47-
using container_int_int_mt =
45+
using cntr_int_int_mt =
4846
nvobjex::radix_tree<unsigned, nvobj::p<unsigned>,
4947
nvobjex::bytes_view<unsigned>, true>;
50-
using container_int_string_mt =
48+
using cntr_int_string_mt =
5149
nvobjex::radix_tree<unsigned, nvobjex::inline_string,
5250
nvobjex::bytes_view<unsigned>, true>;
5351

54-
using container_inline_s_wchart_mt = nvobjex::radix_tree<
52+
using cntr_inline_s_wchart_mt = nvobjex::radix_tree<
5553
nvobjex::basic_inline_string<wchar_t>, nvobj::p<unsigned>,
5654
nvobjex::bytes_view<nvobjex::basic_inline_string<wchar_t>>, true>;
57-
using container_inline_s_wchart_wchart_mt = nvobjex::radix_tree<
55+
using cntr_inline_s_wchart_wchart_mt = nvobjex::radix_tree<
5856
nvobjex::basic_inline_string<wchar_t>,
5957
nvobjex::basic_inline_string<wchar_t>,
6058
nvobjex::bytes_view<nvobjex::basic_inline_string<wchar_t>>, true>;
61-
using container_inline_s_u8t_mt = nvobjex::radix_tree<
59+
using cntr_inline_s_u8t_mt = nvobjex::radix_tree<
6260
nvobjex::basic_inline_string<uint8_t>,
6361
nvobjex::basic_inline_string<uint8_t>,
6462
nvobjex::bytes_view<nvobjex::basic_inline_string<uint8_t>>, true>;
6563

6664
struct root {
67-
nvobj::persistent_ptr<container_int> radix_int;
68-
nvobj::persistent_ptr<container_string> radix_str;
65+
nvobj::persistent_ptr<cntr_int> radix_int;
66+
nvobj::persistent_ptr<cntr_string> radix_str;
6967

70-
nvobj::persistent_ptr<container_int_int> radix_int_int;
71-
nvobj::persistent_ptr<container_int_string> radix_int_str;
68+
nvobj::persistent_ptr<cntr_int_int> radix_int_int;
69+
nvobj::persistent_ptr<cntr_int_string> radix_int_str;
7270

73-
nvobj::persistent_ptr<container_inline_s_wchart> radix_inline_s_wchart;
74-
nvobj::persistent_ptr<container_inline_s_wchart_wchart>
71+
nvobj::persistent_ptr<cntr_inline_s_wchart> radix_inline_s_wchart;
72+
nvobj::persistent_ptr<cntr_inline_s_wchart_wchart>
7573
radix_inline_s_wchart_wchart;
76-
nvobj::persistent_ptr<container_inline_s_u8t> radix_inline_s_u8t;
74+
nvobj::persistent_ptr<cntr_inline_s_u8t> radix_inline_s_u8t;
7775

78-
nvobj::persistent_ptr<container_int_mt> radix_int_mt;
79-
nvobj::persistent_ptr<container_string_mt> radix_str_mt;
76+
nvobj::persistent_ptr<cntr_int_mt> radix_int_mt;
77+
nvobj::persistent_ptr<cntr_string_mt> radix_str_mt;
8078

81-
nvobj::persistent_ptr<container_int_int_mt> radix_int_int_mt;
82-
nvobj::persistent_ptr<container_int_string_mt> radix_int_str_mt;
79+
nvobj::persistent_ptr<cntr_int_int_mt> radix_int_int_mt;
80+
nvobj::persistent_ptr<cntr_int_string_mt> radix_int_str_mt;
8381

84-
nvobj::persistent_ptr<container_inline_s_wchart_mt>
85-
radix_inline_s_wchart_mt;
86-
nvobj::persistent_ptr<container_inline_s_wchart_wchart_mt>
82+
nvobj::persistent_ptr<cntr_inline_s_wchart_mt> radix_inline_s_wchart_mt;
83+
nvobj::persistent_ptr<cntr_inline_s_wchart_wchart_mt>
8784
radix_inline_s_wchart_wchart_mt;
88-
nvobj::persistent_ptr<container_inline_s_u8t_mt> radix_inline_s_u8t_mt;
85+
nvobj::persistent_ptr<cntr_inline_s_u8t_mt> radix_inline_s_u8t_mt;
8986
};
9087

9188
/* Helper functions to access key/value of different types */

0 commit comments

Comments
 (0)