Skip to content

Commit e12ca69

Browse files
maximyurchukmaximyurchuk
authored
Merge 50259a6 into 28816eb 
2 parents 28816eb + 50259a6 commit e12ca69

File tree

3 files changed

+170
-172
lines changed

3 files changed

+170
-172
lines changed

‎ydb/core/base/events.h

Lines changed: 165 additions & 169 deletions
Original file line numberDiff line numberDiff line change
@@ -3,183 +3,179 @@
33
#include <ydb/library/actors/core/events.h>
44
#include <ydb/library/actors/core/event_local.h>
55
#include <ydb/library/actors/core/event_pb.h>
6-
#include <ydb/library/yql/dq/actors/dq_events_ids.h>
7-
8-
#include <ydb/core/fq/libs/events/event_ids.h>
96

107
namespace NKikimr {
118

129
struct TKikimrEvents : TEvents {
1310
enum EEventSpaceKikimr {
1411
/* WARNING:
15-
Please mind that you should never change the order
16-
for the following keywords, you should consider
17-
issues about "rolling update".
12+
Please mind that you should never change values,
13+
you should consider issues about "rolling update".
1814
*/
19-
ES_KIKIMR_ES_BEGIN = ES_USERSPACE, //4096
20-
ES_STATESTORAGE, //4097
21-
ES_DEPRECATED_4098, //4098
22-
ES_BLOBSTORAGE, //4099
23-
ES_HIVE, //4100
24-
ES_TABLETBASE, //4101
25-
ES_TABLET, //4102
26-
ES_TABLETRESOLVER,
27-
ES_LOCAL,
28-
ES_DEPRECATED_4105,
29-
ES_TX_PROXY, // generic proxy commands 4106
30-
ES_TX_COORDINATOR,
31-
ES_TX_MEDIATOR,
32-
ES_TX_PROCESSING, // 4109
33-
ES_DEPRECATED_4110,
34-
ES_DEPRECATED_4111,
35-
ES_DEPRECATED_4112,
36-
ES_TX_DATASHARD,
37-
ES_DEPRECATED_4114,
38-
ES_TX_USERPROXY, // user proxy interface
39-
ES_SCHEME_CACHE,
40-
ES_TX_PROXY_REQ,
41-
ES_TABLET_PIPE,
42-
ES_DEPRECATED_4118,
43-
ES_TABLET_COUNTERS_AGGREGATOR,
44-
ES_DEPRECATED_4121,
45-
ES_PROXY_BUS, //4122
46-
ES_BOOTSTRAPPER,
47-
ES_TX_MEDIATORTIMECAST,
48-
ES_DEPRECATED_4125,
49-
ES_DEPRECATED_4126,
50-
ES_DEPRECATED_4127,
51-
ES_DEPRECATED_4128,
52-
ES_DEPRECATED_4129,
53-
ES_DEPRECATED_4130,
54-
ES_DEPRECATED_4131,
55-
ES_KEYVALUE, //4132
56-
ES_MSGBUS_TRACER,
57-
ES_RTMR_TABLET,
58-
ES_FLAT_EXECUTOR,
59-
ES_NODE_WHITEBOARD,
60-
ES_FLAT_TX_SCHEMESHARD, // 4137
61-
ES_PQ,
62-
ES_YQL_KIKIMR_PROXY,
63-
ES_PQ_META_CACHE,
64-
ES_DEPRECATED_4141,
65-
ES_PQ_L2_CACHE, //4142
66-
ES_TOKEN_BUILDER,
67-
ES_TICKET_PARSER,
68-
ES_KQP = NYql::NDq::TDqEvents::ES_DQ_COMPUTE_KQP_COMPATIBLE, // 4145
69-
ES_BLACKBOX_VALIDATOR,
70-
ES_SELF_PING,
71-
ES_PIPECACHE,
72-
ES_PQ_PROXY,
73-
ES_CMS,
74-
ES_NODE_BROKER,
75-
ES_TX_ALLOCATOR, //4152
15+
ES_KIKIMR_ES_BEGIN = ES_USERSPACE, // 4096
16+
ES_STATESTORAGE = 4097,
17+
ES_DEPRECATED_4098 = 4098,
18+
ES_BLOBSTORAGE = 4099,
19+
ES_HIVE = 4100,
20+
ES_TABLETBASE = 4101,
21+
ES_TABLET = 4102,
22+
ES_TABLETRESOLVER = 4103,
23+
ES_LOCAL = 4104,
24+
ES_DEPRECATED_4105 = 4105,
25+
ES_TX_PROXY = 4106,
26+
ES_TX_COORDINATOR = 4107,
27+
ES_TX_MEDIATOR = 4108,
28+
ES_TX_PROCESSING = 4109,
29+
ES_DEPRECATED_4110 = 4110,
30+
ES_DEPRECATED_4111 = 4111,
31+
ES_DEPRECATED_4112 = 4112,
32+
ES_TX_DATASHARD = 4113,
33+
ES_DEPRECATED_4114 = 4114,
34+
ES_TX_USERPROXY = 4115,
35+
ES_SCHEME_CACHE = 4116,
36+
ES_TX_PROXY_REQ = 4117,
37+
ES_TABLET_PIPE = 4118,
38+
ES_DEPRECATED_4118 = 4119,
39+
ES_TABLET_COUNTERS_AGGREGATOR = 4120,
40+
ES_DEPRECATED_4121 = 4121,
41+
ES_PROXY_BUS = 4122,
42+
ES_BOOTSTRAPPER = 4123,
43+
ES_TX_MEDIATORTIMECAST = 4124,
44+
ES_DEPRECATED_4125 = 4125,
45+
ES_DEPRECATED_4126 = 4126,
46+
ES_DEPRECATED_4127 = 4127,
47+
ES_DEPRECATED_4128 = 4128,
48+
ES_DEPRECATED_4129 = 4129,
49+
ES_DEPRECATED_4130 = 4130,
50+
ES_DEPRECATED_4131 = 4131,
51+
ES_KEYVALUE = 4132,
52+
ES_MSGBUS_TRACER = 4133,
53+
ES_RTMR_TABLET = 4134,
54+
ES_FLAT_EXECUTOR = 4135,
55+
ES_NODE_WHITEBOARD = 4136,
56+
ES_FLAT_TX_SCHEMESHARD = 4137,
57+
ES_PQ = 4138,
58+
ES_YQL_KIKIMR_PROXY = 4139,
59+
ES_PQ_META_CACHE = 4140,
60+
ES_DEPRECATED_4141 = 4141,
61+
ES_PQ_L2_CACHE = 4142,
62+
ES_TOKEN_BUILDER = 4143,
63+
ES_TICKET_PARSER = 4144,
64+
ES_KQP = 4145,
65+
ES_BLACKBOX_VALIDATOR = 4146,
66+
ES_SELF_PING = 4147,
67+
ES_PIPECACHE = 4148,
68+
ES_PQ_PROXY = 4149,
69+
ES_CMS = 4150,
70+
ES_NODE_BROKER = 4151,
71+
ES_TX_ALLOCATOR = 4152,
7672
// reserve event space for each RTMR process
77-
ES_RTMR_STORAGE,
78-
ES_RTMR_PROXY,
79-
ES_RTMR_PUSHER,
80-
ES_RTMR_HOST,
81-
ES_RESOURCE_BROKER,
82-
ES_VIEWER,
83-
ES_SUB_DOMAIN,
84-
ES_GRPC_PROXY_STATUS, //OLD
85-
ES_SQS,
86-
ES_BLOCKSTORE, //4162
87-
ES_RTMR_ICBUS,
88-
ES_TENANT_POOL,
89-
ES_USER_REGISTRY,
90-
ES_TVM_SETTINGS_UPDATER,
91-
ES_PQ_CLUSTERS_UPDATER,
92-
ES_TENANT_SLOT_BROKER,
93-
ES_GRPC_CALLS,
94-
ES_CONSOLE,
95-
ES_KESUS_PROXY,
96-
ES_KESUS,
97-
ES_CONFIGS_DISPATCHER,
98-
ES_IAM_SERVICE,
99-
ES_FOLDER_SERVICE,
100-
ES_GRPC_MON,
101-
ES_QUOTA, // must be in sync with ydb/core/quoter/public/quoter.h
102-
ES_COORDINATED_QUOTA,
103-
ES_ACCESS_SERVICE,
104-
ES_USER_ACCOUNT_SERVICE,
105-
ES_PQ_PROXY_NEW,
106-
ES_GRPC_STREAMING,
107-
ES_SCHEME_BOARD,
108-
ES_FLAT_TX_SCHEMESHARD_PROTECTED,
109-
ES_GRPC_REQUEST_PROXY,
110-
ES_EXPORT_SERVICE,
111-
ES_TX_ALLOCATOR_CLIENT,
112-
ES_PQ_CLUSTER_TRACKER,
113-
ES_NET_CLASSIFIER,
114-
ES_SYSTEM_VIEW,
115-
ES_TENANT_NODE_ENUMERATOR,
116-
ES_SERVICE_ACCOUNT_SERVICE,
117-
ES_INDEX_BUILD,
118-
ES_BLOCKSTORE_PRIVATE,
119-
ES_YT_WRAPPER,
120-
ES_S3_WRAPPER,
121-
ES_FILESTORE,
122-
ES_FILESTORE_PRIVATE,
123-
ES_YDB_METERING,
124-
ES_IMPORT_SERVICE, // 4200
125-
ES_TX_OLAPSHARD,
126-
ES_TX_COLUMNSHARD,
127-
ES_CROSSREF,
128-
ES_SCHEME_BOARD_MON,
129-
ES_YQL_ANALYTICS_PROXY = NFq::TEventIds::ES_YQL_ANALYTICS_PROXY,
130-
ES_BLOB_CACHE,
131-
ES_LONG_TX_SERVICE,
132-
ES_TEST_SHARD,
133-
ES_DATASTREAMS_PROXY,
134-
ES_IAM_TOKEN_SERVICE,
135-
ES_HEALTH_CHECK,
136-
ES_DQ = NYql::NDq::TDqEvents::ES_DQ_COMPUTE, // 4212
137-
ES_YQ, // 4213
138-
ES_CHANGE_EXCHANGE_DATASHARD,
139-
ES_DATABASE_SERVICE, //4215
140-
ES_SEQUENCESHARD, // 4216
141-
ES_SEQUENCEPROXY, // 4217
142-
ES_CLOUD_STORAGE,
143-
ES_CLOUD_STORAGE_PRIVATE,
144-
ES_FOLDER_SERVICE_ADAPTER,
145-
ES_PQ_PARTITION_WRITER,
146-
ES_YDB_PROXY,
147-
ES_REPLICATION_CONTROLLER,
148-
ES_HTTP_PROXY,
149-
ES_BLOB_DEPOT,
150-
ES_DATASHARD_LOAD,
151-
ES_METADATA_PROVIDER,
152-
ES_INTERNAL_REQUEST,
153-
ES_BACKGROUND_TASKS,
154-
ES_TIERING,
155-
ES_METADATA_INITIALIZER,
156-
ES_YDB_AUDIT_LOG,
157-
ES_METADATA_MANAGER,
158-
ES_METADATA_SECRET,
159-
ES_TEST_LOAD,
160-
ES_GRPC_CANCELATION,
161-
ES_DISCOVERY,
162-
ES_EXT_INDEX,
163-
ES_CONVEYOR,
164-
ES_KQP_SCAN_EXCHANGE,
165-
ES_IC_NODE_CACHE,
166-
ES_DATA_OPERATIONS,
167-
ES_KAFKA,
168-
ES_STATISTICS,
169-
ES_LDAP_AUTH_PROVIDER,
170-
ES_DB_METADATA_CACHE,
171-
ES_TABLE_CREATOR,
172-
ES_PQ_PARTITION_CHOOSER,
173-
ES_GRAPH,
174-
ES_REPLICATION_WORKER,
175-
ES_CHANGE_EXCHANGE,
176-
ES_S3_PROVIDER,
177-
ES_NEBIUS_ACCESS_SERVICE,
178-
ES_REPLICATION_SERVICE,
179-
ES_BACKUP_SERVICE,
180-
ES_TX_BACKGROUND,
181-
ES_SS_BG_TASKS,
182-
ES_LIMITER
73+
ES_RTMR_STORAGE = 4153,
74+
ES_RTMR_PROXY = 4154,
75+
ES_RTMR_PUSHER = 4155,
76+
ES_RTMR_HOST = 4156,
77+
ES_RESOURCE_BROKER = 4157,
78+
ES_VIEWER = 4158,
79+
ES_SUB_DOMAIN = 4159,
80+
ES_GRPC_PROXY_STATUS = 4160,
81+
ES_SQS = 4161,
82+
ES_BLOCKSTORE = 4162,
83+
ES_RTMR_ICBUS = 4163,
84+
ES_TENANT_POOL = 4164,
85+
ES_USER_REGISTRY = 4165,
86+
ES_TVM_SETTINGS_UPDATER = 4166,
87+
ES_PQ_CLUSTERS_UPDATER = 4167,
88+
ES_TENANT_SLOT_BROKER = 4168,
89+
ES_GRPC_CALLS = 4169,
90+
ES_CONSOLE = 4170,
91+
ES_KESUS_PROXY = 4171,
92+
ES_KESUS = 4172,
93+
ES_CONFIGS_DISPATCHER = 4173,
94+
ES_IAM_SERVICE = 4174,
95+
ES_FOLDER_SERVICE = 4175,
96+
ES_GRPC_MON = 4176,
97+
ES_QUOTA = 4177, // must be in sync with ydb/core/quoter/public/quoter.h
98+
ES_COORDINATED_QUOTA = 4178,
99+
ES_ACCESS_SERVICE = 4179,
100+
ES_USER_ACCOUNT_SERVICE = 4180,
101+
ES_PQ_PROXY_NEW = 4181,
102+
ES_GRPC_STREAMING = 4182,
103+
ES_SCHEME_BOARD = 4183,
104+
ES_FLAT_TX_SCHEMESHARD_PROTECTED = 4184,
105+
ES_GRPC_REQUEST_PROXY = 4185,
106+
ES_EXPORT_SERVICE = 4186,
107+
ES_TX_ALLOCATOR_CLIENT = 4187,
108+
ES_PQ_CLUSTER_TRACKER = 4188,
109+
ES_NET_CLASSIFIER = 4189,
110+
ES_SYSTEM_VIEW = 4190,
111+
ES_TENANT_NODE_ENUMERATOR = 4191,
112+
ES_SERVICE_ACCOUNT_SERVICE = 4192,
113+
ES_INDEX_BUILD = 4193,
114+
ES_BLOCKSTORE_PRIVATE = 4194,
115+
ES_YT_WRAPPER = 4195,
116+
ES_S3_WRAPPER = 4196,
117+
ES_FILESTORE = 4197,
118+
ES_FILESTORE_PRIVATE = 4198,
119+
ES_YDB_METERING = 4199,
120+
ES_IMPORT_SERVICE = 4200,
121+
ES_TX_OLAPSHARD = 4201,
122+
ES_TX_COLUMNSHARD = 4202,
123+
ES_CROSSREF = 4203,
124+
ES_SCHEME_BOARD_MON = 4204,
125+
ES_YQL_ANALYTICS_PROXY = 4205,
126+
ES_BLOB_CACHE = 4206,
127+
ES_LONG_TX_SERVICE = 4207,
128+
ES_TEST_SHARD = 4208,
129+
ES_DATASTREAMS_PROXY = 4209,
130+
ES_IAM_TOKEN_SERVICE = 4210,
131+
ES_HEALTH_CHECK = 4211,
132+
ES_DQ = 4212,
133+
ES_YQ = 4213,
134+
ES_CHANGE_EXCHANGE_DATASHARD = 4214,
135+
ES_DATABASE_SERVICE = 4215,
136+
ES_SEQUENCESHARD = 4216,
137+
ES_SEQUENCEPROXY = 4217,
138+
ES_CLOUD_STORAGE = 4218,
139+
ES_CLOUD_STORAGE_PRIVATE = 4219,
140+
ES_FOLDER_SERVICE_ADAPTER = 4220,
141+
ES_PQ_PARTITION_WRITER = 4221,
142+
ES_YDB_PROXY = 4222,
143+
ES_REPLICATION_CONTROLLER = 4223,
144+
ES_HTTP_PROXY = 4224,
145+
ES_BLOB_DEPOT = 4225,
146+
ES_DATASHARD_LOAD = 4226,
147+
ES_METADATA_PROVIDER = 4227,
148+
ES_INTERNAL_REQUEST = 4228,
149+
ES_BACKGROUND_TASKS = 4229,
150+
ES_TIERING = 4230,
151+
ES_METADATA_INITIALIZER = 4231,
152+
ES_YDB_AUDIT_LOG = 4232,
153+
ES_METADATA_MANAGER = 4233,
154+
ES_METADATA_SECRET = 4234,
155+
ES_TEST_LOAD = 4235,
156+
ES_GRPC_CANCELATION = 4236,
157+
ES_DISCOVERY = 4237,
158+
ES_EXT_INDEX = 4238,
159+
ES_CONVEYOR = 4239,
160+
ES_KQP_SCAN_EXCHANGE = 4240,
161+
ES_IC_NODE_CACHE = 4241,
162+
ES_DATA_OPERATIONS = 4242,
163+
ES_KAFKA = 4243,
164+
ES_STATISTICS = 4244,
165+
ES_LDAP_AUTH_PROVIDER = 4245,
166+
ES_DB_METADATA_CACHE = 4246,
167+
ES_TABLE_CREATOR = 4247,
168+
ES_PQ_PARTITION_CHOOSER = 4248,
169+
ES_GRAPH = 4249,
170+
ES_REPLICATION_WORKER = 4250,
171+
ES_CHANGE_EXCHANGE = 4251,
172+
ES_S3_PROVIDER = 4252,
173+
ES_NEBIUS_ACCESS_SERVICE = 4253,
174+
ES_REPLICATION_SERVICE = 4254,
175+
ES_BACKUP_SERVICE = 4255,
176+
ES_TX_BACKGROUND = 4256,
177+
ES_SS_BG_TASKS = 4257,
178+
ES_LIMITER = 4258,
183179
};
184180
};
185181

‎ydb/core/fq/libs/events/event_ids.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
#pragma once
2+
#include <ydb/core/base/events.h>
23
#include <ydb/library/actors/core/event_local.h>
34
#include <ydb/library/actors/core/events.h>
45

56
namespace NFq {
67

78
struct TEventIds {
89
enum EEventSpaceYqlProxy {
9-
ES_YQL_ANALYTICS_PROXY = 4205 //TKikimrEvents::ES_YQL_ANALYTICS_PROXY
10+
ES_YQL_ANALYTICS_PROXY = NKikimr::TKikimrEvents::ES_YQL_ANALYTICS_PROXY
1011
};
1112

1213
static constexpr ui32 EventSpace = ES_YQL_ANALYTICS_PROXY;

‎ydb/library/yql/dq/actors/dq_events_ids.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,15 @@
11
#pragma once
22

3+
#include <ydb/core/base/events.h>
34
#include <ydb/library/actors/core/events.h>
45

56
namespace NYql {
67
namespace NDq {
78

89
struct TDqEvents {
910
enum EEventSpaceDq {
10-
ES_DQ_COMPUTE_KQP_COMPATIBLE = 4145, // TKikimrEvents::ES_KQP
11-
ES_DQ_COMPUTE = 4212 //TKikimrEvents::ES_DQ
11+
ES_DQ_COMPUTE_KQP_COMPATIBLE = NKikimr::TKikimrEvents::ES_KQP,
12+
ES_DQ_COMPUTE = NKikimr::TKikimrEvents::ES_DQ
1213
};
1314

1415
enum EDqEvents {

0 commit comments

Comments
 (0)