clean up dependencies of library/conlusion

ydb-platform · Oct 21, 2024 · cbd6466 · cbd6466
1 parent eb93861
commit cbd6466
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 57 deletions.
diff --git a/ydb/library/conclusion/generic/status.cpp b/ydb/library/conclusion/generic/status.cpp
diff --git a/ydb/library/conclusion/generic/status.h b/ydb/library/conclusion/generic/status.h
@@ -1,18 +1,14 @@
 #pragma once
 
 #include <util/generic/string.h>
+#include <util/system/yassert.h>
 
 #include <optional>
 
 namespace NKikimr {
 
-class TConclusionStatusImplBase {
-protected:
-    void AbortOnValidationProblem(const TString& errorMessage, const TString& processInfo) const;
-};
-
 template <class TStatus, TStatus StatusOk, TStatus DefaultError>
-class TConclusionStatusImpl : TConclusionStatusImplBase {
+class TConclusionStatusImpl {
 private:
     std::optional<TString> ErrorMessage;
     TStatus Status = StatusOk;
@@ -37,8 +33,10 @@ class TConclusionStatusImpl : TConclusionStatusImplBase {
 
 public:
     void Validate(const TString& processInfo = Default<TString>()) const {
-        if (Y_UNLIKELY(!Ok())) {
-            AbortOnValidationProblem(GetErrorMessage(), processInfo);
+        if (processInfo) {
+            Y_ABORT_UNLESS(Ok(), "error=%s, processInfo=%s", GetErrorMessage(), processInfo);
+        } else {
+            Y_ABORT_UNLESS(Ok(), "error=%s", GetErrorMessage());
         }
     }
 

diff --git a/ydb/library/conclusion/generic/ya.make b/ydb/library/conclusion/generic/ya.make
@@ -1,11 +1,9 @@
 LIBRARY()
 
-SRCS(
-    status.cpp
-)
+SRCS()
 
 PEERDIR(
-    ydb/library/actors/core
+    util
 )
 
 END()
diff --git a/ydb/library/conclusion/ya.make b/ydb/library/conclusion/ya.make
@@ -3,12 +3,10 @@ LIBRARY()
 SRCS(
     result.cpp
     status.cpp
-    ydb.cpp
 )
 
 PEERDIR(
-    ydb/public/api/protos
-    ydb/library/actors/core
+    util
     ydb/library/conclusion/generic
 )
 

diff --git a/ydb/library/conclusion/ydb.cpp b/ydb/library/conclusion/ydb.cpp
diff --git a/ydb/library/conclusion/ydb.h b/ydb/library/conclusion/ydb.h
diff --git a/ydb/library/yql/minikql/invoke_builtins/ya.make b/ydb/library/yql/minikql/invoke_builtins/ya.make
@@ -3,9 +3,7 @@ LIBRARY()
 SRCS(
 )
 
-PEERDIR(
-    ydb/library/conclusion
-)
+PEERDIR()
 
 YQL_LAST_ABI_VERSION()
 

diff --git a/ydb/services/metadata/request/request_actor_cb.h b/ydb/services/metadata/request/request_actor_cb.h
@@ -10,7 +10,9 @@
 #include <ydb/library/aclib/aclib.h>
 #include <ydb/library/yql/public/issue/yql_issue_message.h>
 #include <ydb/library/yql/public/issue/yql_issue.h>
-#include <ydb/library/conclusion/ydb.h>
+#include <ydb/library/conclusion/generic/result.h>
+#include <ydb/library/conclusion/status.h>
+#include <ydb/public/api/protos/ydb_status_codes.pb.h>
 
 namespace NKikimr::NMetadata::NRequest {
 
@@ -64,15 +66,18 @@ class IChainController: public IExternalController<TCurrentDialogPolicy> {
     std::shared_ptr<TNextController> NextController;
     const NACLib::TUserToken UserToken;
 protected:
-    TYdbConclusion<typename TNextController::TDialogPolicy::TRequest> BuildNextRequest(typename TCurrentDialogPolicy::TResponse&& result) const {
+    using TYdbConclusionStatus = TConclusionSpecialStatus<Ydb::StatusIds::StatusCode, Ydb::StatusIds::SUCCESS, Ydb::StatusIds::INTERNAL_ERROR>;
+    using TRequestConclusion = TConclusionImpl<TYdbConclusionStatus, typename TNextController::TDialogPolicy::TRequest>;
+
+    TRequestConclusion BuildNextRequest(typename TCurrentDialogPolicy::TResponse&& result) const {
         return DoBuildNextRequest(std::move(result));
     }
 
-    virtual TYdbConclusion<typename TNextController::TDialogPolicy::TRequest> DoBuildNextRequest(typename TCurrentDialogPolicy::TResponse&& result) const = 0;
+    virtual TRequestConclusion DoBuildNextRequest(typename TCurrentDialogPolicy::TResponse&& result) const = 0;
 public:
     using TDialogPolicy = TCurrentDialogPolicy;
     virtual void OnRequestResult(typename TCurrentDialogPolicy::TResponse&& result) override {
-        TYdbConclusion<typename TNextController::TDialogPolicy::TRequest> nextRequest = BuildNextRequest(std::move(result));
+        TRequestConclusion nextRequest = BuildNextRequest(std::move(result));
         if (!nextRequest) {
             OnRequestFailed(nextRequest.GetStatus(), nextRequest.GetErrorMessage());
         } else {
@@ -113,14 +118,14 @@ class TSessionedChainController: public IChainController<TDialogCreateSession, I
     TRequest ProtoRequest;
     TSessionContext::TPtr SessionContext;
 protected:
-    virtual TYdbConclusion<typename TDialogPolicy::TRequest> DoBuildNextRequest(TDialogCreateSession::TResponse&& response) const override {
+    virtual TBase::TRequestConclusion DoBuildNextRequest(TDialogCreateSession::TResponse&& response) const override {
         auto result = ProtoRequest;
         Ydb::Table::CreateSessionResponse currentFullReply = std::move(response);
         Ydb::Table::CreateSessionResult session;
         currentFullReply.operation().result().UnpackTo(&session);
         const TString sessionId = session.session_id();
         if (!sessionId) {
-            return TYdbConclusionStatus::Fail("cannot build session for request");
+            return TBase::TYdbConclusionStatus::Fail("cannot build session for request");
         }
         result.set_session_id(sessionId);
         SessionContext->SetSessionId(sessionId);