Skip to content

YQ fixed ast output for ctas #20673

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jul 8, 2025
+19 −6
Merged

YQ fixed ast output for ctas #20673

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
36d8bfc
Fixed ast output for ctas
GrigoriyPA Jul 5, 2025
ed1ee3c
Added ast check in tests
GrigoriyPA Jul 5, 2025
8b81ae9
Removed ast list
GrigoriyPA Jul 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ydb/core/kqp/session_actor/kqp_query_state.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ class TKqpQueryState : public TNonCopyable {
TInstant ContinueTime;
NYql::TKikimrQueryDeadlines QueryDeadlines;
TKqpQueryStats QueryStats;
TString QueryAst;
bool KeepSession = false;
TIntrusiveConstPtr<NACLib::TUserToken> UserToken;
TString ClientAddress;
Expand Down
10 changes: 6 additions & 4 deletions ydb/core/kqp/session_actor/kqp_session_actor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2033,12 +2033,14 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
auto stats = QueryState->QueryStats.ToProto();
if (QueryState->GetStatsMode() >= Ydb::Table::QueryStatsCollection::STATS_COLLECTION_FULL) {
response->SetQueryPlan(SerializeAnalyzePlan(stats, QueryState->UserRequestContext->PoolId));
if (QueryState->CompileResult) {
auto preparedQuery = QueryState->CompileResult->PreparedQuery;
if (preparedQuery) {
response->SetQueryAst(preparedQuery->GetPhysicalQuery().GetQueryAst());
if (const auto compileResult = QueryState->CompileResult) {
if (const auto preparedQuery = compileResult->PreparedQuery) {
if (const auto& queryAst = preparedQuery->GetPhysicalQuery().GetQueryAst()) {
QueryState->QueryAst = queryAst;
}
}
}
response->SetQueryAst(QueryState->QueryAst);
}
response->MutableQueryStats()->Swap(&stats);
}
Expand Down
14 changes: 12 additions & 2 deletions ydb/core/kqp/ut/federated_query/s3/kqp_federated_query_ut.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2019,17 +2019,27 @@ Y_UNIT_TEST_SUITE(KqpFederatedQuery) {
}

void RunGenericQuery(const TString& query, TQueryClient& client, const TDriver&) {
auto result = client.ExecuteQuery(query, NYdb::NQuery::TTxControl::NoTx()).ExtractValueSync();
auto result = client.ExecuteQuery(
query,
NYdb::NQuery::TTxControl::NoTx(),
NYdb::NQuery::TExecuteQuerySettings().StatsMode(NYdb::NQuery::EStatsMode::Profile)
).ExtractValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SUCCESS, result.GetIssues().ToString());
UNIT_ASSERT(result.GetStats());
UNIT_ASSERT(result.GetStats()->GetAst());
}

void RunGenericScript(const TString& script, TQueryClient& client, const TDriver& driver) {
auto scriptExecutionOperation = client.ExecuteScript(script).ExtractValueSync();
auto scriptExecutionOperation = client.ExecuteScript(
script,
NYdb::NQuery::TExecuteScriptSettings().StatsMode(NYdb::NQuery::EStatsMode::Profile)
).ExtractValueSync();
UNIT_ASSERT_VALUES_EQUAL_C(scriptExecutionOperation.Status().GetStatus(), EStatus::SUCCESS, scriptExecutionOperation.Status().GetIssues().ToString());
UNIT_ASSERT(!scriptExecutionOperation.Metadata().ExecutionId.empty());

NYdb::NQuery::TScriptExecutionOperation readyOp = WaitScriptExecutionOperation(scriptExecutionOperation.Id(), driver);
UNIT_ASSERT_VALUES_EQUAL_C(readyOp.Metadata().ExecStatus, EExecStatus::Completed, readyOp.Status().GetIssues().ToOneLineString());
UNIT_ASSERT(readyOp.Metadata().ExecStats.GetAst());
}

Y_UNIT_TEST(CreateTableAsSelectFromExternalDataSourceGenericQuery) {
Expand Down
Loading