Fixes

Author: shnikd

ydb/public/lib/ydb_cli/commands/ydb_service_table.cpp

@@ -512,15 +512,19 @@ void TCommandExecuteQuery::PrintDataQueryResponse(NTable::TDataQueryResult& resu
         }
     } // TResultSetPrinter destructor should be called before printing stats
 
-    TMaybe<TString> statsStr;
-    TMaybe<TString> plan;
-    TMaybe<TString> ast;
-    TMaybe<TString> meta;
+    std::optional<std::string> statsStr;
+    std::optional<std::string> plan;
+    std::optional<std::string> ast;
+    std::optional<std::string> meta;
 
     const std::optional<NTable::TQueryStats>& stats = result.GetStats();
     if (stats.has_value()) {
-        meta = stats->GetMeta();
-        plan = stats->GetPlan();
+        if (stats->GetMeta()) {
+            meta = stats->GetMeta();
+        }
+        if (stats->GetPlan()) {
+            plan = stats->GetPlan();
+        }
         ast = stats->GetAst();
         statsStr = stats->ToString();
         Cout << Endl << "Statistics:" << Endl << statsStr;
@@ -771,10 +775,10 @@ int TCommandExecuteQuery::ExecuteQueryImpl(TConfig& config) {
 
 template <typename TIterator>
 bool TCommandExecuteQuery::PrintQueryResponse(TIterator& result) {
-    TMaybe<TString> stats;
+    std::optional<std::string> stats;
     std::optional<std::string> fullStats;
-    TMaybe<TString> meta;
-    TMaybe<TString> ast;
+    std::optional<std::string> meta;
+    std::optional<std::string> ast;
     {
         TResultSetPrinter printer(OutputFormat, &IsInterrupted);
 

ydb/public/lib/ydb_cli/commands/ydb_sql.cpp

@@ -188,7 +188,7 @@ int TCommandSql::PrintResponse(NQuery::TExecuteQueryIterator& result) {
     std::optional<std::string> stats;
     std::optional<std::string> plan;
     std::optional<std::string> ast;
-    TMaybe<TString> meta;
+    std::optional<std::string> meta;
     {
         TResultSetPrinter printer(OutputFormat, &IsInterrupted);
 

ydb/public/sdk/cpp/client/ydb_query/stats.cpp

@@ -29,7 +29,6 @@ TString TExecStats::ToString(bool withPlan) const {
     if (!withPlan) {
         proto.clear_query_plan();
         proto.clear_query_ast();
-        proto.clear_query_meta();
     }
 
     TString res;
@@ -57,16 +56,6 @@ TMaybe<TString> TExecStats::GetAst() const {
     return proto.query_ast();
 }
 
-TMaybe<TString> TExecStats::GetMeta() const {
-    auto proto = Impl_->Proto;
-
-    if (proto.query_meta().empty()) {
-        return {};
-    }
-
-    return proto.query_meta();
-}
-
 TDuration TExecStats::GetTotalDuration() const {
     return TDuration::MicroSeconds(Impl_->Proto.total_duration_us());
 }

ydb/public/sdk/cpp/client/ydb_query/stats.h

@@ -33,7 +33,6 @@ class TExecStats {
 
     TMaybe<TString> GetPlan() const;
     TMaybe<TString> GetAst() const;
-    TMaybe<TString> GetMeta() const;
 
     TDuration GetTotalDuration() const;
     TDuration GetTotalCpuTime() const;

ydb/public/sdk/cpp/client/ydb_table/impl/readers.cpp

@@ -82,16 +82,17 @@ TAsyncScanQueryPart TScanQueryPartIterator::TReaderImpl::ReadNext(std::shared_pt
             TPlainStatus plainStatus{clientStatus, std::move(issues), self->Endpoint_, {}};
             TStatus status{std::move(plainStatus)};
             TMaybe<TQueryStats> queryStats;
+            TMaybe<TString> diagnostics;
 
             if (self->Response_.result().has_query_stats()) {
                 queryStats = TQueryStats(self->Response_.result().query_stats());
             }
 
             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/client/ydb_table/impl/table_client.cpp

@@ -1017,6 +1017,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>>();
 

ydb/public/sdk/cpp/client/ydb_table/query_stats/stats.h

@@ -35,7 +35,7 @@ namespace NTable {
 enum class ECollectQueryStatsMode {
     None = 0,  // Stats collection is disabled
     Basic = 1, // Aggregated stats of reads, updates and deletes per table
-    Full = 2,   // Add per-stage execution profile and diagnostics on top of Basic mode
+    Full = 2,   // Add per-stage execution profile and query plan on top of Basic mode
     Profile = 3   // Detailed execution stats including stats for individual tasks and channels
 };
 

ydb/public/sdk/cpp/client/ydb_table/table.cpp

@@ -2211,14 +2211,6 @@ const TString TDataQueryResult::GetQueryPlan() const {
     }
 }
 
-const TString TDataQueryResult::GetMeta() const {
-    if (QueryStats_.Defined()) {
-        return NYdb::TProtoAccessor::GetProto(*QueryStats_.Get()).query_meta();
-    } else {
-        return "";
-    }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 TBeginTransactionResult::TBeginTransactionResult(TStatus&& status, TTransaction transaction)

ydb/public/sdk/cpp/client/ydb_table/table.h

@@ -2117,24 +2117,31 @@ class TScanQueryPart : public TStreamPartStatus {
     const TQueryStats& GetQueryStats() const { return *QueryStats_; }
     TQueryStats ExtractQueryStats() { return std::move(*QueryStats_); }
 
+    bool HasDiagnostics() const { return Diagnostics_.Defined(); }
+    const TString& GetDiagnostics() const { return *Diagnostics_; }
+    TString&& ExtractDiagnostics() { return std::move(*Diagnostics_); }
+
     TScanQueryPart(TStatus&& status)
         : TStreamPartStatus(std::move(status))
     {}
 
-    TScanQueryPart(TStatus&& status, const TMaybe<TQueryStats>& queryStats)
+    TScanQueryPart(TStatus&& status, const TMaybe<TQueryStats>& queryStats, const TMaybe<TString>& diagnostics)
         : TStreamPartStatus(std::move(status))
         , QueryStats_(queryStats)
+        , Diagnostics_(diagnostics)
     {}
 
-    TScanQueryPart(TStatus&& status, TResultSet&& resultSet, const TMaybe<TQueryStats>& queryStats)
+    TScanQueryPart(TStatus&& status, TResultSet&& resultSet, const TMaybe<TQueryStats>& queryStats, const TMaybe<TString>& diagnostics)
         : TStreamPartStatus(std::move(status))
         , ResultSet_(std::move(resultSet))
         , QueryStats_(queryStats)
+        , Diagnostics_(diagnostics)
     {}
 
 private:
     TMaybe<TResultSet> ResultSet_;
     TMaybe<TQueryStats> QueryStats_;
+    TMaybe<TString> Diagnostics_;
 };
 
 using TAsyncScanQueryPart = NThreading::TFuture<TScanQueryPart>;