Skip to content

Commit 38654cf

Browse files
evoskuilevoskuil
committed
Refactor aggregates into maps/nomaps, generalize col names.
1 parent 59ad1e1 commit 38654cf

31 files changed

Lines changed: 1612 additions & 1735 deletions

‎Makefile.am‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ include_bitcoin_database_memory_HEADERS = \
293293
include/bitcoin/database/memory/accessor.hpp \
294294
include/bitcoin/database/memory/finalizer.hpp \
295295
include/bitcoin/database/memory/map.hpp \
296+
include/bitcoin/database/memory/maps.hpp \
296297
include/bitcoin/database/memory/memory.hpp \
297298
include/bitcoin/database/memory/reader.hpp \
298299
include/bitcoin/database/memory/streamers.hpp \
@@ -315,11 +316,11 @@ include_bitcoin_database_primitives_HEADERS = \
315316
include/bitcoin/database/primitives/manager.hpp \
316317
include/bitcoin/database/primitives/nohead.hpp \
317318
include/bitcoin/database/primitives/nomap.hpp \
319+
include/bitcoin/database/primitives/nomaps.hpp \
318320
include/bitcoin/database/primitives/primitives.hpp
319321

320322
include_bitcoin_database_tablesdir = ${includedir}/bitcoin/database/tables
321323
include_bitcoin_database_tables_HEADERS = \
322-
include/bitcoin/database/tables/aggregate.hpp \
323324
include/bitcoin/database/tables/context.hpp \
324325
include/bitcoin/database/tables/event.hpp \
325326
include/bitcoin/database/tables/names.hpp \

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@
157157
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\memory.hpp" />
158158
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\storage.hpp" />
159159
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\map.hpp" />
160+
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\maps.hpp" />
160161
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\memory.hpp" />
161162
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\reader.hpp" />
162163
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\streamers.hpp" />
@@ -171,11 +172,11 @@
171172
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\manager.hpp" />
172173
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nohead.hpp" />
173174
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomap.hpp" />
175+
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomaps.hpp" />
174176
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\primitives.hpp" />
175177
<ClInclude Include="..\..\..\..\include\bitcoin\database\query.hpp" />
176178
<ClInclude Include="..\..\..\..\include\bitcoin\database\settings.hpp" />
177179
<ClInclude Include="..\..\..\..\include\bitcoin\database\store.hpp" />
178-
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\aggregate.hpp" />
179180
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\header.hpp" />
180181
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\input.hpp" />
181182
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\ins.hpp" />

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,9 @@
191191
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\map.hpp">
192192
<Filter>include\bitcoin\database\memory</Filter>
193193
</ClInclude>
194+
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\maps.hpp">
195+
<Filter>include\bitcoin\database\memory</Filter>
196+
</ClInclude>
194197
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\memory.hpp">
195198
<Filter>include\bitcoin\database\memory</Filter>
196199
</ClInclude>
@@ -233,6 +236,9 @@
233236
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomap.hpp">
234237
<Filter>include\bitcoin\database\primitives</Filter>
235238
</ClInclude>
239+
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomaps.hpp">
240+
<Filter>include\bitcoin\database\primitives</Filter>
241+
</ClInclude>
236242
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\primitives.hpp">
237243
<Filter>include\bitcoin\database\primitives</Filter>
238244
</ClInclude>
@@ -245,9 +251,6 @@
245251
<ClInclude Include="..\..\..\..\include\bitcoin\database\store.hpp">
246252
<Filter>include\bitcoin\database</Filter>
247253
</ClInclude>
248-
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\aggregate.hpp">
249-
<Filter>include\bitcoin\database\tables</Filter>
250-
</ClInclude>
251254
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\header.hpp">
252255
<Filter>include\bitcoin\database\tables\archives</Filter>
253256
</ClInclude>

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,7 @@
157157
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\memory.hpp" />
158158
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\interfaces\storage.hpp" />
159159
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\map.hpp" />
160+
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\maps.hpp" />
160161
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\memory.hpp" />
161162
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\reader.hpp" />
162163
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\streamers.hpp" />
@@ -171,11 +172,11 @@
171172
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\manager.hpp" />
172173
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nohead.hpp" />
173174
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomap.hpp" />
175+
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomaps.hpp" />
174176
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\primitives.hpp" />
175177
<ClInclude Include="..\..\..\..\include\bitcoin\database\query.hpp" />
176178
<ClInclude Include="..\..\..\..\include\bitcoin\database\settings.hpp" />
177179
<ClInclude Include="..\..\..\..\include\bitcoin\database\store.hpp" />
178-
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\aggregate.hpp" />
179180
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\header.hpp" />
180181
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\input.hpp" />
181182
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\ins.hpp" />

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,9 @@
191191
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\map.hpp">
192192
<Filter>include\bitcoin\database\memory</Filter>
193193
</ClInclude>
194+
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\maps.hpp">
195+
<Filter>include\bitcoin\database\memory</Filter>
196+
</ClInclude>
194197
<ClInclude Include="..\..\..\..\include\bitcoin\database\memory\memory.hpp">
195198
<Filter>include\bitcoin\database\memory</Filter>
196199
</ClInclude>
@@ -233,6 +236,9 @@
233236
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomap.hpp">
234237
<Filter>include\bitcoin\database\primitives</Filter>
235238
</ClInclude>
239+
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\nomaps.hpp">
240+
<Filter>include\bitcoin\database\primitives</Filter>
241+
</ClInclude>
236242
<ClInclude Include="..\..\..\..\include\bitcoin\database\primitives\primitives.hpp">
237243
<Filter>include\bitcoin\database\primitives</Filter>
238244
</ClInclude>
@@ -245,9 +251,6 @@
245251
<ClInclude Include="..\..\..\..\include\bitcoin\database\store.hpp">
246252
<Filter>include\bitcoin\database</Filter>
247253
</ClInclude>
248-
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\aggregate.hpp">
249-
<Filter>include\bitcoin\database\tables</Filter>
250-
</ClInclude>
251254
<ClInclude Include="..\..\..\..\include\bitcoin\database\tables\archives\header.hpp">
252255
<Filter>include\bitcoin\database\tables\archives</Filter>
253256
</ClInclude>

‎include/bitcoin/database.hpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
#include <bitcoin/database/memory/accessor.hpp>
3333
#include <bitcoin/database/memory/finalizer.hpp>
3434
#include <bitcoin/database/memory/map.hpp>
35+
#include <bitcoin/database/memory/maps.hpp>
3536
#include <bitcoin/database/memory/memory.hpp>
3637
#include <bitcoin/database/memory/reader.hpp>
3738
#include <bitcoin/database/memory/streamers.hpp>
@@ -48,8 +49,8 @@
4849
#include <bitcoin/database/primitives/manager.hpp>
4950
#include <bitcoin/database/primitives/nohead.hpp>
5051
#include <bitcoin/database/primitives/nomap.hpp>
52+
#include <bitcoin/database/primitives/nomaps.hpp>
5153
#include <bitcoin/database/primitives/primitives.hpp>
52-
#include <bitcoin/database/tables/aggregate.hpp>
5354
#include <bitcoin/database/tables/context.hpp>
5455
#include <bitcoin/database/tables/event.hpp>
5556
#include <bitcoin/database/tables/names.hpp>

‎include/bitcoin/database/impl/query/batch/ecdsa.ipp‎

Lines changed: 32 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ namespace database {
2727

2828
TEMPLATE
2929
bool CLASS::verify_ecdsa_signatures(const stopper& cancel,
30-
header_links& links) NOEXCEPT
30+
header_links& ) NOEXCEPT
3131
{
3232
// False return only implies canceled.
33-
using batch = system::ecdsa::batch;
34-
const auto count = store_.ecdsa.count().value;
35-
const auto ptr = store_.ecdsa.get_memory();
36-
const auto rows = system::pointer_cast<const batch>(ptr->data());
37-
links = batch::verify(cancel, { rows, count });
33+
////using batch = system::ecdsa::batch;
34+
////const auto count = store_.ecdsa.count().value;
35+
////const auto ptr = store_.ecdsa.get_memory();
36+
////const auto rows = system::pointer_cast<const batch>(ptr->data());
37+
////links = batch::verify(cancel, { rows, count });
3838
return !cancel;
3939
}
4040

@@ -46,48 +46,50 @@ bool CLASS::purge_ecdsa_signatures() NOEXCEPT
4646
{
4747
// ========================================================================
4848
const auto scope = store_.get_transactor();
49-
return store_.ecdsa.truncate(0);
49+
return true; ////store_.ecdsa.truncate(0);
5050
// ========================================================================
5151
}
5252

5353
TEMPLATE
54-
bool CLASS::set_signature(const hash_digest& digest, const ec_compressed& point,
55-
const ec_signature& signature, uint16_t id, const header_link& link) NOEXCEPT
54+
bool CLASS::set_signature(const hash_digest& , const ec_compressed& ,
55+
const ec_signature& , uint16_t , const header_link& ) NOEXCEPT
5656
{
5757
// ========================================================================
5858
const auto scope = store_.get_transactor();
5959

6060
// Clean single allocation failure (e.g. disk full).
61-
return store_.ecdsa.put(table::ecdsa::put_single_ref
62-
{
63-
{},
64-
digest,
65-
point,
66-
signature,
67-
id,
68-
link
69-
});
61+
////return store_.ecdsa.put(table::ecdsa::put_single_ref
62+
////{
63+
//// {},
64+
//// digest,
65+
//// point,
66+
//// signature,
67+
//// id,
68+
//// link
69+
////});
70+
return {};
7071
// ========================================================================
7172
}
7273

7374
TEMPLATE
74-
bool CLASS::set_signatures(const hash_digest& digest,
75-
const ec_compresseds& keys, const ec_signatures& sigs, uint16_t id,
76-
const header_link& link) NOEXCEPT
75+
bool CLASS::set_signatures(const hash_digest& ,
76+
const ec_compresseds& , const ec_signatures& , uint16_t ,
77+
const header_link& ) NOEXCEPT
7778
{
7879
// ========================================================================
7980
const auto scope = store_.get_transactor();
8081

8182
// Clean single allocation failure (e.g. disk full).
82-
return store_.ecdsa.put(table::ecdsa::put_multiple_ref
83-
{
84-
{},
85-
digest,
86-
keys,
87-
sigs,
88-
id,
89-
link
90-
});
83+
////return store_.ecdsa.put(table::ecdsa::put_multiple_ref
84+
////{
85+
//// {},
86+
//// digest,
87+
//// keys,
88+
//// sigs,
89+
//// id,
90+
//// link
91+
////});
92+
return {};
9193
// ========================================================================
9294
}
9395

‎include/bitcoin/database/impl/query/batch/schnorr.ipp‎

Lines changed: 29 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,14 @@ namespace database {
2727

2828
TEMPLATE
2929
bool CLASS::verify_schnorr_signatures(const stopper& cancel,
30-
header_links& links) NOEXCEPT
30+
header_links& ) NOEXCEPT
3131
{
3232
// False return only implies canceled.
33-
using batch = system::schnorr::batch;
34-
const auto count = store_.schnorr.count().value;
35-
const auto ptr = store_.schnorr.get_memory();
36-
const auto rows = system::pointer_cast<const batch>(ptr->data());
37-
links = batch::verify(cancel, { rows, count });
33+
////using batch = system::schnorr::batch;
34+
////const auto count = store_.schnorr.count().value;
35+
////const auto ptr = store_.schnorr.get_memory();
36+
////const auto rows = system::pointer_cast<const batch>(ptr->data());
37+
////links = batch::verify(cancel, { rows, count });
3838
return !cancel;
3939
}
4040

@@ -46,46 +46,48 @@ bool CLASS::purge_schnorr_signatures() NOEXCEPT
4646
{
4747
// ========================================================================
4848
const auto scope = store_.get_transactor();
49-
return store_.schnorr.truncate(0);
49+
return true; ////store_.schnorr.truncate(0);
5050
// ========================================================================
5151
}
5252

5353

5454
TEMPLATE
55-
bool CLASS::set_signature(const hash_digest& digest, const ec_xonly& point,
56-
const ec_signature& signature, uint16_t id, const header_link& link) NOEXCEPT
55+
bool CLASS::set_signature(const hash_digest& , const ec_xonly& ,
56+
const ec_signature& , uint16_t , const header_link& ) NOEXCEPT
5757
{
5858
// ========================================================================
5959
const auto scope = store_.get_transactor();
6060

6161
// Clean single allocation failure (e.g. disk full).
62-
return store_.schnorr.put(table::schnorr::put_single_ref
63-
{
64-
{},
65-
digest,
66-
point,
67-
signature,
68-
id,
69-
link
70-
});
62+
////return store_.schnorr.put(table::schnorr::put_single_ref
63+
////{
64+
//// {},
65+
//// digest,
66+
//// point,
67+
//// signature,
68+
//// id,
69+
//// link
70+
////});
71+
return {};
7172
// ========================================================================
7273
}
7374

7475
TEMPLATE
75-
bool CLASS::set_signatures(const threshold& batch, uint16_t id,
76-
const header_link& link) NOEXCEPT
76+
bool CLASS::set_signatures(const threshold& , uint16_t ,
77+
const header_link& ) NOEXCEPT
7778
{
7879
// ========================================================================
7980
const auto scope = store_.get_transactor();
8081

8182
// Clean single allocation failure (e.g. disk full).
82-
return store_.schnorr.put(table::schnorr::put_multiple_ref
83-
{
84-
{},
85-
batch,
86-
id,
87-
link
88-
});
83+
////return store_.schnorr.put(table::schnorr::put_multiple_ref
84+
////{
85+
//// {},
86+
//// batch,
87+
//// id,
88+
//// link
89+
////});
90+
return {};
8991
// ========================================================================
9092
}
9193

0 commit comments

Comments
 (0)