Fixes

Author: shnikd

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

@@ -69,7 +69,7 @@ struct TEvQueryRequest: public NActors::TEventLocal<TEvQueryRequest, TKqpEvents:
         const ::Ydb::Operations::OperationParams* operationParams,
         const TQueryRequestSettings& querySettings = TQueryRequestSettings(),
         const TString& poolId = "",
-        bool collectFullDiagnostics = false);
+        std::optional<bool> collectFullDiagnostics = std::nullopt);
 
     TEvQueryRequest() {
         Record.MutableRequest()->SetUsePublicResponseDataFormat(true);
@@ -283,7 +283,7 @@ struct TEvQueryRequest: public NActors::TEventLocal<TEvQueryRequest, TKqpEvents:
     }
 
     bool GetCollectDiagnostics() const {
-        return Record.GetRequest().GetCollectDiagnostics();
+        return CollectFullDiagnostics.has_value() ? CollectFullDiagnostics.value() : Record.GetRequest().GetCollectDiagnostics();
     }
 
     ui32 CalculateSerializedSize() const override {
@@ -396,7 +396,7 @@ struct TEvQueryRequest: public NActors::TEventLocal<TEvQueryRequest, TKqpEvents:
     TIntrusivePtr<TUserRequestContext> UserRequestContext;
     TDuration ProgressStatsPeriod;
     std::optional<NResourcePool::TPoolSettings> PoolConfig;
-    bool CollectFullDiagnostics = false;
+    std::optional<bool> CollectFullDiagnostics = std::nullopt;
 };
 
 struct TEvDataQueryStreamPart: public TEventPB<TEvDataQueryStreamPart,

ydb/core/kqp/common/kqp_event_impl.cpp

@@ -109,7 +109,9 @@ void TEvKqp::TEvQueryRequest::PrepareRemote() const {
         Record.MutableRequest()->SetIsInternalCall(RequestCtx->IsInternalCall());
         Record.MutableRequest()->SetOutputChunkMaxSize(QuerySettings.OutputChunkMaxSize);
 
-        Record.MutableRequest()->SetCollectDiagnostics(CollectFullDiagnostics);
+        if (CollectFullDiagnostics.has_value()) {
+            Record.MutableRequest()->SetCollectDiagnostics(CollectFullDiagnostics.value());
+        }
 
         RequestCtx.reset();
     }

ydb/public/sdk/cpp/client/ydb_query/impl/exec_query.cpp

@@ -172,10 +172,12 @@ struct TExecuteQueryBuffer : public TThrRefBase, TNonCopyable {
                     TVector<NYql::TIssue> issues;
                     TVector<Ydb::ResultSet> resultProtos;
                     TMaybe<TTransaction> tx;
+                    TString diagnostics;
 
                     std::swap(self->Issues_, issues);
                     std::swap(self->ResultSets_, resultProtos);
                     std::swap(self->Tx_, tx);
+                    std::swap(self->Diagnostics_, diagnostics);
 
                     TVector<TResultSet> resultSets;
                     for (auto& proto : resultProtos) {
@@ -187,7 +189,7 @@ struct TExecuteQueryBuffer : public TThrRefBase, TNonCopyable {
                         std::move(resultSets),
                         std::move(stats),
                         std::move(tx),
-                        {}
+                        std::move(diagnostics)
                     ));
                 } else {
                     self->Promise_.SetValue(TExecuteQueryResult(std::move(part), {}, std::move(stats), {}, {}));