[k2] fix error with double store of tl::mask in tl::rpcReqResultExtra

Author: apolyakov

runtime-light/server/rpc/init-functions.cpp

@@ -210,7 +210,7 @@ void init_server(kphp::component::stream&& request_stream, kphp::stl::vector<std
     superglobals.v$_SERVER.set_value(string{RPC_ACTOR_ID.data(), RPC_ACTOR_ID.size()}, (*invoke_rpc.opt_actor_id).value);
   }
   if (invoke_rpc.opt_extra) {
-    superglobals.v$_SERVER.set_value(string{RPC_EXTRA_FLAGS.data(), RPC_EXTRA_FLAGS.size()}, static_cast<int64_t>((*invoke_rpc.opt_extra).get_flags().value));
+    superglobals.v$_SERVER.set_value(string{RPC_EXTRA_FLAGS.data(), RPC_EXTRA_FLAGS.size()}, static_cast<int64_t>((*invoke_rpc.opt_extra).flags.value));
     process_rpc_invoke_req_extra(*invoke_rpc.opt_extra, superglobals);
   }
   kphp::log::info("rpc server initialized with: "
@@ -222,7 +222,7 @@ void init_server(kphp::component::stream&& request_stream, kphp::stl::vector<std
                   "request -> {:#x}",
                   invoke_rpc.net_pid.get_pid(), invoke_rpc.net_pid.get_port(), invoke_rpc.query_id.value,
                   invoke_rpc.opt_actor_id.has_value() ? (*invoke_rpc.opt_actor_id).value : 0,
-                  invoke_rpc.opt_extra.has_value() ? (*invoke_rpc.opt_extra).get_flags().value : 0, request_magic.value);
+                  invoke_rpc.opt_extra.has_value() ? (*invoke_rpc.opt_extra).flags.value : 0, request_magic.value);
 }
 
 } // namespace kphp::rpc

runtime-light/stdlib/rpc/rpc-api.h

@@ -269,7 +269,7 @@ inline kphp::coro::task<> f$rpc_server_store_response(class_instance<C$VK$TL$Rpc
   // as we are in a coroutine, we must own the data to prevent it from being overwritten by another coroutine,
   // so create a TLBuffer owned by this coroutine
   auto& rpc_server_instance_st{RpcServerInstanceState::get()};
-  tl::K2RpcResponse rpc_response{.value = tl::k2RpcResponseHeader{.flags = {}, .extra = {}, .result = rpc_server_instance_st.tl_storer.view()}};
+  tl::K2RpcResponse rpc_response{.value = tl::k2RpcResponseHeader{.extra = {}, .result = rpc_server_instance_st.tl_storer.view()}};
   tl::storer tls{rpc_response.footprint()};
   rpc_response.store(tls);
 

runtime-light/tl/tl-types.cpp

@@ -147,7 +147,6 @@ bool CertInfoItem::fetch(tl::fetcher& tlf) noexcept {
 // ===== RPC =====
 
 bool rpcInvokeReqExtra::fetch(tl::fetcher& tlf) noexcept {
-  tl::mask flags{};
   bool ok{flags.fetch(tlf)};
   if (ok && static_cast<bool>(flags.value & WAIT_BINLOG_POS_FLAG)) {
     ok &= opt_wait_binlog_pos.emplace().fetch(tlf);
@@ -194,31 +193,6 @@ bool rpcInvokeReqExtra::fetch(tl::fetcher& tlf) noexcept {
   return ok;
 }
 
-tl::mask rpcInvokeReqExtra::get_flags() const noexcept {
-  tl::mask flags{.value = static_cast<tl::mask::underlying_type>(return_binlog_pos)};
-
-  flags.value |= static_cast<tl::mask::underlying_type>(return_binlog_time) << 1;
-  flags.value |= static_cast<tl::mask::underlying_type>(return_pid) << 2;
-  flags.value |= static_cast<tl::mask::underlying_type>(return_request_sizes) << 3;
-  flags.value |= static_cast<tl::mask::underlying_type>(return_failed_subqueries) << 4;
-  flags.value |= static_cast<tl::mask::underlying_type>(return_query_stats) << 6;
-  flags.value |= static_cast<tl::mask::underlying_type>(no_result) << 7;
-  flags.value |= static_cast<tl::mask::underlying_type>(return_view_number) << 27;
-
-  flags.value |= static_cast<tl::mask::underlying_type>(opt_wait_binlog_pos.has_value()) << 16;
-  flags.value |= static_cast<tl::mask::underlying_type>(opt_string_forward_keys.has_value()) << 18;
-  flags.value |= static_cast<tl::mask::underlying_type>(opt_int_forward_keys.has_value()) << 19;
-  flags.value |= static_cast<tl::mask::underlying_type>(opt_string_forward.has_value()) << 20;
-  flags.value |= static_cast<tl::mask::underlying_type>(opt_int_forward.has_value()) << 21;
-  flags.value |= static_cast<tl::mask::underlying_type>(opt_custom_timeout_ms.has_value()) << 23;
-  flags.value |= static_cast<tl::mask::underlying_type>(opt_supported_compression_version.has_value()) << 25;
-  flags.value |= static_cast<tl::mask::underlying_type>(opt_random_delay.has_value()) << 26;
-  flags.value |= static_cast<tl::mask::underlying_type>(opt_persistent_query.has_value()) << 28;
-  flags.value |= static_cast<tl::mask::underlying_type>(opt_trace_context.has_value()) << 29;
-  flags.value |= static_cast<tl::mask::underlying_type>(opt_execution_context.has_value()) << 30;
-  return flags;
-}
-
 void rpcReqResultExtra::store(tl::storer& tls) const noexcept {
   flags.store(tls);
   if (static_cast<bool>(flags.value & BINLOG_POS_FLAG)) {

runtime-light/tl/tl-types.h

@@ -1094,6 +1094,7 @@ class rpcInvokeReqExtra final {
   static constexpr uint32_t EXECUTION_CONTEXT_FLAG = vk::tl::common::rpc_invoke_req_extra_flags::execution_context;
 
 public:
+  tl::mask flags{};
   bool return_binlog_pos{};
   bool return_binlog_time{};
   bool return_pid{};
@@ -1115,8 +1116,6 @@ class rpcInvokeReqExtra final {
   bool return_view_number{};
 
   bool fetch(tl::fetcher& tlf) noexcept;
-
-  tl::mask get_flags() const noexcept;
 };
 
 struct RpcInvokeReqExtra final {
@@ -1180,16 +1179,15 @@ struct k2RpcResponseError final {
 };
 
 struct k2RpcResponseHeader final {
-  tl::mask flags{};
   tl::rpcReqResultExtra extra{};
   std::span<const std::byte> result;
 
   void store(tl::storer& tls) const noexcept {
-    flags.store(tls), extra.store(tls), tls.store_bytes(result);
+    extra.store(tls), tls.store_bytes(result);
   }
 
   constexpr size_t footprint() const noexcept {
-    return flags.footprint() + extra.footprint() + result.size();
+    return extra.footprint() + result.size();
   }
 };