diff options
author | azevaykin <azevaykin@yandex-team.com> | 2023-11-21 12:43:54 +0300 |
---|---|---|
committer | azevaykin <azevaykin@yandex-team.com> | 2023-11-21 14:40:10 +0300 |
commit | bffd97d940cbd093802735837ce955071e6416d8 (patch) | |
tree | 7cf7cfd27e48a6192a212ffc0efb65a3ad5e9da7 | |
parent | 7298e0fbb01ddcc89ce3d66984aca444840744a8 (diff) | |
download | ydb-bffd97d940cbd093802735837ce955071e6416d8.tar.gz |
Y_DECLARE_OUT_SPEC for NKikimrTxDataShard::TError::EKind
-rw-r--r-- | ydb/core/kqp/executer_actor/kqp_data_executer.cpp | 4 | ||||
-rw-r--r-- | ydb/core/protos/out/out.cpp | 4 | ||||
-rw-r--r-- | ydb/core/tx/datashard/finish_propose_unit.cpp | 3 | ||||
-rw-r--r-- | ydb/core/tx/tx_proxy/commitreq.cpp | 2 | ||||
-rw-r--r-- | ydb/core/tx/tx_proxy/read_table_impl.cpp | 2 | ||||
-rw-r--r-- | ydb/core/tx/tx_proxy/snapshotreq.cpp | 2 |
6 files changed, 10 insertions, 7 deletions
diff --git a/ydb/core/kqp/executer_actor/kqp_data_executer.cpp b/ydb/core/kqp/executer_actor/kqp_data_executer.cpp index 94d471bead..49143f7b6a 100644 --- a/ydb/core/kqp/executer_actor/kqp_data_executer.cpp +++ b/ydb/core/kqp/executer_actor/kqp_data_executer.cpp @@ -661,7 +661,7 @@ private: if (err.GetKind() == NKikimrTxDataShard::TError::REPLY_SIZE_EXCEEDED) { Counters->Counters->DataShardTxReplySizeExceededError->Inc(); } - message << "[" << NKikimrTxDataShard::TError_EKind_Name(err.GetKind()) << "] " << err.GetReason() << "; "; + message << "[" << err.GetKind() << "] " << err.GetReason() << "; "; } LOG_E(message); } @@ -2404,7 +2404,7 @@ private: static void AddDataShardErrors(const NKikimrTxDataShard::TEvProposeTransactionResult& result, TIssue& issue) { for (const auto& err : result.GetError()) { issue.AddSubIssue(new TIssue(TStringBuilder() - << "[" << NKikimrTxDataShard::TError_EKind_Name(err.GetKind()) << "] " << err.GetReason())); + << "[" << err.GetKind() << "] " << err.GetReason())); } } diff --git a/ydb/core/protos/out/out.cpp b/ydb/core/protos/out/out.cpp index 08ba6b3694..76c8825777 100644 --- a/ydb/core/protos/out/out.cpp +++ b/ydb/core/protos/out/out.cpp @@ -145,6 +145,10 @@ Y_DECLARE_OUT_SPEC(, NKikimrTxDataShard::EDatashardState, stream, value) { stream << NKikimrTxDataShard::EDatashardState_Name(value); } +Y_DECLARE_OUT_SPEC(, NKikimrTxDataShard::TError::EKind, stream, value) { + stream << NKikimrTxDataShard::TError::EKind_Name(value); +} + Y_DECLARE_OUT_SPEC(, NKikimrBlobStorage::TPDiskState::E, stream, value) { stream << NKikimrBlobStorage::TPDiskState::E_Name(value); } diff --git a/ydb/core/tx/datashard/finish_propose_unit.cpp b/ydb/core/tx/datashard/finish_propose_unit.cpp index 5ecdeb81bf..1d52186982 100644 --- a/ydb/core/tx/datashard/finish_propose_unit.cpp +++ b/ydb/core/tx/datashard/finish_propose_unit.cpp @@ -250,8 +250,7 @@ TString TFinishProposeUnit::PrintErrors(const NKikimrTxDataShard::TEvProposeTran TStringOutput str(s); str << "[ "; for (size_t i = 0; i < rec.ErrorSize(); ++i) { - str << NKikimrTxDataShard::TError_EKind_Name(rec.GetError(i).GetKind()) - << "(" << rec.GetError(i).GetReason() << ") "; + str << rec.GetError(i).GetKind() << "(" << rec.GetError(i).GetReason() << ") "; } str << "]"; return s; diff --git a/ydb/core/tx/tx_proxy/commitreq.cpp b/ydb/core/tx/tx_proxy/commitreq.cpp index 3fce324785..60b4865ab4 100644 --- a/ydb/core/tx/tx_proxy/commitreq.cpp +++ b/ydb/core/tx/tx_proxy/commitreq.cpp @@ -877,7 +877,7 @@ private: void ExtractDatashardErrors(const NKikimrTxDataShard::TEvProposeTransactionResult& record) { TStringBuilder builder; for (const auto &er : record.GetError()) { - builder << "[" << NKikimrTxDataShard::TError_EKind_Name(er.GetKind()) << "] " << er.GetReason() << Endl; + builder << "[" << er.GetKind() << "] " << er.GetReason() << Endl; } DatashardErrors = builder; diff --git a/ydb/core/tx/tx_proxy/read_table_impl.cpp b/ydb/core/tx/tx_proxy/read_table_impl.cpp index e5577d058a..fdee29cc08 100644 --- a/ydb/core/tx/tx_proxy/read_table_impl.cpp +++ b/ydb/core/tx/tx_proxy/read_table_impl.cpp @@ -1071,7 +1071,7 @@ private: void ExtractDatashardErrors(const NKikimrTxDataShard::TEvProposeTransactionResult& record) { for (const auto &er : record.GetError()) { - DatashardErrors << "[" << NKikimrTxDataShard::TError_EKind_Name(er.GetKind()) << "] " << er.GetReason() << Endl; + DatashardErrors << "[" << er.GetKind() << "] " << er.GetReason() << Endl; } ComplainingDatashards.push_back(record.GetOrigin()); diff --git a/ydb/core/tx/tx_proxy/snapshotreq.cpp b/ydb/core/tx/tx_proxy/snapshotreq.cpp index 980b862d63..bccdfd99e8 100644 --- a/ydb/core/tx/tx_proxy/snapshotreq.cpp +++ b/ydb/core/tx/tx_proxy/snapshotreq.cpp @@ -645,7 +645,7 @@ public: void ExtractDatashardErrors(const NKikimrTxDataShard::TEvProposeTransactionResult& record) { TStringBuilder builder; for (const auto &er : record.GetError()) { - builder << "[" << NKikimrTxDataShard::TError_EKind_Name(er.GetKind()) << "] " << er.GetReason() << Endl; + builder << "[" << er.GetKind() << "] " << er.GetReason() << Endl; } DatashardErrors = builder; |