Skip to content

fix query errors processing (#6441) #6451

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 9, 2024
Merged

fix query errors processing (#6441) #6451

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ydb/core/viewer/json_query.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,7 +481,7 @@ class TJsonQuery : public TViewerPipeClient<TJsonQuery> {
NViewer::MakeErrorReply(jsonResponse, message, status);

if (Span) {
Span.EndError("Error");
Span.EndError(message);
}
}

Expand Down
31 changes: 17 additions & 14 deletions ydb/core/viewer/viewer.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -779,31 +779,34 @@ void MakeErrorReply(NJson::TJsonValue& jsonResponse, TString& message, const NYd
NYql::IssuesToMessage(status.GetIssues(), &protoIssues);

message.clear();

NJson::TJsonValue& jsonIssues = jsonResponse["issues"];
for (const auto& queryIssue : protoIssues) {
NJson::TJsonValue& issue = jsonIssues.AppendValue({});
NProtobufJson::Proto2Json(queryIssue, issue);
}

TString textStatus = TStringBuilder() << status.GetStatus();
jsonResponse["status"] = textStatus;

// find first deepest error
std::stable_sort(protoIssues.begin(), protoIssues.end(), [](const Ydb::Issue::IssueMessage& a, const Ydb::Issue::IssueMessage& b) -> bool {
return a.severity() < b.severity();
});

while (protoIssues.size() > 0 && protoIssues[0].issuesSize() > 0) {
protoIssues = protoIssues[0].issues();
const google::protobuf::RepeatedPtrField<Ydb::Issue::IssueMessage>* protoIssuesPtr = &protoIssues;
while (protoIssuesPtr->size() > 0 && protoIssuesPtr->at(0).issuesSize() > 0) {
protoIssuesPtr = &protoIssuesPtr->at(0).issues();
}

if (protoIssues.size() > 0) {
const Ydb::Issue::IssueMessage& issue = protoIssues[0];
if (protoIssuesPtr->size() > 0) {
const Ydb::Issue::IssueMessage& issue = protoIssuesPtr->at(0);
NProtobufJson::Proto2Json(issue, jsonResponse["error"]);
message = issue.message();
} else {
jsonResponse["error"]["message"] = textStatus;
}

NJson::TJsonValue& jsonIssues = jsonResponse["issues"];
for (const auto& queryIssue : protoIssues) {
NJson::TJsonValue& issue = jsonIssues.AppendValue({});
NProtobufJson::Proto2Json(queryIssue, issue);
}

TString textStatus = TStringBuilder() << status.GetStatus();

jsonResponse["status"] = textStatus;

if (message.empty()) {
message = textStatus;
}
Expand Down
Loading