Skip to content

Commit 22b98a2

Browse files
lberserqKamil Khamitov
lberserq
and
Kamil Khamitov
authored
Split ydb/core/control circular dependencies with ydb/core/base (#14972), KIKIMR-22738
Co-authored-by: Kamil Khamitov <[email protected]>
1 parent a697f06 commit 22b98a2

Some content is hidden

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

58 files changed

+125
-87
lines changed

‎ydb/core/base/appdata.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include "resource_profile.h"
1111
#include "event_filter.h"
1212

13-
#include <ydb/core/control/immediate_control_board_impl.h>
13+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
1414
#include <ydb/core/grpc_services/grpc_helper.h>
1515
#include <ydb/core/jaeger_tracing/sampling_throttling_configurator.h>
1616
#include <ydb/core/tablet_flat/shared_cache_pages.h>

‎ydb/core/base/appdata.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include "resource_profile.h"
2929
#include "event_filter.h"
3030

31-
#include <ydb/core/control/immediate_control_board_impl.h>
31+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
3232
#include <ydb/library/pdisk_io/aio.h>
3333

3434
#include <ydb/core/base/event_filter.h>

‎ydb/core/blobstorage/common/immediate_control_defaults.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22

33
#include "defs.h"
4-
#include <ydb/core/control/immediate_control_board_wrapper.h>
4+
#include <ydb/core/control/lib/immediate_control_board_wrapper.h>
55

66
namespace NKikimr {
77

‎ydb/core/blobstorage/dsproxy/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ PEERDIR(
6868
ydb/core/blobstorage/groupinfo
6969
ydb/core/blobstorage/storagepoolmon
7070
ydb/core/blobstorage/vdisk/ingress
71-
ydb/core/control
71+
ydb/core/control/lib
7272
ydb/core/util
7373
)
7474

‎ydb/core/blobstorage/nodewarden/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ PEERDIR(
4141
ydb/core/blobstorage/crypto
4242
ydb/core/blobstorage/groupinfo
4343
ydb/core/blobstorage/pdisk
44-
ydb/core/control
44+
ydb/core/control/lib
4545
ydb/library/pdisk_io
4646
ydb/library/yaml_config
4747
ydb/core/util/actorsys_test

‎ydb/core/blobstorage/pdisk/blobstorage_pdisk_actorsystem_creator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <ydb/library/actors/core/executor_pool_basic.h>
1111
#include <ydb/library/actors/core/mon.h>
1212
#include <ydb/library/actors/core/scheduler_basic.h>
13-
#include <ydb/core/control/immediate_control_board_impl.h>
13+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
1414
#include <ydb/core/grpc_services/grpc_helper.h>
1515
#include <ydb/core/protos/config.pb.h>
1616
#include <ydb/core/protos/netclassifier.pb.h>

‎ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "blobstorage_pdisk_util_devicemode.h"
77

88
#include <ydb/core/base/blobstorage.h>
9-
#include <ydb/core/control/immediate_control_board_wrapper.h>
9+
#include <ydb/core/control/lib/immediate_control_board_wrapper.h>
1010
#include <ydb/library/pdisk_io/aio.h>
1111
#include <ydb/library/pdisk_io/drivedata.h>
1212
#include <ydb/library/pdisk_io/sector_map.h>

‎ydb/core/blobstorage/pdisk/blobstorage_pdisk_blockdevice_ut.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "blobstorage_pdisk_ut_defs.h"
99
#include "blobstorage_pdisk_ut_helpers.h"
1010

11-
#include <ydb/core/control/immediate_control_board_wrapper.h>
11+
#include <ydb/core/control/lib/immediate_control_board_wrapper.h>
1212
#include <ydb/core/util/random.h>
1313

1414
#include <library/cpp/deprecated/atomic/atomic.h>

‎ydb/core/blobstorage/pdisk/blobstorage_pdisk_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
#include <ydb/core/base/blobstorage.h>
55
#include <ydb/core/blobstorage/base/vdisk_priorities.h>
6-
#include <ydb/core/control/immediate_control_board_wrapper.h>
6+
#include <ydb/core/control/lib/immediate_control_board_wrapper.h>
77
#include <ydb/core/protos/blobstorage_base.pb.h>
88
#include <ydb/core/protos/blobstorage_config.pb.h>
99
#include <ydb/core/protos/blobstorage_disk.pb.h>

‎ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
#include "blobstorage_pdisk_request_id.h"
77

88
#include <ydb/core/blobstorage/base/blobstorage_events.h>
9-
#include <ydb/core/control/immediate_control_board_impl.h>
9+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
1010
#include <ydb/core/protos/blobstorage.pb.h>
1111
#include <ydb/core/blobstorage/crypto/secured_block.h>
1212
#include <ydb/library/schlab/schine/job_kind.h>

‎ydb/core/blobstorage/pdisk/blobstorage_pdisk_impl.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,11 @@
2020
#include "blobstorage_pdisk_writer.h"
2121
#include "blobstorage_pdisk_impl_metadata.h"
2222

23-
#include <ydb/core/control/immediate_control_board_impl.h>
23+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
24+
#include <ydb/core/control/lib/immediate_control_board_wrapper.h>
2425
#include <ydb/core/base/resource_profile.h>
2526
#include <ydb/core/node_whiteboard/node_whiteboard.h>
2627
#include <ydb/core/blobstorage/lwtrace_probes/blobstorage_probes.h>
27-
#include <ydb/core/control/immediate_control_board_wrapper.h>
2828
#include <ydb/core/driver_lib/version/version.h>
2929
#include <ydb/library/schlab/schine/scheduler.h>
3030
#include <ydb/library/schlab/schine/job_kind.h>

‎ydb/core/blobstorage/pdisk/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ PEERDIR(
2929
ydb/core/blobstorage/crypto
3030
ydb/core/blobstorage/groupinfo
3131
ydb/core/blobstorage/lwtrace_probes
32-
ydb/core/control
32+
ydb/core/control/lib
3333
ydb/core/driver_lib/version
3434
ydb/core/protos
3535
ydb/core/util

‎ydb/core/blobstorage/vdisk/common/vdisk_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include <ydb/core/base/blobstorage.h>
99
#include <ydb/core/protos/blobstorage_vdisk_config.pb.h>
1010
#include <ydb/core/protos/feature_flags.pb.h>
11-
#include <ydb/core/control/immediate_control_board_impl.h>
11+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
1212
#include <ydb/core/base/feature_flags.h>
1313

1414
namespace NKikimr {

‎ydb/core/blobstorage/vdisk/common/vdisk_performance_params.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#include "defs.h"
66

77
#include <ydb/library/pdisk_io/device_type.h>
8-
#include <ydb/core/control/immediate_control_board_wrapper.h>
8+
#include <ydb/core/control/lib/immediate_control_board_wrapper.h>
99

1010
namespace NKikimr {
1111

‎ydb/core/blobstorage/vdisk/skeleton/blobstorage_skeleton.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
#include <ydb/core/blobstorage/pdisk/blobstorage_pdisk_internal_interface.h>
4949
#include <ydb/core/cms/console/configs_dispatcher.h>
5050
#include <ydb/core/cms/console/console.h>
51-
#include <ydb/core/control/immediate_control_board_impl.h>
51+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
5252
#include <ydb/core/protos/node_whiteboard.pb.h>
5353
#include <ydb/core/node_whiteboard/node_whiteboard.h>
5454
#include <library/cpp/monlib/service/pages/templates.h>

‎ydb/core/blobstorage/vdisk/skeleton/skeleton_overload_handler.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include <ydb/core/blobstorage/vdisk/common/vdisk_pdiskctx.h>
33
#include <ydb/core/blobstorage/vdisk/hulldb/base/blobstorage_hullsatisfactionrank.h>
44
#include <ydb/core/blobstorage/vdisk/hullop/blobstorage_hull.h>
5-
#include <ydb/core/control/immediate_control_board_impl.h>
5+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
66
#include <ydb/core/util/queue_inplace.h>
77
#include <ydb/library/wilson_ids/wilson.h>
88
#include <ydb/library/actors/wilson/wilson_span.h>

‎ydb/core/blobstorage/vdisk/skeleton/skeleton_overload_handler.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <ydb/core/blobstorage/vdisk/common/vdisk_pdiskctx.h>
55
#include <ydb/core/blobstorage/vdisk/syncer/blobstorage_syncer_localwriter.h>
66
#include <ydb/core/blobstorage/vdisk/anubis_osiris/blobstorage_anubis_osiris.h>
7-
#include <ydb/core/control/immediate_control_board_impl.h>
7+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
88

99
namespace NKikimr {
1010

‎ydb/core/cms/console/immediate_controls_configurator.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#pragma once
22
#include "defs.h"
33

4-
#include <ydb/core/control/immediate_control_board_impl.h>
4+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
55

66
#include <util/generic/ptr.h>
77

‎ydb/core/cms/console/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ PEERDIR(
8686
ydb/core/blobstorage/groupinfo
8787
ydb/core/cms/console/validators
8888
ydb/core/config/init
89-
ydb/core/control
89+
ydb/core/control/lib
9090
ydb/core/engine/minikql
9191
ydb/core/mind
9292
ydb/core/node_whiteboard

‎ydb/core/control/immediate_control_board_actor_ut.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
#include "defs.h"
22
#include "immediate_control_board_actor.h"
3-
#include "immediate_control_board_wrapper.h"
43

54
#include <ydb/library/actors/interconnect/interconnect.h>
65
#include <ydb/core/mon/mon.h>
76
#include <ydb/core/base/appdata.h>
87
#include <ydb/core/base/counters.h>
98
#include <ydb/core/node_whiteboard/node_whiteboard.h>
109
#include <ydb/core/base/tablet.h>
10+
#include <ydb/core/control/lib/immediate_control_board_wrapper.h>
11+
1112
#include <ydb/library/actors/core/executor_pool_basic.h>
1213
#include <ydb/library/actors/core/executor_pool_io.h>
1314
#include <ydb/library/actors/core/hfunc.h>

‎ydb/core/control/immediate_control_board_impl.h

Lines changed: 1 addition & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,2 @@
11
#pragma once
2-
3-
#include "defs.h"
4-
#include "immediate_control_board_wrapper.h"
5-
6-
#include <ydb/core/util/concurrent_rw_hash.h>
7-
8-
namespace NKikimr {
9-
10-
class TControlBoard : public TThrRefBase {
11-
private:
12-
TConcurrentRWHashMap<TString, TIntrusivePtr<TControl>, 16> Board;
13-
14-
public:
15-
bool RegisterLocalControl(TControlWrapper control, TString name);
16-
17-
bool RegisterSharedControl(TControlWrapper& control, TString name);
18-
19-
void RestoreDefaults();
20-
21-
void RestoreDefault(TString name);
22-
23-
bool SetValue(TString name, TAtomic value, TAtomic &outPrevValue);
24-
25-
// Only for tests
26-
void GetValue(TString name, TAtomic &outValue, bool &outIsControlExists) const;
27-
28-
TString RenderAsHtml() const;
29-
};
30-
31-
}
2+
#include <ydb/core/control/lib/immediate_control_board_impl.h>

‎ydb/core/control/lib/defs.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
#pragma once
2+
#include <ydb/core/base/defs.h>

‎ydb/core/control/immediate_control_board_control.cpp renamed to ‎ydb/core/control/lib/immediate_control_board_control.cpp

File renamed without changes.

‎ydb/core/control/immediate_control_board_control.h renamed to ‎ydb/core/control/lib/immediate_control_board_control.h

File renamed without changes.

‎ydb/core/control/immediate_control_board_impl.cpp renamed to ‎ydb/core/control/lib/immediate_control_board_impl.cpp

File renamed without changes.

‎ydb/core/control/lib/immediate_control_board_impl.h

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
#pragma once
2+
3+
#include "defs.h"
4+
#include "immediate_control_board_wrapper.h"
5+
6+
#include <ydb/core/util/concurrent_rw_hash.h>
7+
8+
namespace NKikimr {
9+
10+
class TControlBoard : public TThrRefBase {
11+
private:
12+
TConcurrentRWHashMap<TString, TIntrusivePtr<TControl>, 16> Board;
13+
14+
public:
15+
bool RegisterLocalControl(TControlWrapper control, TString name);
16+
17+
bool RegisterSharedControl(TControlWrapper& control, TString name);
18+
19+
void RestoreDefaults();
20+
21+
void RestoreDefault(TString name);
22+
23+
bool SetValue(TString name, TAtomic value, TAtomic &outPrevValue);
24+
25+
// Only for tests
26+
void GetValue(TString name, TAtomic &outValue, bool &outIsControlExists) const;
27+
28+
TString RenderAsHtml() const;
29+
};
30+
31+
}

‎ydb/core/control/immediate_control_board_ut.cpp renamed to ‎ydb/core/control/lib/immediate_control_board_ut.cpp

File renamed without changes.

‎ydb/core/control/immediate_control_board_wrapper.h renamed to ‎ydb/core/control/lib/immediate_control_board_wrapper.h

File renamed without changes.

‎ydb/core/control/lib/ut/ya.make

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
UNITTEST_FOR(ydb/core/control/lib)
2+
3+
FORK_SUBTESTS()
4+
5+
SIZE(MEDIUM)
6+
7+
PEERDIR(
8+
library/cpp/testing/unittest
9+
util
10+
ydb/core/base
11+
)
12+
13+
SRCS(
14+
immediate_control_board_ut.cpp
15+
)
16+
17+
END()

‎ydb/core/control/lib/ya.make

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
LIBRARY()
2+
3+
PEERDIR(
4+
util
5+
ydb/core/base
6+
ydb/core/mon
7+
ydb/core/node_whiteboard
8+
library/cpp/deprecated/atomic
9+
)
10+
11+
SRCS(
12+
defs.h
13+
immediate_control_board_control.cpp
14+
immediate_control_board_control.h
15+
immediate_control_board_impl.cpp
16+
immediate_control_board_impl.h
17+
immediate_control_board_wrapper.h
18+
)
19+
20+
END()
21+
22+
RECURSE_FOR_TESTS(
23+
ut
24+
)

‎ydb/core/control/ut/ya.make

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ PEERDIR(
2222
)
2323

2424
SRCS(
25-
immediate_control_board_ut.cpp
2625
immediate_control_board_actor_ut.cpp
2726
)
2827

‎ydb/core/control/ya.make

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,23 +2,15 @@ LIBRARY()
22

33
PEERDIR(
44
ydb/library/actors/core
5-
library/cpp/monlib/dynamic_counters
6-
util
7-
ydb/core/base
8-
ydb/core/mon
9-
ydb/core/node_whiteboard
5+
ydb/core/control/lib
106
library/cpp/deprecated/atomic
117
)
128

139
SRCS(
1410
defs.h
1511
immediate_control_board_actor.cpp
1612
immediate_control_board_actor.h
17-
immediate_control_board_control.cpp
18-
immediate_control_board_control.h
19-
immediate_control_board_impl.cpp
2013
immediate_control_board_impl.h
21-
immediate_control_board_wrapper.h
2214
)
2315

2416
END()

‎ydb/core/grpc_services/grpc_helper.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#include "defs.h"
33
#include "grpc_mon.h"
44

5-
#include <ydb/core/control/immediate_control_board_impl.h>
5+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
66
#include <ydb/core/grpc_services/counters/counters.h>
77

88
#include <ydb/library/grpc/server/grpc_request.h>

‎ydb/core/grpc_services/ya.make

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ PEERDIR(
111111
ydb/core/actorlib_impl
112112
ydb/core/audit
113113
ydb/core/base
114-
ydb/core/control
114+
ydb/core/control/lib
115115
ydb/core/discovery
116116
ydb/core/engine
117117
ydb/core/formats

‎ydb/core/kqp/common/control.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "control.h"
22

33
#include <ydb/core/base/appdata_fwd.h>
4-
#include <ydb/core/control/immediate_control_board_impl.h>
4+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
55

66
namespace {
77

‎ydb/core/kqp/common/control.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#include <ydb/core/control/immediate_control_board_wrapper.h>
1+
#include <ydb/core/control/lib/immediate_control_board_wrapper.h>
22

33
namespace NKikimr::NKqp {
44

‎ydb/core/kqp/gateway/kqp_gateway.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
#include <ydb/core/kqp/counters/kqp_counters.h>
1111
#include <ydb/core/kqp/provider/yql_kikimr_gateway.h>
1212
#include <ydb/core/kqp/provider/yql_kikimr_settings.h>
13-
#include <ydb/core/control/immediate_control_board_impl.h>
13+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
1414
#include <ydb/core/tx/long_tx_service/public/lock_handle.h>
1515
#include <ydb/core/ydb_convert/table_profiles.h>
1616
#include <ydb/library/accessor/accessor.h>

‎ydb/core/kqp/session_actor/kqp_session_actor.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
#include <ydb/core/protos/table_service_config.pb.h>
1010
#include <ydb/library/yql/dq/actors/compute/dq_compute_actor_async_io_factory.h>
1111

12-
#include <ydb/core/control/immediate_control_board_wrapper.h>
12+
#include <ydb/core/control/lib/immediate_control_board_wrapper.h>
1313
#include <ydb/library/actors/core/actorid.h>
1414

1515
namespace NKikimr::NKqp::NComputeActor {

‎ydb/core/load_test/keyvalue_write.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <ydb/core/base/tablet_pipe.h>
55
#include <ydb/core/blobstorage/pdisk/blobstorage_pdisk.h>
66
#include <ydb/core/blobstorage/base/blobstorage_events.h>
7-
#include <ydb/core/control/immediate_control_board_impl.h>
7+
#include <ydb/core/control/lib/immediate_control_board_impl.h>
88
#include <ydb/core/keyvalue/keyvalue_events.h>
99

1010
#include <library/cpp/histogram/hdr/histogram.h>

0 commit comments

Comments
 (0)