Fixed issues

Author: GrigoriyPA

ydb/core/kqp/executer_actor/kqp_executer_impl.h

@@ -1727,9 +1727,7 @@ class TKqpExecuterBase : public TActorBootstrapped<TDerived> {
         }
 
         ResponseEv->Record.MutableResponse()->SetStatus(Ydb::StatusIds::TIMEOUT);
-        for (const auto& issue : issues) {
-            NYql::IssueToMessage(issue, ResponseEv->Record.MutableResponse()->AddIssues());
-        }
+        NYql::IssuesToMessage(issues, ResponseEv->Record.MutableResponse()->MutableIssues());
 
         // TEvAbortExecution can come from either ComputeActor or SessionActor (== Target).
         if (abortSender != Target) {

ydb/core/kqp/proxy_service/kqp_proxy_service.cpp

@@ -1286,8 +1286,8 @@ class TKqpProxyService : public TActorBootstrapped<TKqpProxyService> {
         const TKqpSessionInfo* info = LocalSessions->FindPtr(reqInfo->SessionId);
         if (msg->Round == 0 && info) {
             TString message = msg->Status == NYql::NDqProto::StatusIds::TIMEOUT
-                ? (TStringBuilder() <<  "Request's timeout " << msg->Timeout.MilliSeconds() << "ms exceeded")
-                : (TStringBuilder() <<  "Request's canceled after " << msg->Timeout.MilliSeconds() << "ms");
+                ? (TStringBuilder() << "Request timeout " << msg->Timeout.MilliSeconds() << "ms exceeded")
+                : (TStringBuilder() << "Request canceled after " << msg->Timeout.MilliSeconds() << "ms");
 
             Send(info->WorkerId, new TEvKqp::TEvAbortExecution(msg->Status, message));
 

ydb/core/kqp/run_script_actor/kqp_run_script_actor.cpp

@@ -3,6 +3,7 @@
 #include <ydb/library/ydb_issue/issue_helpers.h>
 #include <ydb/core/kqp/common/events/events.h>
 #include <ydb/core/kqp/common/kqp.h>
+#include <ydb/core/kqp/common/kqp_timeouts.h>
 #include <ydb/core/kqp/executer_actor/kqp_executer.h>
 #include <ydb/core/kqp/proxy_service/kqp_script_executions.h>
 #include <ydb/core/kqp/proxy_service/proto/result_set_meta.pb.h>
@@ -219,6 +220,7 @@ class TRunScriptActor : public NActors::TActorBootstrapped<TRunScriptActor> {
             if (RunState == ERunState::Cancelling) {
                 NYql::TIssue cancelIssue("Request was canceled by user");
                 cancelIssue.SetCode(NYql::DEFAULT_ERROR, NYql::TSeverityIds::S_INFO);
+                Issues.AddIssue(std::move(cancelIssue));
             }
 
             auto scriptFinalizeRequest = std::make_unique<TEvScriptFinalizeRequest>(
@@ -429,6 +431,13 @@ class TRunScriptActor : public NActors::TActorBootstrapped<TRunScriptActor> {
         const auto& issueMessage = record.GetResponse().GetQueryIssues();
         NYql::IssuesFromMessage(issueMessage, Issues);
 
+        if (record.GetYdbStatus() == Ydb::StatusIds::TIMEOUT) {
+            const TDuration timeout = GetQueryTimeout(NKikimrKqp::QUERY_TYPE_SQL_GENERIC_SCRIPT, Request.GetRequest().GetTimeoutMs(), {}, QueryServiceConfig);
+            NYql::TIssue timeoutIssue(TStringBuilder() << "Current request timeout is " << timeout.MilliSeconds() << "ms");
+            timeoutIssue.SetCode(NYql::DEFAULT_ERROR, NYql::TSeverityIds::S_INFO);
+            Issues.AddIssue(std::move(timeoutIssue));
+        }
+
         if (record.GetResponse().HasQueryPlan()) {
             QueryPlan = record.GetResponse().GetQueryPlan();
         }