Skip to content
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.

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

refactor viewer backend #7071

Merged
merged 1 commit into from
Aug 2, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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: 6 additions & 12 deletions ydb/core/viewer/browse.h
Original file line number Diff line number Diff line change
@@ -1,21 +1,16 @@
#pragma once
#include <ydb/library/actors/core/actor_bootstrapped.h>
#include <ydb/library/actors/core/mon.h>
#include <ydb/core/base/domain.h>
#include "browse_events.h"
#include "viewer.h"
#include "wb_aggregate.h"
#include <ydb/core/base/hive.h>
#include <ydb/core/base/tablet.h>
#include <ydb/core/base/tablet_pipe.h>
#include <ydb/library/services/services.pb.h>
#include <ydb/core/blobstorage/base/blobstorage_events.h>
#include <ydb/core/tx/schemeshard/schemeshard.h>
#include <ydb/core/tx/tx_proxy/proxy.h>
#include <ydb/core/viewer/protos/viewer.pb.h>
#include <ydb/core/viewer/json/json.h>
#include "browse_events.h"
#include "viewer.h"
#include "wb_aggregate.h"
#include <ydb/library/actors/core/actor_bootstrapped.h>

namespace NKikimr {
namespace NViewer {
namespace NKikimr::NViewer {

using namespace NActors;

Expand Down Expand Up @@ -646,4 +641,3 @@ class TBrowseTabletsCommon : public TActorBootstrapped<TBrowseTabletsCommon> {
};

}
}
17 changes: 4 additions & 13 deletions ydb/core/viewer/browse_db.h
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
#pragma once
#include <ydb/library/actors/core/actor_bootstrapped.h>
#include <ydb/library/actors/core/mon.h>
#include "browse.h"
#include "viewer.h"
#include "wb_aggregate.h"
#include <ydb/core/base/tablet.h>
#include <ydb/core/base/tablet_pipe.h>
#include <ydb/library/services/services.pb.h>
#include <ydb/core/protos/table_stats.pb.h>
#include <ydb/core/tx/schemeshard/schemeshard.h>
#include <ydb/core/tx/tx_proxy/proxy.h>
#include <ydb/core/viewer/protos/viewer.pb.h>
#include <ydb/core/viewer/json/json.h>
#include "viewer.h"
#include "browse.h"
#include "wb_aggregate.h"

namespace NKikimr {
namespace NViewerDB {
namespace NKikimr::NViewerDB {

using namespace NViewer;
using namespace NActors;
Expand Down Expand Up @@ -200,4 +192,3 @@ class TBrowseTable : public TBrowseTabletsCommon {
};

}
}
14 changes: 6 additions & 8 deletions ydb/core/viewer/browse_events.h
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
#pragma once

#include <ydb/library/actors/core/events.h>
#include <ydb/library/actors/core/event_local.h>
#include <ydb/core/viewer/protos/viewer.pb.h>

#include <util/generic/string.h>
#include <ydb/core/base/events.h>
#include <ydb/core/viewer/protos/viewer.pb.h>
#include <ydb/library/actors/core/event_local.h>
#include <ydb/library/actors/core/events.h>

namespace NKikimr {
namespace NViewer {
namespace NKikimr::NViewer {

namespace NViewerEvents {
enum EEv {
Expand Down Expand Up @@ -76,5 +75,4 @@ namespace NViewerEvents {
};
} // namespace NViewerEvents

} // namespace NViewer
} // namespace NKikimr
}
19 changes: 5 additions & 14 deletions ydb/core/viewer/browse_pq.h
Original file line number Diff line number Diff line change
@@ -1,20 +1,12 @@
#pragma once
#include <ydb/library/actors/core/actor_bootstrapped.h>
#include <ydb/library/actors/core/mon.h>
#include <ydb/core/base/tablet.h>
#include <ydb/core/base/tablet_pipe.h>
#include <ydb/core/persqueue/events/global.h>
#include <ydb/library/services/services.pb.h>
#include <ydb/core/tx/schemeshard/schemeshard.h>
#include <ydb/core/tx/tx_proxy/proxy.h>
#include <ydb/core/viewer/protos/viewer.pb.h>
#include <ydb/core/viewer/json/json.h>
#include "viewer.h"
#include "browse.h"
#include "viewer.h"
#include "wb_aggregate.h"
#include <ydb/core/base/tablet.h>
#include <ydb/core/persqueue/events/global.h>
#include <ydb/library/actors/core/actor_bootstrapped.h>

namespace NKikimr {
namespace NViewerPQ {
namespace NKikimr::NViewerPQ {

using namespace NViewer;
using namespace NActors;
Expand Down Expand Up @@ -419,4 +411,3 @@ class TBrowseTopic : public TBrowseCommon {
};

}
}
226 changes: 0 additions & 226 deletions ydb/core/viewer/check_access.h

This file was deleted.

13 changes: 4 additions & 9 deletions ydb/core/viewer/counters_hosts.h
Original file line number Diff line number Diff line change
@@ -1,16 +1,12 @@
#pragma once
#include <ydb/library/actors/core/actor_bootstrapped.h>
#include <ydb/library/actors/core/interconnect.h>
#include <ydb/library/actors/core/mon.h>
#include <ydb/library/actors/interconnect/interconnect.h>
#include "viewer.h"
#include <library/cpp/json/json_writer.h>
#include <ydb/core/base/nameservice.h>
#include <ydb/library/services/services.pb.h>
#include <ydb/core/node_whiteboard/node_whiteboard.h>
#include "viewer.h"
#include <ydb/library/actors/core/actor_bootstrapped.h>
#include <ydb/library/actors/interconnect/interconnect.h>

namespace NKikimr {
namespace NViewer {
namespace NKikimr::NViewer {

using namespace NActors;
using namespace NNodeWhiteboard;
Expand Down Expand Up @@ -173,4 +169,3 @@ class TCountersHostsList : public TActorBootstrapped<TCountersHostsList> {
};

}
}
5 changes: 2 additions & 3 deletions ydb/core/viewer/healthcheck_record.h
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
#pragma once
#include <util/digest/numeric.h>
#include <util/generic/string.h>

namespace NKikimr::NViewer {

using namespace NActors;
using namespace NMonitoring;

struct TMetricRecord {
TString Database;
Expand Down
Loading
Loading