Skip to content

intersect node filters for tabletinfo handler #9850

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
adameat merged 1 commit into from
Sep 27, 2024
Merged

intersect node filters for tabletinfo handler #9850

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
18 changes: 17 additions & 1 deletion ydb/core/viewer/json_wb_req.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,23 @@ class TJsonWhiteboardRequest : public TWhiteboardRequest<TRequestEventType, TRes

void Bootstrap() override {
const auto& params(Event->Get()->Request.GetParams());
SplitIds(params.Get("node_id"), ',', TBase::RequestSettings.FilterNodeIds);
std::vector<TNodeId> nodeIds;
SplitIds(params.Get("node_id"), ',', nodeIds);
if (!nodeIds.empty()) {
if (TBase::RequestSettings.FilterNodeIds.empty()) {
TBase::RequestSettings.FilterNodeIds = nodeIds;
} else {
std::sort(nodeIds.begin(), nodeIds.end());
std::sort(TBase::RequestSettings.FilterNodeIds.begin(), TBase::RequestSettings.FilterNodeIds.end());
std::vector<TNodeId> intersection;
std::set_intersection(nodeIds.begin(), nodeIds.end(), TBase::RequestSettings.FilterNodeIds.begin(), TBase::RequestSettings.FilterNodeIds.end(), std::back_inserter(intersection));
if (intersection.empty()) {
TBase::RequestSettings.FilterNodeIds = {0};
} else {
TBase::RequestSettings.FilterNodeIds = intersection;
}
}
}
{
TString merge = params.Get("merge");
if (merge.empty() || merge == "1" || merge == "true") {
Expand Down
9 changes: 5 additions & 4 deletions ydb/core/viewer/viewer_tabletinfo.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,13 @@ class TJsonTabletInfo : public TJsonWhiteboardRequest<TEvWhiteboard::TEvTabletSt
}

void Bootstrap() override {
BLOG_TRACE("Bootstrap()");
if (NeedToRedirect()) {
return;
}
const auto& params(Event->Get()->Request.GetParams());
TBase::RequestSettings.Timeout = FromStringWithDefault<ui32>(params.Get("timeout"), 10000);
TString database = params.Get("database");
if (database) {
RegisterWithSameMailbox(CreateBoardLookupActor(MakeEndpointsBoardPath(database), TBase::SelfId(), EBoardLookupMode::Second));
if (Database) {
RegisterWithSameMailbox(CreateBoardLookupActor(MakeEndpointsBoardPath(Database), TBase::SelfId(), EBoardLookupMode::Second));
Become(&TThis::StateRequestedLookup, TDuration::MilliSeconds(TBase::RequestSettings.Timeout), new TEvents::TEvWakeup());
return;
}
Expand Down