Skip to content

Commit abb0092

Browse files
adameatadameat
committed
refactor viewer backend (ydb-platform#7071)
1 parent 1d7b521 commit abb0092

File tree

105 files changed

+3779
-4689
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+3779
-4689
lines changed

‎ydb/core/viewer/browse.h

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,16 @@
11
#pragma once
2-
#include <ydb/library/actors/core/actor_bootstrapped.h>
3-
#include <ydb/library/actors/core/mon.h>
4-
#include <ydb/core/base/domain.h>
2+
#include "browse_events.h"
3+
#include "viewer.h"
4+
#include "wb_aggregate.h"
55
#include <ydb/core/base/hive.h>
66
#include <ydb/core/base/tablet.h>
77
#include <ydb/core/base/tablet_pipe.h>
8-
#include <ydb/library/services/services.pb.h>
8+
#include <ydb/core/blobstorage/base/blobstorage_events.h>
99
#include <ydb/core/tx/schemeshard/schemeshard.h>
1010
#include <ydb/core/tx/tx_proxy/proxy.h>
11-
#include <ydb/core/viewer/protos/viewer.pb.h>
12-
#include <ydb/core/viewer/json/json.h>
13-
#include "browse_events.h"
14-
#include "viewer.h"
15-
#include "wb_aggregate.h"
11+
#include <ydb/library/actors/core/actor_bootstrapped.h>
1612

17-
namespace NKikimr {
18-
namespace NViewer {
13+
namespace NKikimr::NViewer {
1914

2015
using namespace NActors;
2116

@@ -646,4 +641,3 @@ class TBrowseTabletsCommon : public TActorBootstrapped<TBrowseTabletsCommon> {
646641
};
647642

648643
}
649-
}

‎ydb/core/viewer/browse_db.h

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
#pragma once
2-
#include <ydb/library/actors/core/actor_bootstrapped.h>
3-
#include <ydb/library/actors/core/mon.h>
2+
#include "browse.h"
3+
#include "viewer.h"
4+
#include "wb_aggregate.h"
45
#include <ydb/core/base/tablet.h>
5-
#include <ydb/core/base/tablet_pipe.h>
6-
#include <ydb/library/services/services.pb.h>
76
#include <ydb/core/protos/table_stats.pb.h>
87
#include <ydb/core/tx/schemeshard/schemeshard.h>
9-
#include <ydb/core/tx/tx_proxy/proxy.h>
10-
#include <ydb/core/viewer/protos/viewer.pb.h>
11-
#include <ydb/core/viewer/json/json.h>
12-
#include "viewer.h"
13-
#include "browse.h"
14-
#include "wb_aggregate.h"
158

16-
namespace NKikimr {
17-
namespace NViewerDB {
9+
namespace NKikimr::NViewerDB {
1810

1911
using namespace NViewer;
2012
using namespace NActors;
@@ -200,4 +192,3 @@ class TBrowseTable : public TBrowseTabletsCommon {
200192
};
201193

202194
}
203-
}

‎ydb/core/viewer/browse_events.h

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
#pragma once
22

3-
#include <ydb/library/actors/core/events.h>
4-
#include <ydb/library/actors/core/event_local.h>
5-
#include <ydb/core/viewer/protos/viewer.pb.h>
6-
73
#include <util/generic/string.h>
4+
#include <ydb/core/base/events.h>
5+
#include <ydb/core/viewer/protos/viewer.pb.h>
6+
#include <ydb/library/actors/core/event_local.h>
7+
#include <ydb/library/actors/core/events.h>
88

9-
namespace NKikimr {
10-
namespace NViewer {
9+
namespace NKikimr::NViewer {
1110

1211
namespace NViewerEvents {
1312
enum EEv {
@@ -76,5 +75,4 @@ namespace NViewerEvents {
7675
};
7776
} // namespace NViewerEvents
7877

79-
} // namespace NViewer
80-
} // namespace NKikimr
78+
}

‎ydb/core/viewer/browse_pq.h

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
#pragma once
2-
#include <ydb/library/actors/core/actor_bootstrapped.h>
3-
#include <ydb/library/actors/core/mon.h>
4-
#include <ydb/core/base/tablet.h>
5-
#include <ydb/core/base/tablet_pipe.h>
6-
#include <ydb/core/persqueue/events/global.h>
7-
#include <ydb/library/services/services.pb.h>
8-
#include <ydb/core/tx/schemeshard/schemeshard.h>
9-
#include <ydb/core/tx/tx_proxy/proxy.h>
10-
#include <ydb/core/viewer/protos/viewer.pb.h>
11-
#include <ydb/core/viewer/json/json.h>
12-
#include "viewer.h"
132
#include "browse.h"
3+
#include "viewer.h"
144
#include "wb_aggregate.h"
5+
#include <ydb/core/base/tablet.h>
6+
#include <ydb/core/persqueue/events/global.h>
7+
#include <ydb/library/actors/core/actor_bootstrapped.h>
158

16-
namespace NKikimr {
17-
namespace NViewerPQ {
9+
namespace NKikimr::NViewerPQ {
1810

1911
using namespace NViewer;
2012
using namespace NActors;
@@ -419,4 +411,3 @@ class TBrowseTopic : public TBrowseCommon {
419411
};
420412

421413
}
422-
}

‎ydb/core/viewer/check_access.h

Lines changed: 0 additions & 226 deletions
This file was deleted.

‎ydb/core/viewer/counters_hosts.h

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
#pragma once
2-
#include <ydb/library/actors/core/actor_bootstrapped.h>
3-
#include <ydb/library/actors/core/interconnect.h>
4-
#include <ydb/library/actors/core/mon.h>
5-
#include <ydb/library/actors/interconnect/interconnect.h>
2+
#include "viewer.h"
63
#include <library/cpp/json/json_writer.h>
74
#include <ydb/core/base/nameservice.h>
8-
#include <ydb/library/services/services.pb.h>
95
#include <ydb/core/node_whiteboard/node_whiteboard.h>
10-
#include "viewer.h"
6+
#include <ydb/library/actors/core/actor_bootstrapped.h>
7+
#include <ydb/library/actors/interconnect/interconnect.h>
118

12-
namespace NKikimr {
13-
namespace NViewer {
9+
namespace NKikimr::NViewer {
1410

1511
using namespace NActors;
1612
using namespace NNodeWhiteboard;
@@ -173,4 +169,3 @@ class TCountersHostsList : public TActorBootstrapped<TCountersHostsList> {
173169
};
174170

175171
}
176-
}

‎ydb/core/viewer/healthcheck_record.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
#pragma once
2+
#include <util/digest/numeric.h>
3+
#include <util/generic/string.h>
24

35
namespace NKikimr::NViewer {
4-
5-
using namespace NActors;
6-
using namespace NMonitoring;
76

87
struct TMetricRecord {
98
TString Database;

0 commit comments

Comments
 (0)