Skip to content

Commit b671025

Browse files
UgnineSirdisadameat
authored andcommitted
[Http] Reply with structured issues when client accepts json data (ydb-platform#7576)
1 parent f611fa4 commit b671025

File tree

2 files changed

+0
-39
lines changed

2 files changed

+0
-39
lines changed

ydb/core/viewer/viewer.cpp

-38
Original file line numberDiff line numberDiff line change
@@ -736,44 +736,6 @@ TString TViewer::GetHTTPFORWARD(const TRequestState& request, const TString& loc
736736
return res;
737737
}
738738

739-
void MakeErrorReply(NJson::TJsonValue& jsonResponse, TString& message, const NYdb::TStatus& status) {
740-
google::protobuf::RepeatedPtrField<Ydb::Issue::IssueMessage> protoIssues;
741-
NYql::IssuesToMessage(status.GetIssues(), &protoIssues);
742-
743-
message.clear();
744-
745-
NJson::TJsonValue& jsonIssues = jsonResponse["issues"];
746-
for (const auto& queryIssue : protoIssues) {
747-
NJson::TJsonValue& issue = jsonIssues.AppendValue({});
748-
NProtobufJson::Proto2Json(queryIssue, issue);
749-
}
750-
751-
TString textStatus = TStringBuilder() << status.GetStatus();
752-
jsonResponse["status"] = textStatus;
753-
754-
// find first deepest error
755-
std::stable_sort(protoIssues.begin(), protoIssues.end(), [](const Ydb::Issue::IssueMessage& a, const Ydb::Issue::IssueMessage& b) -> bool {
756-
return a.severity() < b.severity();
757-
});
758-
759-
const google::protobuf::RepeatedPtrField<Ydb::Issue::IssueMessage>* protoIssuesPtr = &protoIssues;
760-
while (protoIssuesPtr->size() > 0 && protoIssuesPtr->at(0).issuesSize() > 0) {
761-
protoIssuesPtr = &protoIssuesPtr->at(0).issues();
762-
}
763-
764-
if (protoIssuesPtr->size() > 0) {
765-
const Ydb::Issue::IssueMessage& issue = protoIssuesPtr->at(0);
766-
NProtobufJson::Proto2Json(issue, jsonResponse["error"]);
767-
message = issue.message();
768-
} else {
769-
jsonResponse["error"]["message"] = textStatus;
770-
}
771-
772-
if (message.empty()) {
773-
message = textStatus;
774-
}
775-
}
776-
777739
NKikimrViewer::EFlag GetFlagFromTabletState(NKikimrWhiteboard::TTabletStateInfo::ETabletState state) {
778740
NKikimrViewer::EFlag flag = NKikimrViewer::EFlag::Grey;
779741
switch (state) {

ydb/core/viewer/viewer_query.h

-1
Original file line numberDiff line numberDiff line change
@@ -778,4 +778,3 @@ class TJsonQuery : public TViewerPipeClient {
778778
};
779779

780780
}
781-

0 commit comments

Comments
 (0)