feat ydb: fixed missing keep_in_query_cache setting from driver

commit_hash:192cd5a12b4f9fa05a71c7e260bd801b520c6f02

Author: brgayazov

ydb/include/userver/ydb/table.hpp

@@ -239,6 +239,9 @@ class TableClient final {
 
     void Select1();
 
+    NYdb::NQuery::TExecuteQuerySettings ToExecuteQuerySettings(const QuerySettings& query_settings) const;
+    NYdb::NTable::TExecDataQuerySettings ToExecDataQuerySettings(const QuerySettings& query_settings) const;
+
     template <typename... Args>
     PreparedArgsBuilder MakeBuilder(Args&&... args);
 

ydb/src/ydb/impl/operation_settings.cpp

@@ -19,44 +19,13 @@ std::chrono::milliseconds DeadlineToTimeout(engine::Deadline deadline) {
     return timeout;
 }
 
-NYdb::NQuery::EStatsMode ConvertStatsMode(NYdb::NTable::ECollectQueryStatsMode collect_query_stats_mode) {
-    switch (collect_query_stats_mode) {
-        case NYdb::NTable::ECollectQueryStatsMode::None:
-            return NYdb::NQuery::EStatsMode::None;
-        case NYdb::NTable::ECollectQueryStatsMode::Basic:
-            return NYdb::NQuery::EStatsMode::Basic;
-        case NYdb::NTable::ECollectQueryStatsMode::Full:
-            return NYdb::NQuery::EStatsMode::Full;
-        case NYdb::NTable::ECollectQueryStatsMode::Profile:
-            return NYdb::NQuery::EStatsMode::Profile;
-    }
-}
-
 }  // namespace
 
 std::chrono::milliseconds GetBoundTimeout(std::chrono::milliseconds timeout, engine::Deadline deadline) {
     const auto max_timeout = impl::DeadlineToTimeout(deadline);
     return (std::chrono::milliseconds::zero() < timeout) ? std::min(timeout, max_timeout) : max_timeout;
 }
 
-NYdb::NQuery::TExecuteQuerySettings ToExecuteQuerySettings(const QuerySettings& query_settings) {
-    NYdb::NQuery::TExecuteQuerySettings execute_query_settings;
-
-    // Query Client doesn't have KeepInQueryCache, it caches automatically
-
-    if (query_settings.collect_query_stats.has_value()) {
-        execute_query_settings.StatsMode(ConvertStatsMode(*query_settings.collect_query_stats));
-    }
-
-    return execute_query_settings;
-}
-
-NYdb::NTable::TExecDataQuerySettings ToExecDataQuerySettings(const QuerySettings& query_settings) {
-    return NYdb::NTable::TExecDataQuerySettings()
-        .KeepInQueryCache(query_settings.keep_in_query_cache)
-        .CollectQueryStats(query_settings.collect_query_stats);
-}
-
 }  // namespace ydb::impl
 
 USERVER_NAMESPACE_END

ydb/src/ydb/impl/operation_settings.hpp

@@ -20,9 +20,6 @@ constexpr double kOperationTimeoutMultiplier = 0.8;
 
 std::chrono::milliseconds GetBoundTimeout(std::chrono::milliseconds timeout, engine::Deadline deadline);
 
-NYdb::NQuery::TExecuteQuerySettings ToExecuteQuerySettings(const QuerySettings& query_settings);
-NYdb::NTable::TExecDataQuerySettings ToExecDataQuerySettings(const QuerySettings& query_settings);
-
 template <typename T>
 void ApplyToRequestSettings(
     NYdb::TRequestSettings<T>& result,

ydb/src/ydb/table.cpp

@@ -49,6 +49,19 @@ NYdb::NTable::TTxSettings MakeTableTxSettings(TransactionMode tx_mode) {
     }
 }
 
+NYdb::NQuery::EStatsMode ConvertStatsMode(NYdb::NTable::ECollectQueryStatsMode collect_query_stats_mode) {
+    switch (collect_query_stats_mode) {
+        case NYdb::NTable::ECollectQueryStatsMode::None:
+            return NYdb::NQuery::EStatsMode::None;
+        case NYdb::NTable::ECollectQueryStatsMode::Basic:
+            return NYdb::NQuery::EStatsMode::Basic;
+        case NYdb::NTable::ECollectQueryStatsMode::Full:
+            return NYdb::NQuery::EStatsMode::Full;
+        case NYdb::NTable::ECollectQueryStatsMode::Profile:
+            return NYdb::NQuery::EStatsMode::Profile;
+    }
+}
+
 }  // namespace
 
 TableClient::TableClient(
@@ -393,12 +406,7 @@ ExecuteResponse TableClient::ExecuteDataQuery(
     PreparedArgsBuilder&& builder
 ) {
     if (use_query_client_) {
-        return ExecuteQuery(
-            impl::ToExecuteQuerySettings(query_settings),
-            std::move(settings),
-            query,
-            std::move(builder)
-        );
+        return ExecuteQuery(ToExecuteQuerySettings(query_settings), std::move(settings), query, std::move(builder));
     }
 
     impl::RequestContext context{*this, query, std::move(settings)};
@@ -407,7 +415,7 @@ ExecuteResponse TableClient::ExecuteDataQuery(
         context,
         [query,
          params = std::move(builder).Build(),
-         exec_settings = impl::ToExecDataQuerySettings(query_settings),
+         exec_settings = ToExecDataQuerySettings(query_settings),
          settings = context.settings,
          deadline = context.deadline](NYdb::NTable::TSession session) mutable {
             impl::ApplyToRequestSettings(exec_settings, settings, deadline);
@@ -472,6 +480,29 @@ void DumpMetric(utils::statistics::Writer& writer, const TableClient& table_clie
 
 PreparedArgsBuilder TableClient::GetBuilder() const { return PreparedArgsBuilder{}; }
 
+NYdb::NQuery::TExecuteQuerySettings TableClient::ToExecuteQuerySettings(const QuerySettings& query_settings) const {
+    NYdb::NQuery::TExecuteQuerySettings exec_settings;
+
+    // Query Client doesn't have KeepInQueryCache, it caches automatically
+    if (query_settings.collect_query_stats) {
+        exec_settings.StatsMode(ConvertStatsMode(*query_settings.collect_query_stats));
+    }
+
+    return exec_settings;
+}
+
+NYdb::NTable::TExecDataQuerySettings TableClient::ToExecDataQuerySettings(const QuerySettings& query_settings) const {
+    NYdb::NTable::TExecDataQuerySettings exec_settings;
+
+    exec_settings.KeepInQueryCache(query_settings.keep_in_query_cache.value_or(keep_in_query_cache_));
+
+    if (query_settings.collect_query_stats) {
+        exec_settings.CollectQueryStats(*query_settings.collect_query_stats);
+    }
+
+    return exec_settings;
+}
+
 }  // namespace ydb
 
 USERVER_NAMESPACE_END

ydb/src/ydb/transaction.cpp

@@ -170,10 +170,10 @@ ExecuteResponse Transaction::Execute(
     impl::RequestContext context{table_client_, query, std::move(settings), impl::IsStreaming{false}, &span_};
     auto internal_params = std::move(builder).Build();
 
-    auto exec_query_settings = impl::ToExecuteQuerySettings(query_settings);
+    auto exec_query_settings = table_client_.ToExecuteQuerySettings(query_settings);
     impl::ApplyToRequestSettings(exec_query_settings, context.settings, context.deadline);
 
-    auto exec_data_query_settings = impl::ToExecDataQuerySettings(query_settings);
+    auto exec_data_query_settings = table_client_.ToExecDataQuerySettings(query_settings);
     impl::ApplyToRequestSettings(exec_data_query_settings, context.settings, context.deadline);
 
     // Must go after PrepareExecuteSettings, because an exception from there