Fixes

Author: shnikd

ydb/public/sdk/cpp/include/ydb-cpp-sdk/client/table/table.h

@@ -2111,29 +2111,31 @@ class TScanQueryPart : public TStreamPartStatus {
     TQueryStats ExtractQueryStats() { return std::move(*QueryStats_); }
 
     // Deprecated. Use GetMeta() of TQueryStats
-    bool HasDiagnostics() const { return FakeDiagnostics_.has_value(); }
-    const std::string& GetDiagnostics() const { return *FakeDiagnostics_; }
-    std::string&& ExtractDiagnostics() { return std::move(*FakeDiagnostics_); }
+    bool HasDiagnostics() const { return Diagnostics_.has_value(); }
+    const std::string& GetDiagnostics() const { return *Diagnostics_; }
+    std::string&& ExtractDiagnostics() { return std::move(*Diagnostics_); }
 
     TScanQueryPart(TStatus&& status)
         : TStreamPartStatus(std::move(status))
     {}
 
-    TScanQueryPart(TStatus&& status, const std::optional<TQueryStats>& queryStats)
+    TScanQueryPart(TStatus&& status, const std::optional<TQueryStats>& queryStats, const std::optional<std::string>& diagnostics)
         : TStreamPartStatus(std::move(status))
         , QueryStats_(queryStats)
+        , Diagnostics_(diagnostics)
     {}
 
-    TScanQueryPart(TStatus&& status, TResultSet&& resultSet, const std::optional<TQueryStats>& queryStats)
+    TScanQueryPart(TStatus&& status, TResultSet&& resultSet, const std::optional<TQueryStats>& queryStats, const std::optional<std::string>& diagnostics)
         : TStreamPartStatus(std::move(status))
         , ResultSet_(std::move(resultSet))
         , QueryStats_(queryStats)
+        , Diagnostics_(diagnostics)
     {}
 
 private:
     std::optional<TResultSet> ResultSet_;
     std::optional<TQueryStats> QueryStats_;
-    std::optional<std::string> FakeDiagnostics_;
+    std::optional<std::string> Diagnostics_;
 };
 
 using TAsyncScanQueryPart = NThreading::TFuture<TScanQueryPart>;

ydb/public/sdk/cpp/src/client/table/impl/readers.cpp

@@ -82,16 +82,19 @@ TAsyncScanQueryPart TScanQueryPartIterator::TReaderImpl::ReadNext(std::shared_pt
             TPlainStatus plainStatus{clientStatus, std::move(issues), self->Endpoint_, {}};
             TStatus status{std::move(plainStatus)};
             std::optional<TQueryStats> queryStats;
+            std::optional<std::string> diagnostics;
 
             if (self->Response_.result().has_query_stats()) {
                 queryStats = TQueryStats(self->Response_.result().query_stats());
             }
 
+            diagnostics = self->Response_.result().query_full_diagnostics();
+
             if (self->Response_.result().has_result_set()) {
                 promise.SetValue({std::move(status),
-                    TResultSet(std::move(*self->Response_.mutable_result()->mutable_result_set())), queryStats});
+                    TResultSet(std::move(*self->Response_.mutable_result()->mutable_result_set())), queryStats, diagnostics});
             } else {
-                promise.SetValue({std::move(status), queryStats});
+                promise.SetValue({std::move(status), queryStats, diagnostics});
             }
         }
     };

ydb/public/sdk/cpp/src/client/table/impl/table_client.cpp

@@ -1073,6 +1073,7 @@ TFuture<std::pair<TPlainStatus, TTableClient::TImpl::TScanQueryProcessorPtr>> TT
     }
 
     request.set_collect_stats(GetStatsCollectionMode(settings.CollectQueryStats_));
+    request.set_collect_full_diagnostics(settings.CollectFullDiagnostics_);
 
     auto promise = NewPromise<std::pair<TPlainStatus, TScanQueryProcessorPtr>>();