Fixes

Author: shnikd

ydb/core/grpc_services/query/rpc_execute_query.cpp

@@ -260,7 +260,8 @@ class TExecuteQueryRPC : public TActorBootstrapped<TExecuteQueryRPC> {
             .SetUseCancelAfter(false)
             .SetSyntax(syntax)
             .SetSupportStreamTrailingResult(true)
-            .SetOutputChunkMaxSize(req->response_part_limit_bytes());
+            .SetOutputChunkMaxSize(req->response_part_limit_bytes())
+            .SetCollectFullDiagnostics(req->Getcollect_full_diagnostics());
 
         auto ev = MakeHolder<NKqp::TEvKqp::TEvQueryRequest>(
             QueryAction,
@@ -276,8 +277,7 @@ class TExecuteQueryRPC : public TActorBootstrapped<TExecuteQueryRPC> {
             cachePolicy,
             nullptr, // operationParams
             settings,
-            req->pool_id(),
-            req->Getcollect_full_diagnostics());
+            req->pool_id());
 
         if (!ctx.Send(NKqp::MakeKqpProxyID(ctx.SelfID.NodeId()), ev.Release(), 0, 0, Span_.GetTraceId())) {
             NYql::TIssues issues;

ydb/core/grpc_services/rpc_execute_data_query.cpp

@@ -146,9 +146,7 @@ class TExecuteDataQueryRPC : public TRpcKqpRequestActor<TExecuteDataQueryRPC, TE
             req->collect_stats(),
             req->has_query_cache_policy() ? &req->query_cache_policy() : nullptr,
             req->has_operation_params() ? &req->operation_params() : nullptr,
-            NKqp::NPrivateEvents::TQueryRequestSettings(),
-            "",
-            req->Getcollect_full_diagnostics());
+            NKqp::NPrivateEvents::TQueryRequestSettings().SetCollectFullDiagnostics(req->Getcollect_full_diagnostics()));
 
         ReportCostInfo_ = req->operation_params().report_cost_info() == Ydb::FeatureFlag::ENABLED;
 

ydb/core/kqp/common/events/query.h

@@ -45,11 +45,17 @@ struct TQueryRequestSettings {
         return *this;
     }
 
+    TQueryRequestSettings& SetCollectFullDiagnostics(bool flag) {
+        CollectFullDiagnostics = flag;
+        return *this;
+    }
+
     ui64 OutputChunkMaxSize = 0;
     bool KeepSession = false;
     bool UseCancelAfter = true;
     ::Ydb::Query::Syntax Syntax = Ydb::Query::Syntax::SYNTAX_UNSPECIFIED;
     bool SupportsStreamTrailingResult = false;
+    bool CollectFullDiagnostics = false;
 };
 
 struct TEvQueryRequest: public NActors::TEventLocal<TEvQueryRequest, TKqpEvents::EvQueryRequest> {
@@ -68,8 +74,7 @@ struct TEvQueryRequest: public NActors::TEventLocal<TEvQueryRequest, TKqpEvents:
         const ::Ydb::Table::QueryCachePolicy* queryCachePolicy,
         const ::Ydb::Operations::OperationParams* operationParams,
         const TQueryRequestSettings& querySettings = TQueryRequestSettings(),
-        const TString& poolId = "",
-        std::optional<bool> collectFullDiagnostics = std::nullopt);
+        const TString& poolId = "");
 
     TEvQueryRequest() {
         Record.MutableRequest()->SetUsePublicResponseDataFormat(true);
@@ -283,7 +288,7 @@ struct TEvQueryRequest: public NActors::TEventLocal<TEvQueryRequest, TKqpEvents:
     }
 
     bool GetCollectDiagnostics() const {
-        return CollectFullDiagnostics.has_value() ? CollectFullDiagnostics.value() : Record.GetRequest().GetCollectDiagnostics();
+        return QuerySettings.CollectFullDiagnostics;
     }
 
     ui32 CalculateSerializedSize() const override {
@@ -396,7 +401,6 @@ struct TEvQueryRequest: public NActors::TEventLocal<TEvQueryRequest, TKqpEvents:
     TIntrusivePtr<TUserRequestContext> UserRequestContext;
     TDuration ProgressStatsPeriod;
     std::optional<NResourcePool::TPoolSettings> PoolConfig;
-    std::optional<bool> CollectFullDiagnostics = std::nullopt;
 };
 
 struct TEvDataQueryStreamPart: public TEventPB<TEvDataQueryStreamPart,

ydb/core/kqp/common/kqp_event_impl.cpp

@@ -19,8 +19,7 @@ TEvKqp::TEvQueryRequest::TEvQueryRequest(
     const ::Ydb::Table::QueryCachePolicy* queryCachePolicy,
     const ::Ydb::Operations::OperationParams* operationParams,
     const TQueryRequestSettings& querySettings,
-    const TString& poolId,
-    std::optional<bool> collectFullDiagnostics)
+    const TString& poolId)
     : RequestCtx(ctx)
     , RequestActorId(requestActorId)
     , Database(CanonizePath(ctx->GetDatabaseName().GetOrElse("")))
@@ -36,7 +35,6 @@ TEvKqp::TEvQueryRequest::TEvQueryRequest(
     , QueryCachePolicy(queryCachePolicy)
     , HasOperationParams(operationParams)
     , QuerySettings(querySettings)
-    , CollectFullDiagnostics(collectFullDiagnostics)
 {
     if (HasOperationParams) {
         OperationTimeout = GetDuration(operationParams->operation_timeout());
@@ -109,9 +107,7 @@ void TEvKqp::TEvQueryRequest::PrepareRemote() const {
         Record.MutableRequest()->SetIsInternalCall(RequestCtx->IsInternalCall());
         Record.MutableRequest()->SetOutputChunkMaxSize(QuerySettings.OutputChunkMaxSize);
 
-        if (CollectFullDiagnostics.has_value()) {
-            Record.MutableRequest()->SetCollectDiagnostics(CollectFullDiagnostics.value());
-        }
+        Record.MutableRequest()->SetCollectDiagnostics(QuerySettings.CollectFullDiagnostics);
 
         RequestCtx.reset();
     }