Skip to content

Commit a55e06b

Browse files
GrigoriyPAGrigoriyPA
committed
Fixed build 2
1 parent 8358e3f commit a55e06b

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

‎ydb/core/fq/libs/row_dispatcher/format_handler/format_handler.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ class TTopicFormatHandler : public NActors::TActor<TTopicFormatHandler>, public
6262
}
6363

6464
void OnParsingError(TStatus status) override {
65-
LOG_ROW_DISPATCHER_ERROR("Got parsing error: " << status.GetErrorString());
65+
LOG_ROW_DISPATCHER_ERROR("Got parsing error: " << status.GetErrorMessage());
6666
Self.FatalError(status);
6767
}
6868

@@ -86,7 +86,7 @@ class TTopicFormatHandler : public NActors::TActor<TTopicFormatHandler>, public
8686
private:
8787
void OnColumnError(ui64 columnIndex, TStatus status) {
8888
const auto& column = ParerSchema[columnIndex];
89-
LOG_ROW_DISPATCHER_WARN("Failed to parse column " << column.ToString() << ", " << status.GetErrorString());
89+
LOG_ROW_DISPATCHER_WARN("Failed to parse column " << column.ToString() << ", " << status.GetErrorMessage());
9090

9191
const auto columnIt = Self.ColumnsDesc.find(column.Name);
9292
if (columnIt == Self.ColumnsDesc.end()) {
@@ -169,7 +169,7 @@ class TTopicFormatHandler : public NActors::TActor<TTopicFormatHandler>, public
169169
}
170170

171171
void OnClientError(TStatus status) {
172-
LOG_ROW_DISPATCHER_WARN("OnClientError, " << status.GetErrorString());
172+
LOG_ROW_DISPATCHER_WARN("OnClientError, " << status.GetErrorMessage());
173173
Client->OnClientError(std::move(status));
174174
}
175175

@@ -523,7 +523,7 @@ class TTopicFormatHandler : public NActors::TActor<TTopicFormatHandler>, public
523523
}
524524

525525
void FatalError(TStatus status) const {
526-
LOG_ROW_DISPATCHER_ERROR("Got fatal error: " << status.GetErrorString());
526+
LOG_ROW_DISPATCHER_ERROR("Got fatal error: " << status.GetErrorMessage());
527527
for (const auto& [_, client] : Clinets) {
528528
client->OnClientError(status);
529529
}

‎ydb/core/fq/libs/row_dispatcher/format_handler/ut/common/ut_common.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,12 +240,12 @@ NActors::IActor* CreatePurecalcCompileServiceMock(NActors::TActorId owner) {
240240
}
241241

242242
void CheckSuccess(const TStatus& status) {
243-
UNIT_ASSERT_C(status.IsSuccess(), "Status is not success, " << status.GetErrorString());
243+
UNIT_ASSERT_C(status.IsSuccess(), "Status is not success, " << status.GetErrorMessage());
244244
}
245245

246246
void CheckError(const TStatus& status, TStatusCode expectedStatusCode, const TString& expectedMessage) {
247-
UNIT_ASSERT_C(status.GetStatus() == expectedStatusCode, "Expected error status " << NYql::NDqProto::StatusIds_StatusCode_Name(expectedStatusCode) << ", but got: " << status.GetErrorString());
248-
UNIT_ASSERT_STRING_CONTAINS_C(status.GetErrorMessage().ToOneLineString(), expectedMessage, "Unexpected error message, Status: " << NYql::NDqProto::StatusIds_StatusCode_Name(status.GetStatus()));
247+
UNIT_ASSERT_C(status.GetStatus() == expectedStatusCode, "Expected error status " << NYql::NDqProto::StatusIds_StatusCode_Name(expectedStatusCode) << ", but got: " << status.GetErrorMessage());
248+
UNIT_ASSERT_STRING_CONTAINS_C(status.GetErrorMessage(), expectedMessage, "Unexpected error message, Status: " << NYql::NDqProto::StatusIds_StatusCode_Name(status.GetStatus()));
249249
}
250250

251251
} // namespace NFq::NRowDispatcher::NTests

‎ydb/core/fq/libs/row_dispatcher/format_handler/ut/common/ut_common.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ void CheckError(const TStatus& status, TStatusCode expectedStatusCode, const TSt
8080

8181
template <typename TValue>
8282
TValue CheckSuccess(TValueStatus<TValue> valueStatus) {
83-
UNIT_ASSERT_C(valueStatus.IsSuccess(), "Value status is not success, " << valueStatus.GetErrorString());
83+
UNIT_ASSERT_C(valueStatus.IsSuccess(), "Value status is not success, " << valueStatus.GetErrorMessage());
8484
return valueStatus.DetachResult();
8585
}
8686

‎ydb/core/fq/libs/row_dispatcher/format_handler/ut/topic_filter_ut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class TFiterFixture : public TBaseFixture {
6060
Started = true;
6161
CheckError(status, CompileError->first, CompileError->second);
6262
} else {
63-
UNIT_FAIL("Filtering failed: " << status.GetErrorString());
63+
UNIT_FAIL("Filtering failed: " << status.GetErrorMessage());
6464
}
6565
}
6666

‎ydb/core/fq/libs/row_dispatcher/purecalc_compilation/compile_service.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ class TPurecalcCompileService : public NActors::TActor<TPurecalcCompileService>
4242

4343
if (status.IsFail()) {
4444
LOG_ROW_DISPATCHER_ERROR("Compilation failed for request with id: " << ev->Cookie);
45-
Send(ev->Sender, new TEvRowDispatcher::TEvPurecalcCompileResponse(status.GetStatus(), status.GetErrorMessage()), 0, ev->Cookie);
45+
Send(ev->Sender, new TEvRowDispatcher::TEvPurecalcCompileResponse(status.GetStatus(), status.GetErrorDescription()), 0, ev->Cookie);
4646
} else {
4747
LOG_ROW_DISPATCHER_TRACE("Compilation completed for request with id: " << ev->Cookie);
4848
Send(ev->Sender, new TEvRowDispatcher::TEvPurecalcCompileResponse(std::move(programHolder)), 0, ev->Cookie);

‎ydb/core/fq/libs/row_dispatcher/topic_session.cpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -742,22 +742,22 @@ void TTopicSession::Handle(NFq::TEvRowDispatcher::TEvStopSession::TPtr& ev) {
742742
}
743743

744744
void TTopicSession::FatalError(TStatus status) {
745-
LOG_ROW_DISPATCHER_ERROR("FatalError: " << status.GetErrorString());
745+
LOG_ROW_DISPATCHER_ERROR("FatalError: " << status.GetErrorMessage());
746746

747747
for (auto& [readActorId, info] : Clients) {
748748
LOG_ROW_DISPATCHER_DEBUG("Send TEvSessionError to " << readActorId);
749749
SendSessionError(readActorId, status);
750750
}
751751
StopReadSession();
752752
Become(&TTopicSession::ErrorState);
753-
ythrow yexception() << "FatalError: " << status.GetErrorString(); // To exit from current stack and call once PassAway() in HandleException().
753+
ythrow yexception() << "FatalError: " << status.GetErrorMessage(); // To exit from current stack and call once PassAway() in HandleException().
754754
}
755755

756756
void TTopicSession::SendSessionError(TActorId readActorId, TStatus status) {
757-
LOG_ROW_DISPATCHER_WARN("SendSessionError to " << readActorId << ", status: " << status.GetErrorString());
757+
LOG_ROW_DISPATCHER_WARN("SendSessionError to " << readActorId << ", status: " << status.GetErrorMessage());
758758
auto event = std::make_unique<TEvRowDispatcher::TEvSessionError>();
759759
event->Record.SetStatusCode(status.GetStatus());
760-
NYql::IssuesToMessage(status.GetErrorMessage(), event->Record.MutableIssues());
760+
NYql::IssuesToMessage(status.GetErrorDescription(), event->Record.MutableIssues());
761761
event->Record.SetPartitionId(PartitionId);
762762
event->ReadActorId = readActorId;
763763
Send(RowDispatcherActorId, event.release());

‎ydb/library/conclusion/generic/yql_status.h

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ class TYQLConclusionStatusImpl : public TConclusionStatusGenericImpl<TYQLConclus
2323

2424
public:
2525
TYQLConclusionStatusImpl& AddParentIssue(NYql::TIssue issue) {
26-
Y_ABORT_UNLESS(!!TBase::ErrorMessage);
27-
for (const auto& childIssue : *TBase::ErrorMessage) {
26+
Y_ABORT_UNLESS(!!TBase::ErrorDescription);
27+
for (const auto& childIssue : *TBase::ErrorDescription) {
2828
issue.AddSubIssue(MakeIntrusive<NYql::TIssue>(childIssue));
2929
}
30-
TBase::ErrorMessage = {std::move(issue)};
30+
TBase::ErrorDescription = {std::move(issue)};
3131
return *this;
3232
}
3333

@@ -37,8 +37,8 @@ class TYQLConclusionStatusImpl : public TConclusionStatusGenericImpl<TYQLConclus
3737
}
3838

3939
TYQLConclusionStatusImpl& AddIssue(NYql::TIssue issue) {
40-
Y_ABORT_UNLESS(!!TBase::ErrorMessage);
41-
TBase::ErrorMessage->AddIssue(std::move(issue));
40+
Y_ABORT_UNLESS(!!TBase::ErrorDescription);
41+
TBase::ErrorDescription->AddIssue(std::move(issue));
4242
return *this;
4343
}
4444

0 commit comments

Comments
 (0)