Merge 49903fb into c59858d

Author: GrigoriyPA

ydb/core/kqp/executer_actor/kqp_scheme_executer.cpp

@@ -500,6 +500,8 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
             failedOnAlreadyExists = ev->Record.GetTransaction().GetModifyScheme().GetFailedOnAlreadyExists();
         }
 
+        const auto operationType = ev->Record.GetTransaction().GetModifyScheme().GetOperationType();
+
         IActor* requestHandler = new TSchemeOpRequestHandler(
             ev.Release(),
             promise,
@@ -510,9 +512,19 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
 
         auto actorSystem = TActivationContext::ActorSystem();
         auto selfId = SelfId();
-        promise.GetFuture().Subscribe([actorSystem, selfId](const TFuture<IKqpGateway::TGenericResult>& future) {
+        promise.GetFuture().Subscribe([actorSystem, selfId, operationType](const TFuture<IKqpGateway::TGenericResult>& future) {
+            const auto& value = future.GetValue();
             auto ev = MakeHolder<TEvPrivate::TEvResult>();
-            ev->Result = future.GetValue();
+            ev->Result.SetStatus(value.Status());
+
+            if (value.Issues()) {
+                NYql::TIssue rootIssue(TStringBuilder() << "Executing " << NKikimrSchemeOp::EOperationType_Name(operationType));
+                rootIssue.SetCode(ev->Result.Status(), NYql::TSeverityIds::S_INFO);
+                for (const auto& issue : value.Issues()) {
+                    rootIssue.AddSubIssue(MakeIntrusive<NYql::TIssue>(issue));
+                }
+                ev->Result.AddIssue(rootIssue);
+            }
 
             actorSystem->Send(selfId, ev.Release());
         });
@@ -546,15 +558,20 @@ class TKqpSchemeExecuter : public TActorBootstrapped<TKqpSchemeExecuter> {
         auto resultFuture = cBehaviour->GetOperationsManager()->ExecutePrepared(schemeOp, SelfId().NodeId(), cBehaviour, context);
 
         using TResultFuture = NThreading::TFuture<NMetadata::NModifications::IOperationsManager::TYqlConclusionStatus>;
-        resultFuture.Subscribe([actorSystem, selfId](const TResultFuture& f) {
+        resultFuture.Subscribe([actorSystem, selfId, objectType = schemeOp.GetObjectType()](const TResultFuture& f) {
             const auto& status = f.GetValue();
             auto ev = MakeHolder<TEvPrivate::TEvResult>();
             if (status.Ok()) {
                 ev->Result.SetSuccess();
             } else {
                 ev->Result.SetStatus(status.GetStatus());
                 if (TString message = status.GetErrorMessage()) {
-                    ev->Result.AddIssue(NYql::TIssue(message).SetCode(status.GetStatus(), NYql::TSeverityIds::S_ERROR));
+                    const auto createIssue = [status = status.GetStatus()](const TString& message) {
+                        return NYql::TIssue(message).SetCode(status, NYql::TSeverityIds::S_ERROR);
+                    };
+                    ev->Result.AddIssue(createIssue(TStringBuilder() << "Executing operation with object \"" << objectType << "\"")
+                        .AddSubIssue(MakeIntrusive<NYql::TIssue>(createIssue(status.GetErrorMessage())))
+                    );
                 }
             }
             actorSystem->Send(selfId, ev.Release());

ydb/core/kqp/gateway/utils/metadata_helpers.cpp

@@ -1,6 +1,7 @@
 #include "metadata_helpers.h"
 
 #include <ydb/core/kqp/gateway/actors/scheme.h>
+#include <ydb/core/protos/schemeshard/operations.pb.h>
 
 namespace NKikimr::NKqp {
 
@@ -32,15 +33,15 @@ TAsyncStatus SendSchemeRequest(const NKikimrSchemeOp::TModifyScheme& schemeTx, c
     auto promise = NThreading::NewPromise<NKqp::TSchemeOpRequestHandler::TResult>();
     context.GetActorSystem()->Register(new TSchemeOpRequestHandler(request.release(), promise, schemeTx.GetFailedOnAlreadyExists(), schemeTx.GetSuccessOnNotExist()));
 
-    return promise.GetFuture().Apply([](const NThreading::TFuture<NKqp::TSchemeOpRequestHandler::TResult>& f) {
+    return promise.GetFuture().Apply([operationType = schemeTx.GetOperationType()](const NThreading::TFuture<NKqp::TSchemeOpRequestHandler::TResult>& f) {
         try {
             auto response = f.GetValue();
             if (response.Success()) {
                 return TYqlConclusionStatus::Success();
             }
-            return TYqlConclusionStatus::Fail(response.Status(), response.Issues().ToString());
+            return TYqlConclusionStatus::Fail(response.Status(), TStringBuilder() << "Failed to execute " << NKikimrSchemeOp::EOperationType_Name(operationType) << ": " << response.Issues().ToString());
         } catch (...) {
-            return TYqlConclusionStatus::Fail(NYql::TIssuesIds::KIKIMR_SCHEME_ERROR, TStringBuilder() << "Scheme error: " << CurrentExceptionMessage());
+            return TYqlConclusionStatus::Fail(NYql::TIssuesIds::KIKIMR_SCHEME_ERROR, TStringBuilder() << "Failed to execute " << NKikimrSchemeOp::EOperationType_Name(operationType) << ", got scheme error: " << CurrentExceptionMessage());
         }
     });
 }

ydb/core/kqp/gateway/utils/ya.make

@@ -10,6 +10,7 @@ PEERDIR(
     ydb/core/kqp/gateway/actors
     ydb/core/kqp/provider
     ydb/core/protos
+    ydb/core/protos/schemeshard
 )
 
 YQL_LAST_ABI_VERSION()

ydb/core/kqp/ut/scheme/kqp_scheme_ut.cpp

@@ -7315,9 +7315,11 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
             UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(), "External data sources are disabled for serverless domains. Please contact your system administrator to enable it", result.GetIssues().ToString());
         };
 
-        auto checkNotFound = [](const auto& result) {
-            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SCHEME_ERROR, result.GetIssues().ToString());
-            UNIT_ASSERT_STRING_CONTAINS_C(result.GetIssues().ToString(), "Path does not exist", result.GetIssues().ToString());
+        auto checkNotFound = [](const auto& result, const TString& error) {
+            const auto& issuesString = result.GetIssues().ToString();
+            UNIT_ASSERT_VALUES_EQUAL_C(result.GetStatus(), EStatus::SCHEME_ERROR, issuesString);
+            UNIT_ASSERT_STRING_CONTAINS_C(issuesString, "Path does not exist", issuesString);
+            UNIT_ASSERT_STRING_CONTAINS_C(issuesString, error, issuesString);
         };
 
         const auto& createSourceSql = R"(
@@ -7360,8 +7362,8 @@ Y_UNIT_TEST_SUITE(KqpScheme) {
         settings.Database(ydb->GetSettings().GetServerlessTenantName()).NodeIndex(2);
         checkDisabled(ydb->ExecuteQuery(createSourceSql, settings));
         checkDisabled(ydb->ExecuteQuery(createTableSql, settings));
-        checkNotFound(ydb->ExecuteQuery(dropTableSql, settings));
-        checkNotFound(ydb->ExecuteQuery(dropSourceSql, settings));
+        checkNotFound(ydb->ExecuteQuery(dropTableSql, settings), "Executing ESchemeOpDropExternalTable");
+        checkNotFound(ydb->ExecuteQuery(dropSourceSql, settings), "Executing operation with object \"EXTERNAL_DATA_SOURCE\"");
     }
 
     Y_UNIT_TEST(CreateExternalDataSource) {