Skip to content

Commit 5b09632

Browse files
ShamzikShamzik
committed
rewrite flags check
1 parent 13a455e commit 5b09632

File tree

1 file changed

+32
-40
lines changed

1 file changed

+32
-40
lines changed

‎runtime-light/tl/tl-types.cpp‎

Lines changed: 32 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -250,80 +250,72 @@ bool rpcReqResultExtra::fetch(tl::fetcher& tlf, const tl::mask& flags) noexcept
250250
}
251251

252252
void rpcReqResultExtra::store(tl::storer& tls, const tl::mask& flags) const noexcept {
253-
kphp::log::assertion(opt_binlog_pos.has_value() == static_cast<bool>(flags.value & BINLOG_POS_FLAG));
254-
if (opt_binlog_pos.has_value()) {
253+
if (static_cast<bool>(flags.value & BINLOG_POS_FLAG)) {
254+
kphp::log::assertion(opt_binlog_pos.has_value());
255255
opt_binlog_pos->store(tls);
256256
}
257-
kphp::log::assertion(opt_binlog_time.has_value() == static_cast<bool>(flags.value & BINLOG_TIME_FLAG));
258-
if (opt_binlog_time.has_value()) {
257+
if (static_cast<bool>(flags.value & BINLOG_TIME_FLAG)) {
258+
kphp::log::assertion(opt_binlog_time.has_value());
259259
opt_binlog_time->store(tls);
260260
}
261-
kphp::log::assertion(opt_engine_pid.has_value() == static_cast<bool>(flags.value & ENGINE_PID_FLAG));
262-
if (opt_engine_pid.has_value()) {
261+
if (static_cast<bool>(flags.value & ENGINE_PID_FLAG)) {
262+
kphp::log::assertion(opt_engine_pid.has_value());
263263
opt_engine_pid->store(tls);
264264
}
265-
kphp::log::assertion(opt_request_size.has_value() == static_cast<bool>(flags.value & REQUEST_SIZE_FLAG) &&
266-
opt_response_size.has_value() == static_cast<bool>(flags.value & RESPONSE_SIZE_FLAG));
267-
if (opt_request_size.has_value()) {
268-
kphp::log::assertion(opt_response_size.has_value());
265+
if (static_cast<bool>(flags.value & REQUEST_SIZE_FLAG)) {
266+
kphp::log::assertion(opt_request_size.has_value() && static_cast<bool>(flags.value & RESPONSE_SIZE_FLAG) && opt_response_size.has_value());
269267
opt_request_size->store(tls), opt_response_size->store(tls);
270268
}
271-
kphp::log::assertion(opt_failed_subqueries.has_value() == static_cast<bool>(flags.value & FAILED_SUBQUERIES_FLAG));
272-
if (opt_failed_subqueries.has_value()) {
269+
if (static_cast<bool>(flags.value & FAILED_SUBQUERIES_FLAG)) {
270+
kphp::log::assertion(opt_failed_subqueries.has_value());
273271
opt_failed_subqueries->store(tls);
274272
}
275-
kphp::log::assertion(opt_compression_version.has_value() == static_cast<bool>(flags.value & COMPRESSION_VERSION_FLAG));
276-
if (opt_compression_version.has_value()) {
273+
if (static_cast<bool>(flags.value & COMPRESSION_VERSION_FLAG)) {
274+
kphp::log::assertion(opt_compression_version.has_value());
277275
opt_compression_version->store(tls);
278276
}
279-
kphp::log::assertion(opt_stats.has_value() == static_cast<bool>(flags.value & STATS_FLAG));
280-
if (opt_stats.has_value()) {
277+
if (static_cast<bool>(flags.value & STATS_FLAG)) {
278+
kphp::log::assertion(opt_stats.has_value());
281279
opt_stats->store(tls);
282280
}
283-
kphp::log::assertion(opt_epoch_number.has_value() == static_cast<bool>(flags.value & EPOCH_NUMBER_FLAG) &&
284-
opt_view_number.has_value() == static_cast<bool>(flags.value & VIEW_NUMBER_FLAG));
285-
if (opt_epoch_number.has_value()) {
286-
kphp::log::assertion(opt_view_number.has_value());
281+
if (static_cast<bool>(flags.value & EPOCH_NUMBER_FLAG)) {
282+
kphp::log::assertion(opt_epoch_number.has_value() && static_cast<bool>(flags.value & VIEW_NUMBER_FLAG) && opt_view_number.has_value());
287283
opt_epoch_number->store(tls), opt_view_number->store(tls);
288284
}
289285
}
290286

291287
size_t rpcReqResultExtra::footprint(const tl::mask& flags) const noexcept {
292288
size_t footprint{};
293-
kphp::log::assertion(opt_binlog_pos.has_value() == static_cast<bool>(flags.value & BINLOG_POS_FLAG));
294-
if (opt_binlog_pos.has_value()) {
289+
if (static_cast<bool>(flags.value & BINLOG_POS_FLAG)) {
290+
kphp::log::assertion(opt_binlog_pos.has_value());
295291
footprint += opt_binlog_pos->footprint();
296292
}
297-
kphp::log::assertion(opt_binlog_time.has_value() == static_cast<bool>(flags.value & BINLOG_TIME_FLAG));
298-
if (opt_binlog_time.has_value()) {
293+
if (static_cast<bool>(flags.value & BINLOG_TIME_FLAG)) {
294+
kphp::log::assertion(opt_binlog_time.has_value());
299295
footprint += opt_binlog_time->footprint();
300296
}
301-
kphp::log::assertion(opt_engine_pid.has_value() == static_cast<bool>(flags.value & ENGINE_PID_FLAG));
302-
if (opt_engine_pid.has_value()) {
297+
if (static_cast<bool>(flags.value & ENGINE_PID_FLAG)) {
298+
kphp::log::assertion(opt_engine_pid.has_value());
303299
footprint += opt_engine_pid->footprint();
304300
}
305-
kphp::log::assertion(opt_request_size.has_value() == static_cast<bool>(flags.value & REQUEST_SIZE_FLAG) &&
306-
opt_response_size.has_value() == static_cast<bool>(flags.value & RESPONSE_SIZE_FLAG));
307-
if (opt_request_size.has_value()) {
308-
kphp::log::assertion(opt_response_size.has_value());
301+
if (static_cast<bool>(flags.value & REQUEST_SIZE_FLAG)) {
302+
kphp::log::assertion(opt_request_size.has_value() && static_cast<bool>(flags.value & RESPONSE_SIZE_FLAG) && opt_response_size.has_value());
309303
footprint += opt_request_size->footprint() + opt_response_size->footprint();
310304
}
311-
kphp::log::assertion(opt_failed_subqueries.has_value() == static_cast<bool>(flags.value & FAILED_SUBQUERIES_FLAG));
312-
if (opt_failed_subqueries.has_value()) {
305+
if (static_cast<bool>(flags.value & FAILED_SUBQUERIES_FLAG)) {
306+
kphp::log::assertion(opt_failed_subqueries.has_value());
313307
footprint += opt_failed_subqueries->footprint();
314308
}
315-
kphp::log::assertion(opt_compression_version.has_value() == static_cast<bool>(flags.value & COMPRESSION_VERSION_FLAG));
316-
if (opt_compression_version.has_value()) {
309+
if (static_cast<bool>(flags.value & COMPRESSION_VERSION_FLAG)) {
310+
kphp::log::assertion(opt_compression_version.has_value());
317311
footprint += opt_compression_version->footprint();
318312
}
319-
kphp::log::assertion(opt_stats.has_value() == static_cast<bool>(flags.value & STATS_FLAG));
320-
if (opt_stats.has_value()) {
313+
if (static_cast<bool>(flags.value & STATS_FLAG)) {
314+
kphp::log::assertion(opt_stats.has_value());
321315
footprint += opt_stats->footprint();
322316
}
323-
kphp::log::assertion(opt_epoch_number.has_value() == static_cast<bool>(flags.value & EPOCH_NUMBER_FLAG) &&
324-
opt_view_number.has_value() == static_cast<bool>(flags.value & VIEW_NUMBER_FLAG));
325-
if (opt_epoch_number.has_value()) {
326-
kphp::log::assertion(opt_view_number.has_value());
317+
if (static_cast<bool>(flags.value & EPOCH_NUMBER_FLAG)) {
318+
kphp::log::assertion(opt_epoch_number.has_value() && static_cast<bool>(flags.value & VIEW_NUMBER_FLAG) && opt_view_number.has_value());
327319
footprint += opt_epoch_number->footprint() + opt_view_number->footprint();
328320
}
329321
return footprint;

0 commit comments

Comments
 (0)