Skip to content

Commit 1afe069

Browse files
babenkoblinkov
babenko
authored and
blinkov
committed
YT-18571: Turn configs into structs
commit_hash:3674e694d6a99e354c9a4befc2ec8d106e2a00db
1 parent 4cb2e83 commit 1afe069

File tree

72 files changed

+301
-450
lines changed

Some content is hidden

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

72 files changed

+301
-450
lines changed

‎yt/yt/client/api/config.h

Lines changed: 9 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,9 @@ DEFINE_ENUM(EConnectionType,
2929

3030
////////////////////////////////////////////////////////////////////////////////
3131

32-
class TTableMountCacheConfig
32+
struct TTableMountCacheConfig
3333
: public NTabletClient::TTableMountCacheConfig
3434
{
35-
public:
3635
int OnErrorRetryCount;
3736
TDuration OnErrorSlackPeriod;
3837

@@ -45,10 +44,9 @@ DEFINE_REFCOUNTED_TYPE(TTableMountCacheConfig)
4544

4645
////////////////////////////////////////////////////////////////////////////////
4746

48-
class TConnectionConfig
47+
struct TConnectionConfig
4948
: public virtual NYTree::TYsonStruct
5049
{
51-
public:
5250
EConnectionType ConnectionType;
5351
std::optional<std::string> ClusterName;
5452
TTableMountCacheConfigPtr TableMountCache;
@@ -63,10 +61,9 @@ DEFINE_REFCOUNTED_TYPE(TConnectionConfig)
6361

6462
////////////////////////////////////////////////////////////////////////////////
6563

66-
class TConnectionDynamicConfig
64+
struct TConnectionDynamicConfig
6765
: public virtual NYTree::TYsonStruct
6866
{
69-
public:
7067
NTabletClient::TTableMountCacheDynamicConfigPtr TableMountCache;
7168

7269
TExponentialBackoffOptions TabletWriteBackoff;
@@ -80,10 +77,9 @@ DEFINE_REFCOUNTED_TYPE(TConnectionDynamicConfig)
8077

8178
////////////////////////////////////////////////////////////////////////////////
8279

83-
class TPersistentQueuePollerConfig
80+
struct TPersistentQueuePollerConfig
8481
: public virtual NYTree::TYsonStruct
8582
{
86-
public:
8783
//! Try to keep at most this many prefetched rows in memory. This limit is approximate.
8884
i64 MaxPrefetchRowCount;
8985

@@ -124,10 +120,9 @@ DEFINE_REFCOUNTED_TYPE(TPersistentQueuePollerConfig)
124120

125121
////////////////////////////////////////////////////////////////////////////////
126122

127-
class TFileReaderConfig
123+
struct TFileReaderConfig
128124
: public virtual NChunkClient::TMultiChunkReaderConfig
129125
{
130-
public:
131126
REGISTER_YSON_STRUCT(TFileReaderConfig);
132127

133128
static void Register(TRegistrar)
@@ -138,11 +133,10 @@ DEFINE_REFCOUNTED_TYPE(TFileReaderConfig)
138133

139134
////////////////////////////////////////////////////////////////////////////////
140135

141-
class TFileWriterConfig
136+
struct TFileWriterConfig
142137
: public NChunkClient::TMultiChunkWriterConfig
143138
, public NFileClient::TFileChunkWriterConfig
144139
{
145-
public:
146140
REGISTER_YSON_STRUCT(TFileWriterConfig);
147141

148142
static void Register(TRegistrar)
@@ -153,11 +147,10 @@ DEFINE_REFCOUNTED_TYPE(TFileWriterConfig)
153147

154148
////////////////////////////////////////////////////////////////////////////////
155149

156-
class TJournalReaderConfig
150+
struct TJournalReaderConfig
157151
: public NJournalClient::TChunkReaderConfig
158152
, public TWorkloadConfig
159153
{
160-
public:
161154
REGISTER_YSON_STRUCT(TJournalReaderConfig);
162155

163156
static void Register(TRegistrar)
@@ -168,10 +161,9 @@ DEFINE_REFCOUNTED_TYPE(TJournalReaderConfig)
168161

169162
////////////////////////////////////////////////////////////////////////////////
170163

171-
class TJournalChunkWriterConfig
164+
struct TJournalChunkWriterConfig
172165
: public virtual TWorkloadConfig
173166
{
174-
public:
175167
int MaxBatchRowCount;
176168
i64 MaxBatchDataSize;
177169
TDuration MaxBatchDelay;
@@ -205,10 +197,9 @@ DEFINE_REFCOUNTED_TYPE(TJournalChunkWriterConfig)
205197

206198
////////////////////////////////////////////////////////////////////////////////
207199

208-
class TJournalWriterConfig
200+
struct TJournalWriterConfig
209201
: public TJournalChunkWriterConfig
210202
{
211-
public:
212203
int MaxChunkRowCount;
213204
i64 MaxChunkDataSize;
214205
TDuration MaxChunkSessionDuration;

‎yt/yt/client/api/public.h

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -156,17 +156,17 @@ DECLARE_REFCOUNTED_STRUCT(IJournalWriter)
156156

157157
DECLARE_REFCOUNTED_CLASS(TPersistentQueuePoller)
158158

159-
DECLARE_REFCOUNTED_CLASS(TTableMountCacheConfig)
160-
DECLARE_REFCOUNTED_CLASS(TConnectionConfig)
161-
DECLARE_REFCOUNTED_CLASS(TConnectionDynamicConfig)
162-
DECLARE_REFCOUNTED_CLASS(TPersistentQueuePollerConfig)
159+
DECLARE_REFCOUNTED_STRUCT(TTableMountCacheConfig)
160+
DECLARE_REFCOUNTED_STRUCT(TConnectionConfig)
161+
DECLARE_REFCOUNTED_STRUCT(TConnectionDynamicConfig)
162+
DECLARE_REFCOUNTED_STRUCT(TPersistentQueuePollerConfig)
163163

164-
DECLARE_REFCOUNTED_CLASS(TFileReaderConfig)
165-
DECLARE_REFCOUNTED_CLASS(TFileWriterConfig)
166-
DECLARE_REFCOUNTED_CLASS(TJournalReaderConfig)
164+
DECLARE_REFCOUNTED_STRUCT(TFileReaderConfig)
165+
DECLARE_REFCOUNTED_STRUCT(TFileWriterConfig)
166+
DECLARE_REFCOUNTED_STRUCT(TJournalReaderConfig)
167167

168-
DECLARE_REFCOUNTED_CLASS(TJournalChunkWriterConfig)
169-
DECLARE_REFCOUNTED_CLASS(TJournalWriterConfig)
168+
DECLARE_REFCOUNTED_STRUCT(TJournalChunkWriterConfig)
169+
DECLARE_REFCOUNTED_STRUCT(TJournalWriterConfig)
170170

171171
DECLARE_REFCOUNTED_CLASS(TJournalChunkWriterOptions)
172172

‎yt/yt/client/api/rpc_proxy/config.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,9 @@ namespace NYT::NApi::NRpcProxy {
1919

2020
////////////////////////////////////////////////////////////////////////////////
2121

22-
class TConnectionConfig
22+
struct TConnectionConfig
2323
: public NApi::TConnectionConfig
2424
{
25-
public:
2625
static TConnectionConfigPtr CreateFromClusterUrl(
2726
const std::string& clusterUrl,
2827
const std::optional<std::string>& proxyRole = {});

‎yt/yt/client/api/rpc_proxy/public.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ struct TConnectionOptions;
1111
DECLARE_REFCOUNTED_STRUCT(IRowStreamEncoder)
1212
DECLARE_REFCOUNTED_STRUCT(IRowStreamDecoder)
1313

14-
DECLARE_REFCOUNTED_CLASS(TConnectionConfig)
14+
DECLARE_REFCOUNTED_STRUCT(TConnectionConfig)
1515

1616
extern const TString ApiServiceName;
1717
extern const TString DiscoveryServiceName;

‎yt/yt/client/chaos_client/config.h

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,10 @@ namespace NYT::NChaosClient {
1010

1111
////////////////////////////////////////////////////////////////////////////////
1212

13-
class TChaosCacheChannelConfig
13+
struct TChaosCacheChannelConfig
1414
: public NRpc::TRetryingChannelConfig
1515
, public NRpc::TBalancingChannelConfig
1616
{
17-
public:
1817
REGISTER_YSON_STRUCT(TChaosCacheChannelConfig);
1918

2019
static void Register(TRegistrar /*registrar*/)
@@ -25,11 +24,10 @@ DEFINE_REFCOUNTED_TYPE(TChaosCacheChannelConfig)
2524

2625
////////////////////////////////////////////////////////////////////////////////
2726

28-
class TReplicationCardCacheConfig
27+
struct TReplicationCardCacheConfig
2928
: public TAsyncExpiringCacheConfig
3029
, public TChaosCacheChannelConfig
3130
{
32-
public:
3331
bool EnableWatching;
3432

3533
REGISTER_YSON_STRUCT(TReplicationCardCacheConfig);
@@ -41,10 +39,9 @@ DEFINE_REFCOUNTED_TYPE(TReplicationCardCacheConfig)
4139

4240
////////////////////////////////////////////////////////////////////////////////
4341

44-
class TReplicationCardCacheDynamicConfig
42+
struct TReplicationCardCacheDynamicConfig
4543
: public virtual NYTree::TYsonStruct
4644
{
47-
public:
4845
std::optional<bool> EnableWatching;
4946

5047
REGISTER_YSON_STRUCT(TReplicationCardCacheDynamicConfig);

‎yt/yt/client/chaos_client/public.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ constexpr int MaxReplicasPerReplicationCard = 128;
2424
DECLARE_REFCOUNTED_STRUCT(TReplicationCard)
2525

2626
DECLARE_REFCOUNTED_STRUCT(IReplicationCardCache)
27-
DECLARE_REFCOUNTED_CLASS(TChaosCacheChannelConfig)
28-
DECLARE_REFCOUNTED_CLASS(TReplicationCardCacheConfig)
29-
DECLARE_REFCOUNTED_CLASS(TReplicationCardCacheDynamicConfig)
27+
DECLARE_REFCOUNTED_STRUCT(TChaosCacheChannelConfig)
28+
DECLARE_REFCOUNTED_STRUCT(TReplicationCardCacheConfig)
29+
DECLARE_REFCOUNTED_STRUCT(TReplicationCardCacheDynamicConfig)
3030

3131
struct TReplicationProgress;
3232
struct TReplicaHistoryItem;

‎yt/yt/client/chunk_client/config.h

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@ namespace NYT::NChunkClient {
1010

1111
////////////////////////////////////////////////////////////////////////////////
1212

13-
class TFetchChunkSpecConfig
13+
struct TFetchChunkSpecConfig
1414
: public virtual NYTree::TYsonStruct
1515
{
16-
public:
1716
int MaxChunksPerFetch;
1817
int MaxChunksPerLocateRequest;
1918

@@ -26,10 +25,9 @@ DEFINE_REFCOUNTED_TYPE(TFetchChunkSpecConfig)
2625

2726
////////////////////////////////////////////////////////////////////////////////
2827

29-
class TFetcherConfig
28+
struct TFetcherConfig
3029
: public virtual NYTree::TYsonStruct
3130
{
32-
public:
3331
TDuration NodeRpcTimeout;
3432

3533
//! If node throttled fetch request, it becomes banned for this period of time.
@@ -52,10 +50,9 @@ DEFINE_REFCOUNTED_TYPE(TFetcherConfig)
5250

5351
////////////////////////////////////////////////////////////////////////////////
5452

55-
class TBlockReordererConfig
53+
struct TBlockReordererConfig
5654
: public virtual NYTree::TYsonStruct
5755
{
58-
public:
5956
bool EnableBlockReordering;
6057

6158
//! Instead of grouping blocks by column groups, shuffle them.
@@ -71,10 +68,9 @@ DEFINE_REFCOUNTED_TYPE(TBlockReordererConfig)
7168

7269
////////////////////////////////////////////////////////////////////////////////
7370

74-
class TChunkSliceFetcherConfig
71+
struct TChunkSliceFetcherConfig
7572
: public TFetcherConfig
7673
{
77-
public:
7874
int MaxSlicesPerFetch;
7975

8076
REGISTER_YSON_STRUCT(TChunkSliceFetcherConfig);
@@ -86,11 +82,10 @@ DEFINE_REFCOUNTED_TYPE(TChunkSliceFetcherConfig)
8682

8783
////////////////////////////////////////////////////////////////////////////////
8884

89-
class TEncodingWriterConfig
85+
struct TEncodingWriterConfig
9086
: public virtual TWorkloadConfig
9187
, public virtual TBlockReordererConfig
9288
{
93-
public:
9489
i64 EncodeWindowSize;
9590
double DefaultCompressionRatio;
9691
bool VerifyCompression;
@@ -130,10 +125,9 @@ class TRemoteReaderConfigBase
130125

131126
////////////////////////////////////////////////////////////////////////////////
132127

133-
class TReplicationReaderConfig
128+
struct TReplicationReaderConfig
134129
: public virtual TRemoteReaderConfigBase
135130
{
136-
public:
137131
//! Timeout for a block request.
138132
TDuration BlockRpcTimeout;
139133

@@ -259,10 +253,9 @@ DEFINE_REFCOUNTED_TYPE(TReplicationReaderConfig)
259253

260254
////////////////////////////////////////////////////////////////////////////////
261255

262-
class TBlockFetcherConfig
256+
struct TBlockFetcherConfig
263257
: public virtual NYTree::TYsonStruct
264258
{
265-
public:
266259
//! Prefetch window size (in bytes).
267260
i64 WindowSize;
268261

@@ -284,11 +277,10 @@ DEFINE_REFCOUNTED_TYPE(TBlockFetcherConfig)
284277

285278
////////////////////////////////////////////////////////////////////////////////
286279

287-
class TErasureReaderConfig
280+
struct TErasureReaderConfig
288281
: public virtual TReplicationReaderConfig
289282
, public virtual TBlockFetcherConfig
290283
{
291-
public:
292284
bool EnableAutoRepair;
293285
double ReplicationReaderSpeedLimitPerSec;
294286
TDuration SlowReaderExpirationTimeout;
@@ -304,13 +296,12 @@ DEFINE_REFCOUNTED_TYPE(TErasureReaderConfig)
304296

305297
////////////////////////////////////////////////////////////////////////////////
306298

307-
class TMultiChunkReaderConfig
299+
struct TMultiChunkReaderConfig
308300
: public virtual TErasureReaderConfig
309301
, public virtual TBlockFetcherConfig
310302
, public virtual TFetchChunkSpecConfig
311303
, public virtual TWorkloadConfig
312304
{
313-
public:
314305
i64 MaxBufferSize;
315306
int MaxParallelReaders;
316307

@@ -323,11 +314,10 @@ DEFINE_REFCOUNTED_TYPE(TMultiChunkReaderConfig)
323314

324315
////////////////////////////////////////////////////////////////////////////////
325316

326-
class TReplicationWriterConfig
317+
struct TReplicationWriterConfig
327318
: public virtual TWorkloadConfig
328319
, public virtual TBlockReordererConfig
329320
{
330-
public:
331321
//! Maximum window size (in bytes).
332322
i64 SendWindowSize;
333323

@@ -387,10 +377,9 @@ DEFINE_REFCOUNTED_TYPE(TReplicationWriterConfig)
387377

388378
////////////////////////////////////////////////////////////////////////////////
389379

390-
class TErasureWriterConfig
380+
struct TErasureWriterConfig
391381
: public virtual TBlockReordererConfig
392382
{
393-
public:
394383
i64 WriterWindowSize;
395384
i64 WriterGroupSize;
396385

@@ -416,11 +405,10 @@ DEFINE_REFCOUNTED_TYPE(TErasureWriterConfig)
416405

417406
////////////////////////////////////////////////////////////////////////////////
418407

419-
class TMultiChunkWriterConfig
408+
struct TMultiChunkWriterConfig
420409
: public TReplicationWriterConfig
421410
, public TErasureWriterConfig
422411
{
423-
public:
424412
i64 DesiredChunkSize;
425413
i64 DesiredChunkWeight;
426414
i64 MaxMetaSize;
@@ -460,10 +448,9 @@ DEFINE_REFCOUNTED_TYPE(TEncodingWriterOptions)
460448

461449
////////////////////////////////////////////////////////////////////////////////
462450

463-
class TChunkFragmentReaderConfig
451+
struct TChunkFragmentReaderConfig
464452
: public virtual TRemoteReaderConfigBase
465453
{
466-
public:
467454
//! Expiration timeout of corresponding sync expiring cache.
468455
TDuration PeerInfoExpirationTimeout;
469456

0 commit comments

Comments
 (0)