Skip to content

Commit 3dc275f

Browse files
evoskuilevoskuil
committed
Parse and integrate database.turbo setting and ?turbo=true param.
1 parent 3bdcf31 commit 3dc275f

File tree

4 files changed

+68
-42
lines changed

4 files changed

+68
-42
lines changed

‎include/bitcoin/node/protocols/protocol_explore.hpp‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -134,34 +134,33 @@ class BCN_API protocol_explore
134134

135135
bool handle_get_address(const code& ec, interface::address,
136136
uint8_t version, uint8_t media,
137-
const system::hash_cptr& hash) NOEXCEPT;
137+
const system::hash_cptr& hash, bool turbo) NOEXCEPT;
138138
bool handle_get_address_confirmed(const code& ec,
139139
interface::address_confirmed, uint8_t version, uint8_t media,
140-
const system::hash_cptr& hash) NOEXCEPT;
140+
const system::hash_cptr& hash, bool turbo) NOEXCEPT;
141141
bool handle_get_address_unconfirmed(const code& ec,
142142
interface::address_unconfirmed, uint8_t version, uint8_t media,
143-
const system::hash_cptr& hash) NOEXCEPT;
143+
const system::hash_cptr& hash, bool turbo) NOEXCEPT;
144144
bool handle_get_address_balance(const code& ec,
145145
interface::address_balance, uint8_t version, uint8_t media,
146-
const system::hash_cptr& hash) NOEXCEPT;
146+
const system::hash_cptr& hash, bool turbo) NOEXCEPT;
147147

148148
private:
149149
using balance_handler = std::function<void(code, uint8_t, uint64_t)>;
150150
using address_handler = std::function<void(code, uint8_t,
151151
database::outpoints&&)>;
152152

153-
void do_get_address(uint8_t media, const system::hash_cptr& hash,
154-
const address_handler& handler) NOEXCEPT;
155-
void do_get_address_confirmed(uint8_t media, const system::hash_cptr& hash,
156-
const address_handler& handler) NOEXCEPT;
157-
void do_get_address_unconfirmed(uint8_t media,
158-
const system::hash_cptr& hash,
159-
const address_handler& handler) NOEXCEPT;
153+
void do_get_address(uint8_t media, bool turbo,
154+
const system::hash_cptr& hash, const address_handler& handler) NOEXCEPT;
155+
void do_get_address_confirmed(uint8_t media, bool turbo,
156+
const system::hash_cptr& hash, const address_handler& handler) NOEXCEPT;
157+
void do_get_address_unconfirmed(uint8_t media, bool turbo,
158+
const system::hash_cptr& hash, const address_handler& handler) NOEXCEPT;
160159
void complete_get_address(const code& ec, uint8_t media,
161160
const database::outpoints& set) NOEXCEPT;
162161

163-
void do_get_address_balance(uint8_t media, const system::hash_cptr& hash,
164-
const balance_handler& handler) NOEXCEPT;
162+
void do_get_address_balance(uint8_t media, bool turbo,
163+
const system::hash_cptr& hash, const balance_handler& handler) NOEXCEPT;
165164
void complete_get_address_balance(const code& ec, uint8_t media,
166165
const uint64_t balance) NOEXCEPT;
167166

‎src/parse/query.cpp‎

Lines changed: 28 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@ using namespace system;
2727
using namespace network;
2828
using namespace network::http;
2929

30+
BC_PUSH_WARNING(NO_ARRAY_INDEXING)
31+
BC_PUSH_WARNING(NO_THROW_IN_NOEXCEPT)
32+
3033
bool parse_query(rpc::request_t& out, const request& request) NOEXCEPT
3134
{
3235
wallet::uri uri{};
@@ -45,15 +48,30 @@ bool parse_query(rpc::request_t& out, const request& request) NOEXCEPT
4548
return false;
4649

4750
auto& params = std::get<rpc::object_t>(out.params.value());
48-
const auto& witness = query["witness"];
4951

50-
// Validate prper bool value if set.
51-
if (!witness.empty() && witness != "true" && witness != "false")
52-
return false;
52+
// Validate proper witness bool value if set.
53+
const auto witness = query.find("witness");
54+
if (witness != query.end())
55+
{
56+
if (witness->second != "true" && witness->second != "false")
57+
return false;
5358

54-
// Witness is optional<true> (where applicable) so only set if false.
55-
if (witness == "false")
56-
params["witness"] = false;
59+
// Witness is optional<true> (where applicable), so only set if false.
60+
if (witness->second == "false")
61+
params["witness"] = false;
62+
}
63+
64+
// Validate proper turbo bool value if set.
65+
const auto turbo = query.find("turbo");
66+
if (turbo != query.end())
67+
{
68+
if (turbo->second != "true" && turbo->second != "false")
69+
return false;
70+
71+
// Turbo is optional<true> (where applicable), so only set if false.
72+
if (turbo->second == "false")
73+
params["turbo"] = false;
74+
}
5775

5876
const auto accepts = to_media_types((request)[field::accept]);
5977

@@ -80,5 +98,8 @@ bool parse_query(rpc::request_t& out, const request& request) NOEXCEPT
8098
return true;
8199
}
82100

101+
BC_POP_WARNING()
102+
BC_POP_WARNING()
103+
83104
} // namespace node
84105
} // namespace libbitcoin

‎src/parser.cpp‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1125,6 +1125,11 @@ options_metadata parser::load_settings() THROWS
11251125
value<std::filesystem::path>(&configured.database.path),
11261126
"The blockchain database directory, defaults to 'blockchain'."
11271127
)
1128+
(
1129+
"database.turbo",
1130+
value<bool>(&configured.database.turbo),
1131+
"Allow indiviudal non-validation queries to use all CPUs, defaults to false."
1132+
)
11281133

11291134
/* header */
11301135
(

‎src/protocols/protocol_explore.cpp‎

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -107,10 +107,10 @@ void protocol_explore::start() NOEXCEPT
107107
SUBSCRIBE_EXPLORE(handle_get_output_spender, _1, _2, _3, _4, _5, _6);
108108
SUBSCRIBE_EXPLORE(handle_get_output_spenders, _1, _2, _3, _4, _5, _6);
109109

110-
SUBSCRIBE_EXPLORE(handle_get_address, _1, _2, _3, _4, _5);
111-
SUBSCRIBE_EXPLORE(handle_get_address_confirmed, _1, _2, _3, _4, _5);
112-
SUBSCRIBE_EXPLORE(handle_get_address_unconfirmed, _1, _2, _3, _4, _5);
113-
SUBSCRIBE_EXPLORE(handle_get_address_balance, _1, _2, _3, _4, _5);
110+
SUBSCRIBE_EXPLORE(handle_get_address, _1, _2, _3, _4, _5, _6);
111+
SUBSCRIBE_EXPLORE(handle_get_address_confirmed, _1, _2, _3, _4, _5, _6);
112+
SUBSCRIBE_EXPLORE(handle_get_address_unconfirmed, _1, _2, _3, _4, _5, _6);
113+
SUBSCRIBE_EXPLORE(handle_get_address_balance, _1, _2, _3, _4, _5, _6);
114114
protocol_html::start();
115115
}
116116

@@ -935,7 +935,7 @@ bool protocol_explore::handle_get_output_spenders(const code& ec,
935935
// ----------------------------------------------------------------------------
936936

937937
bool protocol_explore::handle_get_address(const code& ec, interface::address,
938-
uint8_t, uint8_t media, const hash_cptr& hash) NOEXCEPT
938+
uint8_t, uint8_t media, const hash_cptr& hash, bool turbo) NOEXCEPT
939939
{
940940
if (stopped(ec))
941941
return false;
@@ -947,16 +947,17 @@ bool protocol_explore::handle_get_address(const code& ec, interface::address,
947947
}
948948

949949
address_handler complete = BIND(complete_get_address, _1, _2, _3);
950-
PARALLEL(do_get_address, media, hash, std::move(complete));
950+
PARALLEL(do_get_address, media, turbo, hash, std::move(complete));
951951
return true;
952952
}
953953

954954
// private
955-
void protocol_explore::do_get_address(uint8_t media, const hash_cptr& hash,
956-
const address_handler& handler) NOEXCEPT
955+
void protocol_explore::do_get_address(uint8_t media, bool turbo,
956+
const hash_cptr& hash, const address_handler& handler) NOEXCEPT
957957
{
958958
outpoints set{};
959-
if (const auto ec = archive().get_address_outputs(stopping_, set, *hash))
959+
if (const auto ec = archive().get_address_outputs(stopping_, set,
960+
*hash, turbo))
960961
{
961962
handler(ec, {}, {});
962963
return;
@@ -965,7 +966,7 @@ void protocol_explore::do_get_address(uint8_t media, const hash_cptr& hash,
965966
handler(network::error::success, media, std::move(set));
966967
}
967968

968-
// This is shared by the tree get_address.. methods.
969+
// This is shared by the three get_address... methods.
969970
void protocol_explore::complete_get_address(const code& ec, uint8_t media,
970971
const outpoints& set) NOEXCEPT
971972
{
@@ -1008,7 +1009,7 @@ void protocol_explore::complete_get_address(const code& ec, uint8_t media,
10081009

10091010
bool protocol_explore::handle_get_address_confirmed(const code& ec,
10101011
interface::address_confirmed, uint8_t, uint8_t media,
1011-
const hash_cptr& hash) NOEXCEPT
1012+
const hash_cptr& hash, bool turbo) NOEXCEPT
10121013
{
10131014
if (stopped(ec))
10141015
return false;
@@ -1020,17 +1021,17 @@ bool protocol_explore::handle_get_address_confirmed(const code& ec,
10201021
}
10211022

10221023
address_handler complete = BIND(complete_get_address, _1, _2, _3);
1023-
PARALLEL(do_get_address_confirmed, media, hash, std::move(complete));
1024+
PARALLEL(do_get_address_confirmed, media, turbo, hash, std::move(complete));
10241025
return true;
10251026
}
10261027

10271028
// private
1028-
void protocol_explore::do_get_address_confirmed(uint8_t media,
1029+
void protocol_explore::do_get_address_confirmed(uint8_t media, bool turbo,
10291030
const hash_cptr& hash, const address_handler& handler) NOEXCEPT
10301031
{
10311032
outpoints set{};
1032-
if (const auto ec = archive().get_confirmed_unspent_outputs(stopping_, set,
1033-
*hash))
1033+
if (const auto ec = archive().get_confirmed_unspent_outputs(stopping_,
1034+
set, *hash, turbo))
10341035
{
10351036
handler(ec, {}, {});
10361037
return;
@@ -1044,7 +1045,7 @@ void protocol_explore::do_get_address_confirmed(uint8_t media,
10441045

10451046
bool protocol_explore::handle_get_address_unconfirmed(const code& ec,
10461047
interface::address_unconfirmed, uint8_t, uint8_t media,
1047-
const hash_cptr& hash) NOEXCEPT
1048+
const hash_cptr& hash, bool turbo) NOEXCEPT
10481049
{
10491050
if (stopped(ec))
10501051
return false;
@@ -1054,11 +1055,11 @@ bool protocol_explore::handle_get_address_unconfirmed(const code& ec,
10541055
return true;
10551056

10561057
address_handler complete = BIND(complete_get_address, _1, _2, _3);
1057-
PARALLEL(do_get_address_unconfirmed, media, hash, std::move(complete));
1058+
PARALLEL(do_get_address_unconfirmed, media, turbo, hash, std::move(complete));
10581059
return true;
10591060
}
10601061

1061-
void protocol_explore::do_get_address_unconfirmed(uint8_t media,
1062+
void protocol_explore::do_get_address_unconfirmed(uint8_t media, bool,
10621063
const system::hash_cptr&, const address_handler& handler) NOEXCEPT
10631064
{
10641065
handler(network::error::success, media, {});
@@ -1069,7 +1070,7 @@ void protocol_explore::do_get_address_unconfirmed(uint8_t media,
10691070

10701071
bool protocol_explore::handle_get_address_balance(const code& ec,
10711072
interface::address_balance, uint8_t, uint8_t media,
1072-
const hash_cptr& hash) NOEXCEPT
1073+
const hash_cptr& hash, bool turbo) NOEXCEPT
10731074
{
10741075
if (stopped(ec))
10751076
return false;
@@ -1082,16 +1083,16 @@ bool protocol_explore::handle_get_address_balance(const code& ec,
10821083
}
10831084

10841085
balance_handler complete = BIND(complete_get_address_balance, _1, _2, _3);
1085-
PARALLEL(do_get_address_balance, media, hash, std::move(complete));
1086+
PARALLEL(do_get_address_balance, media, turbo, hash, std::move(complete));
10861087
return true;
10871088
}
10881089

1089-
void protocol_explore::do_get_address_balance(uint8_t media,
1090+
void protocol_explore::do_get_address_balance(uint8_t media, bool turbo,
10901091
const system::hash_cptr& hash, const balance_handler& handler) NOEXCEPT
10911092
{
10921093
uint64_t balance{};
10931094
if (const auto ec = archive().get_confirmed_balance(stopping_, balance,
1094-
*hash))
1095+
*hash, turbo))
10951096
{
10961097
handler(ec, {}, {});
10971098
return;

0 commit comments

Comments
 (0)