Skip to content

Commit d60772c

Browse files
committed
Fixed caceled issues
1 parent 1d06b7d commit d60772c

File tree

2 files changed

+2
-4
lines changed

2 files changed

+2
-4
lines changed

ydb/core/kqp/session_actor/kqp_session_actor.cpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2286,9 +2286,7 @@ class TKqpSessionActor : public TActorBootstrapped<TKqpSessionActor> {
22862286

22872287
void Handle(TEvKqp::TEvCancelQueryRequest::TPtr& ev) {
22882288
{
2289-
auto abort = MakeHolder<NYql::NDq::TEvDq::TEvAbortExecution>();
2290-
abort->Record.SetStatusCode(NYql::NDqProto::StatusIds::CANCELLED);
2291-
abort->Record.AddIssues()->set_message("Canceled");
2289+
auto abort = MakeHolder<NYql::NDq::TEvDq::TEvAbortExecution>(NYql::NDqProto::StatusIds::CANCELLED, "Request was canceled");
22922290
Send(SelfId(), abort.Release());
22932291
}
22942292

ydb/core/kqp/workload_service/ut/common/kqp_workload_service_ut_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ struct TSampleQueries {
124124
template <typename TResult>
125125
static void CheckCancelled(const TResult& result) {
126126
UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), NYdb::EStatus::CANCELLED, result.GetIssues().ToString());
127-
UNIT_ASSERT_STRING_CONTAINS(result.GetIssues().ToString(), "Request timeout exceeded, cancelling after");
127+
UNIT_ASSERT_STRING_CONTAINS(result.GetIssues().ToString(), "Request was canceled");
128128
}
129129

130130
struct TSelect42 {

0 commit comments

Comments
 (0)