Skip to content

Commit e21c43e

Browse files
authored
Check incomplete refs and dedup stats in case of failures (#8234)
1 parent f828cc9 commit e21c43e

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

ydb/core/kqp/session_actor/kqp_session_actor.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1605,7 +1605,12 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
16051605
auto stats = QueryState->QueryStats.ToProto();
16061606
if (QueryState->GetStatsMode() >= Ydb::Table::QueryStatsCollection::STATS_COLLECTION_FULL) {
16071607
response->SetQueryPlan(SerializeAnalyzePlan(stats, QueryState->UserRequestContext->PoolId));
1608-
response->SetQueryAst(QueryState->CompileResult->PreparedQuery->GetPhysicalQuery().GetQueryAst());
1608+
if (QueryState->CompileResult) {
1609+
auto preparedQuery = QueryState->CompileResult->PreparedQuery;
1610+
if (preparedQuery) {
1611+
response->SetQueryAst(preparedQuery->GetPhysicalQuery().GetQueryAst());
1612+
}
1613+
}
16091614
}
16101615
response->MutableQueryStats()->Swap(&stats);
16111616
}
@@ -2216,11 +2221,6 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
22162221
Y_ENSURE(QueryState);
22172222
if (QueryState->CompileResult) {
22182223
AddQueryIssues(*response, QueryState->CompileResult->Issues);
2219-
2220-
auto preparedQuery = QueryState->CompileResult->PreparedQuery;
2221-
if (preparedQuery && QueryState->ReportStats() && QueryState->GetStatsMode() >= Ydb::Table::QueryStatsCollection::STATS_COLLECTION_FULL) {
2222-
response->SetQueryAst(preparedQuery->GetPhysicalQuery().GetQueryAst());
2223-
}
22242224
}
22252225

22262226
FillStats(&QueryResponse->Record.GetRef());

0 commit comments

Comments
 (0)