From cbd6466305636c7a6c30116c827404eef1545d04 Mon Sep 17 00:00:00 2001 From: Semyon Yentsov Date: Mon, 21 Oct 2024 10:11:41 +0000 Subject: [PATCH] clean up dependencies of library/conlusion --- ydb/library/conclusion/generic/status.cpp | 15 --------------- ydb/library/conclusion/generic/status.h | 14 ++++++-------- ydb/library/conclusion/generic/ya.make | 6 ++---- ydb/library/conclusion/ya.make | 4 +--- ydb/library/conclusion/ydb.cpp | 5 ----- ydb/library/conclusion/ydb.h | 13 ------------- ydb/library/yql/minikql/invoke_builtins/ya.make | 4 +--- .../metadata/request/request_actor_cb.h | 17 +++++++++++------ 8 files changed, 21 insertions(+), 57 deletions(-) delete mode 100644 ydb/library/conclusion/generic/status.cpp delete mode 100644 ydb/library/conclusion/ydb.cpp delete mode 100644 ydb/library/conclusion/ydb.h diff --git a/ydb/library/conclusion/generic/status.cpp b/ydb/library/conclusion/generic/status.cpp deleted file mode 100644 index 0fcfb099d5b4..000000000000 --- a/ydb/library/conclusion/generic/status.cpp +++ /dev/null @@ -1,15 +0,0 @@ -#include "status.h" - -#include - -namespace NKikimr { - -void TConclusionStatusImplBase::AbortOnValidationProblem(const TString& errorMessage, const TString& processInfo) const { - if (processInfo) { - AFL_VERIFY(false)("problem", errorMessage)("process_info", processInfo); - } else { - AFL_VERIFY(false)("problem", errorMessage); - } -} - -} // namespace NKikimr diff --git a/ydb/library/conclusion/generic/status.h b/ydb/library/conclusion/generic/status.h index 915ef076e446..d99bf3244d50 100644 --- a/ydb/library/conclusion/generic/status.h +++ b/ydb/library/conclusion/generic/status.h @@ -1,18 +1,14 @@ #pragma once #include +#include #include namespace NKikimr { -class TConclusionStatusImplBase { -protected: - void AbortOnValidationProblem(const TString& errorMessage, const TString& processInfo) const; -}; - template -class TConclusionStatusImpl : TConclusionStatusImplBase { +class TConclusionStatusImpl { private: std::optional ErrorMessage; TStatus Status = StatusOk; @@ -37,8 +33,10 @@ class TConclusionStatusImpl : TConclusionStatusImplBase { public: void Validate(const TString& processInfo = Default()) 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 index 210fa4a8ee58..1e614b2bfb5c 100644 --- 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 index cfc8d4fcaed4..41cf1944ba17 100644 --- 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 deleted file mode 100644 index 119c14227906..000000000000 --- a/ydb/library/conclusion/ydb.cpp +++ /dev/null @@ -1,5 +0,0 @@ -#include "ydb.h" - -namespace NKikimr { - -} diff --git a/ydb/library/conclusion/ydb.h b/ydb/library/conclusion/ydb.h deleted file mode 100644 index 46118ea8a230..000000000000 --- a/ydb/library/conclusion/ydb.h +++ /dev/null @@ -1,13 +0,0 @@ -#pragma once -#include -#include -#include - -namespace NKikimr { - -using TYdbConclusionStatus = TConclusionStatusImpl; - -template -using TYdbConclusion = TConclusionImpl; - -} // namespace NKikimr diff --git a/ydb/library/yql/minikql/invoke_builtins/ya.make b/ydb/library/yql/minikql/invoke_builtins/ya.make index b096f224d934..846c6063f750 100644 --- 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 index ee4c43deb3b9..71792903f7a3 100644 --- a/ydb/services/metadata/request/request_actor_cb.h +++ b/ydb/services/metadata/request/request_actor_cb.h @@ -10,7 +10,9 @@ #include #include #include -#include +#include +#include +#include namespace NKikimr::NMetadata::NRequest { @@ -64,15 +66,18 @@ class IChainController: public IExternalController { std::shared_ptr NextController; const NACLib::TUserToken UserToken; protected: - TYdbConclusion BuildNextRequest(typename TCurrentDialogPolicy::TResponse&& result) const { + using TYdbConclusionStatus = TConclusionSpecialStatus; + using TRequestConclusion = TConclusionImpl; + + TRequestConclusion BuildNextRequest(typename TCurrentDialogPolicy::TResponse&& result) const { return DoBuildNextRequest(std::move(result)); } - virtual TYdbConclusion 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 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 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);