Skip to content

Commit 4e106ad

Browse files
committed
Fixes
1 parent 8d7f552 commit 4e106ad

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

ydb/core/kqp/common/kqp_event_impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ TEvKqp::TEvQueryRequest::TEvQueryRequest(
2020
const ::Ydb::Operations::OperationParams* operationParams,
2121
const TQueryRequestSettings& querySettings,
2222
const TString& poolId,
23-
bool collectFullDiagnostics)
23+
std::optional<bool> collectFullDiagnostics)
2424
: RequestCtx(ctx)
2525
, RequestActorId(requestActorId)
2626
, Database(CanonizePath(ctx->GetDatabaseName().GetOrElse("")))

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -558,7 +558,7 @@ namespace {
558558
NQuery::TExecuteQuerySettings>;
559559

560560
template <typename TClient>
561-
auto GetSettings(const TString& collectStatsMode, const bool basicStats, std::optional<TDuration> timeout) {
561+
auto GetSettings(const TString& collectStatsMode, const bool basicStats, std::optional<TDuration> timeout, bool collectFullDiagnostics) {
562562
if constexpr (std::is_same_v<TClient, NTable::TTableClient>) {
563563
const auto defaultStatsMode = basicStats
564564
? NTable::ECollectQueryStatsMode::Basic
@@ -568,7 +568,7 @@ namespace {
568568
if (timeout.has_value()) {
569569
settings.ClientTimeout(*timeout);
570570
}
571-
if (CollectFullDiagnostics) {
571+
if (collectFullDiagnostics) {
572572
settings.CollectFullDiagnostics(true);
573573
}
574574
return settings;
@@ -581,7 +581,7 @@ namespace {
581581
if (timeout.has_value()) {
582582
settings.ClientTimeout(*timeout);
583583
}
584-
if (CollectFullDiagnostics) {
584+
if (collectFullDiagnostics) {
585585
settings.CollectFullDiagnostics(true);
586586
}
587587
return settings;
@@ -690,7 +690,7 @@ int TCommandExecuteQuery::ExecuteQueryImpl(TConfig& config) {
690690
if (OperationTimeout) {
691691
optTimeout = TDuration::MilliSeconds(FromString<ui64>(OperationTimeout));
692692
}
693-
const auto settings = GetSettings<TClient>(CollectStatsMode, BasicStats, optTimeout);
693+
const auto settings = GetSettings<TClient>(CollectStatsMode, BasicStats, optTimeout, CollectFullDiagnostics);
694694

695695
TAsyncPartIterator<TClient> asyncResult;
696696
SetInterruptHandlers();
@@ -748,6 +748,7 @@ template <typename TIterator>
748748
bool TCommandExecuteQuery::PrintQueryResponse(TIterator& result) {
749749
TMaybe<TString> stats;
750750
TMaybe<TString> fullStats;
751+
TString diagnostics;
751752
{
752753
TResultSetPrinter printer(OutputFormat, &IsInterrupted);
753754

@@ -770,7 +771,7 @@ bool TCommandExecuteQuery::PrintQueryResponse(TIterator& result) {
770771
}
771772
}
772773

773-
if ()
774+
diagnostics = streamPart.GetDiagnostics();
774775
}
775776
} // TResultSetPrinter destructor should be called before printing stats
776777

@@ -788,7 +789,7 @@ bool TCommandExecuteQuery::PrintQueryResponse(TIterator& result) {
788789
if (CollectFullDiagnostics)
789790
{
790791
TFileOutput file(TStringBuilder() << "diagnostics_" << TGUID::Create().AsGuidString() << ".txt");
791-
file << result.GetDiagnostics();
792+
file << diagnostics;
792793
}
793794

794795
PrintFlameGraph(fullStats);

0 commit comments

Comments
 (0)