Skip to content

Commit d116509

Browse files
authored
Remove TEventSimple (#6715)
1 parent a037131 commit d116509

File tree

4 files changed

+7
-29
lines changed

4 files changed

+7
-29
lines changed

ydb/core/protos/tx_proxy.proto

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,9 @@ message TEvInvalidateTable {
277277
optional uint64 TableId = 2;
278278
}
279279

280+
message TEvInvalidateTableResult {
281+
}
282+
280283
message TEvExportRequest {
281284
optional string DatabaseName = 1;
282285
optional string UserToken = 2;

ydb/core/tx/tx_proxy/datareq.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,7 @@ class TDataReq : public TActor<TDataReq> {
288288

289289
static_assert(EvEnd < EventSpaceEnd(TEvents::ES_PRIVATE), "expect EvEnd < EventSpaceEnd(TEvents::ES_PRIVATE)");
290290

291-
struct TEvProxyDataReqOngoingTransactionWatchdog : public TEventSimple<TEvProxyDataReqOngoingTransactionWatchdog, EvProxyDataReqOngoingTransactionsWatchdog> {};
291+
struct TEvProxyDataReqOngoingTransactionsWatchdog : public TEventLocal<TEvProxyDataReqOngoingTransactionsWatchdog, EvProxyDataReqOngoingTransactionsWatchdog> {};
292292

293293
struct TEvReattachToShard : public TEventLocal<TEvReattachToShard, EvReattachToShard> {
294294
const ui64 TabletId;
@@ -1306,7 +1306,7 @@ void TDataReq::Handle(TEvTxProxyReq::TEvMakeRequest::TPtr &ev, const TActorConte
13061306
}
13071307

13081308
WallClockAccepted = Now();
1309-
ctx.Schedule(TDuration::MilliSeconds(KIKIMR_DATAREQ_WATCHDOG_PERIOD), new TEvPrivate::TEvProxyDataReqOngoingTransactionWatchdog());
1309+
ctx.Schedule(TDuration::MilliSeconds(KIKIMR_DATAREQ_WATCHDOG_PERIOD), new TEvPrivate::TEvProxyDataReqOngoingTransactionsWatchdog());
13101310

13111311
// Schedule execution timeout
13121312
{
@@ -2942,7 +2942,7 @@ void TDataReq::HandleWatchdog(const TActorContext &ctx) {
29422942
LOG_LOG_S_SAMPLED_BY(ctx, NActors::NLog::PRI_INFO, NKikimrServices::TX_PROXY, TxId,
29432943
"Actor# " << ctx.SelfID.ToString() << " txid# " << TxId
29442944
<< " Transactions still running for " << fromStart);
2945-
ctx.Schedule(TDuration::MilliSeconds(KIKIMR_DATAREQ_WATCHDOG_PERIOD), new TEvPrivate::TEvProxyDataReqOngoingTransactionWatchdog());
2945+
ctx.Schedule(TDuration::MilliSeconds(KIKIMR_DATAREQ_WATCHDOG_PERIOD), new TEvPrivate::TEvProxyDataReqOngoingTransactionsWatchdog());
29462946
}
29472947

29482948
void TDataReq::SendStreamClearanceResponse(ui64 shard, bool cleared, const TActorContext &ctx)

ydb/core/tx/tx_proxy/proxy.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ struct TEvTxUserProxy {
170170
}
171171
};
172172

173-
struct TEvInvalidateTableResult : public TEventSimple<TEvInvalidateTableResult, EvInvalidateTableResult> {};
173+
struct TEvInvalidateTableResult : public TEventPB<TEvInvalidateTableResult, NKikimrTxUserProxy::TEvInvalidateTableResult, EvInvalidateTableResult> {};
174174

175175
struct TEvProposeKqpTransaction : public TEventLocal<TEvProposeKqpTransaction, EvProposeKqpTransaction> {
176176
TActorId ExecuterId;

ydb/library/actors/core/event_local.h

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -46,29 +46,4 @@ namespace NActors {
4646
}
4747
};
4848

49-
template <typename TEv, ui32 TEventType>
50-
class TEventSimple: public TEventBase<TEv, TEventType> {
51-
public:
52-
TString ToStringHeader() const override {
53-
static TString header(TypeName<TEv>());
54-
return header;
55-
}
56-
57-
bool SerializeToArcadiaStream(TChunkSerializer* /*serializer*/) const override {
58-
static_assert(sizeof(TEv) == sizeof(TEventSimple<TEv, TEventType>), "Descendant should be an empty class");
59-
return true;
60-
}
61-
62-
bool IsSerializable() const override {
63-
return true;
64-
}
65-
66-
static IEventBase* Load(NActors::TEventSerializedData*) {
67-
return new TEv();
68-
}
69-
70-
static IEventBase* Load(const TString&) {
71-
return new TEv();
72-
}
73-
};
7449
}

0 commit comments

Comments
 (0)