Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change some event scopes from struct to namespace #10685

Merged
merged 1 commit into from
Oct 29, 2024
Merged

change some event scopes from struct to namespace #10685

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ydb/core/base/hive.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include <util/stream/str.h>

namespace NKikimr {
struct TEvHive {
namespace TEvHive {
enum EEv {
// requests
EvBootTablet = EventSpaceBegin(TKikimrEvents::ES_HIVE),
Expand Down Expand Up @@ -888,7 +888,7 @@ namespace NKikimr {
Record.MutableDomainKey()->CopyFrom(domainKey);
}
};

struct TEvResponseScaleRecommendation : TEventPB<TEvResponseScaleRecommendation,
NKikimrHive::TEvResponseScaleRecommendation, EvResponseScaleRecommendation> {};
};
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/blob_depot/events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

namespace NKikimr {

struct TEvBlobDepot {
namespace TEvBlobDepot {
enum {
EvApplyConfig = EventSpaceBegin(TKikimrEvents::ES_BLOB_DEPOT),
EvApplyConfigResult,
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/blockstore/core/blockstore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace NKikimr {

struct TEvBlockStore {
namespace TEvBlockStore {
enum EEv {
EvBegin = EventSpaceBegin(TKikimrEvents::ES_BLOCKSTORE) + 1011,

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/cms/cms_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@

namespace NKikimr::NCms {

using NConsole::TEvConsole;
namespace TEvConsole = NConsole::TEvConsole;
using NTabletFlatExecutor::TTabletExecutedFlat;
using NTabletFlatExecutor::ITransaction;
using NTabletFlatExecutor::TTransactionBase;
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/cms/console/configs_dispatcher.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ namespace NKikimr::NConsole {
* ConfigId filled in and request Cookie used for response).
*/

struct TEvConfigsDispatcher {
namespace TEvConfigsDispatcher {
enum EEv {
EvSetConfigSubscriptionRequest = EventSpaceBegin(TKikimrEvents::ES_CONFIGS_DISPATCHER),
EvSetConfigSubscriptionResponse,
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/cms/console/console.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

namespace NKikimr::NConsole {

struct TEvConsole {
namespace TEvConsole {
enum EEv {
// requests
EvCreateTenantRequest = EventSpaceBegin(TKikimrEvents::ES_CONSOLE),
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/cms/console/console_tenants_manager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ using NTabletFlatExecutor::TTabletExecutedFlat;
using NTabletFlatExecutor::ITransaction;
using NTabletFlatExecutor::TTransactionBase;
using NTabletFlatExecutor::TTransactionContext;
using NSchemeShard::TEvSchemeShard;
namespace TEvSchemeShard = NSchemeShard::TEvSchemeShard;
using NTenantSlotBroker::TEvTenantSlotBroker;
using NTenantSlotBroker::TSlotDescription;
using ::NMonitoring::TDynamicCounterPtr;
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/filestore/core/filestore.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace NKikimr {

struct TEvFileStore {
namespace TEvFileStore {
enum EEv {
EvBegin = EventSpaceBegin(TKikimrEvents::ES_FILESTORE),

Expand Down
10 changes: 5 additions & 5 deletions ydb/core/kesus/tablet/events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ namespace NKesus {
TString CanonizeQuoterResourcePath(const TVector<TString>& path);
TString CanonizeQuoterResourcePath(const TString& path);

struct TEvKesus {
namespace TEvKesus {
enum EEv {
EvBegin = EventSpaceBegin(TKikimrEvents::ES_KESUS),

Expand Down Expand Up @@ -488,15 +488,15 @@ struct TEvKesus {
}
};

struct TEvDeleteQuoterResource : public TEventPB<TEvDeleteQuoterResource, NKikimrKesus::TEvDeleteQuoterResource, EvDeleteQuoterResource> {
struct TEvDeleteQuoterResource : public TEventPB<TEvDeleteQuoterResource, NKikimrKesus::TEvDeleteQuoterResource, EvDeleteQuoterResource> {
using TBaseEvent = TEventPB<TEvDeleteQuoterResource, NKikimrKesus::TEvDeleteQuoterResource, EvDeleteQuoterResource>;
using TBaseEvent::TBaseEvent;
};

struct TEvDeleteQuoterResourceResult : public TEventPB<TEvDeleteQuoterResourceResult, NKikimrKesus::TEvDeleteQuoterResourceResult, EvDeleteQuoterResourceResult> {
using TBaseEvent = TEventPB<TEvDeleteQuoterResourceResult, NKikimrKesus::TEvDeleteQuoterResourceResult, EvDeleteQuoterResourceResult>;
using TBaseEvent::TBaseEvent;
using TBaseEvent::TBaseEvent;

TEvDeleteQuoterResourceResult() = default;

TEvDeleteQuoterResourceResult(Ydb::StatusIds::StatusCode status, const TString& reason) {
Expand Down Expand Up @@ -576,4 +576,4 @@ struct TEvKesus {
};

}
}
}
4 changes: 2 additions & 2 deletions ydb/core/mind/node_broker_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ using NTabletFlatExecutor::TTabletExecutedFlat;
using NTabletFlatExecutor::ITransaction;
using NTabletFlatExecutor::TTransactionBase;
using NTabletFlatExecutor::TTransactionContext;
using NConsole::TEvConsole;
namespace TEvConsole = NConsole::TEvConsole;
using NConsole::ITxExecutor;
using NConsole::TTxProcessor;

Expand Down Expand Up @@ -56,7 +56,7 @@ class TNodeBroker : public TActor<TNodeBroker>
struct TEvUpdateEpoch : public TEventLocal<TEvUpdateEpoch, EvUpdateEpoch> {};

struct TEvResolvedRegistrationRequest : public TEventLocal<TEvResolvedRegistrationRequest, EvResolvedRegistrationRequest> {

TEvResolvedRegistrationRequest(
TEvNodeBroker::TEvRegistrationRequest::TPtr request,
NActors::TScopeId scopeId,
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/mind/tenant_slot_broker_impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ struct THash<NKikimr::NTenantSlotBroker::TSlotDescription> {
namespace NKikimr {
namespace NTenantSlotBroker {

using NConsole::TEvConsole;
namespace TEvConsole = NConsole::TEvConsole;
using NTabletFlatExecutor::TTabletExecutedFlat;
using NTabletFlatExecutor::ITransaction;
using NTabletFlatExecutor::TTransactionBase;
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/persqueue/events/global.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

namespace NKikimr {

struct TEvPersQueue {
namespace TEvPersQueue {
enum EEv {
EvRequest = EventSpaceBegin(TKikimrEvents::ES_PQ),
EvUpdateConfig, //change config for all partitions and count of partitions
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/persqueue/read_balancer.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ class TPersQueueReadBalancer : public TActor<TPersQueueReadBalancer>, public TTa
ui64 StatsReportRound;

std::deque<TAutoPtr<TEvPersQueue::TEvRegisterReadSession>> RegisterEvents;
std::deque<TAutoPtr<TEvPersQueue::TEvPersQueue::TEvUpdateBalancerConfig>> UpdateEvents;
std::deque<TAutoPtr<TEvPersQueue::TEvUpdateBalancerConfig>> UpdateEvents;

TActorId FindSubDomainPathIdActor;

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/quoter/kesus_quoter_proxy.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
namespace NKikimr {
namespace NQuoter {

using NKesus::TEvKesus;
namespace TEvKesus = NKesus::TEvKesus;

class TKesusQuoterProxy : public TActorBootstrapped<TKesusQuoterProxy> {
struct TResourceState {
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/columnshard/columnshard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ inline Ydb::StatusIds::StatusCode ConvertToYdbStatus(NKikimrTxColumnShard::EResu
}
}

struct TEvColumnShard {
namespace TEvColumnShard {
enum EEv {
EvProposeTransaction = EventSpaceBegin(TKikimrEvents::ES_TX_COLUMNSHARD),
EvCancelTransactionProposal,
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/datashard/datashard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ namespace NTxDataShard {
using NDataShard::TTxFlags;
}

struct TEvDataShard {
namespace TEvDataShard {
enum EEv {
EvProposeTransaction = EventSpaceBegin(TKikimrEvents::ES_TX_DATASHARD),
EvCancelTransactionProposal,
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/replication/controller/public_events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace NKikimr::NReplication {

struct TEvController {
namespace TEvController {
enum EEv {
EvCreateReplication = EventSpaceBegin(TKikimrEvents::ES_REPLICATION_CONTROLLER),
EvCreateReplicationResult,
Expand All @@ -21,7 +21,7 @@ struct TEvController {
EvEnd,
};

static_assert(EvEnd < EventSpaceEnd(TKikimrEvents::ES_REPLICATION_CONTROLLER),
static_assert(EvEnd < EventSpaceEnd(TKikimrEvents::ES_REPLICATION_CONTROLLER),
"expect EvEnd < EventSpaceEnd(TKikimrEvents::ES_REPLICATION_CONTROLLER)");

struct TEvCreateReplication
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ class ISSDataProcessor {
}
};

struct TEvSchemeShard {
namespace TEvSchemeShard {
enum EEv {
EvModifySchemeTransaction = EventSpaceBegin(TKikimrEvents::ES_FLAT_TX_SCHEMESHARD), // 271122432
EvModifySchemeTransactionResult = EvModifySchemeTransaction + 1 * 512,
Expand Down
4 changes: 2 additions & 2 deletions ydb/core/tx/schemeshard/schemeshard__operation_part.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@
action(TEvBlobDepot::TEvApplyConfigResult, NSchemeShard::TXTYPE_BLOB_DEPOT_CONFIG_RESULT) \
\
action(TEvPrivate::TEvOperationPlan, NSchemeShard::TXTYPE_PLAN_STEP) \
action(TEvPrivate::TEvPrivate::TEvCompletePublication, NSchemeShard::TXTYPE_NOTIFY_OPERATION_COMPLETE_PUBLICATION) \
action(TEvPrivate::TEvPrivate::TEvCompleteBarrier, NSchemeShard::TXTYPE_NOTIFY_OPERATION_COMPLETE_BARRIER) \
action(TEvPrivate::TEvCompletePublication, NSchemeShard::TXTYPE_NOTIFY_OPERATION_COMPLETE_PUBLICATION) \
action(TEvPrivate::TEvCompleteBarrier, NSchemeShard::TXTYPE_NOTIFY_OPERATION_COMPLETE_BARRIER) \
\
action(TEvPersQueue::TEvProposeTransactionAttachResult, NSchemeShard::TXTYPE_PERSQUEUE_PROPOSE_ATTACH_RESULT)

Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/schemeshard/schemeshard_private.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace NKikimr {
namespace NSchemeShard {

struct TEvPrivate {
namespace TEvPrivate {
enum EEv {
EvProgressOperation = EventSpaceBegin(TKikimrEvents::ES_PRIVATE),
EvOperationPlanStep,
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/sequenceshard/public/events.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
namespace NKikimr {
namespace NSequenceShard {

struct TEvSequenceShard {
namespace TEvSequenceShard {
enum EEv {
EvMarkSchemeShardPipe = EventSpaceBegin(TKikimrEvents::ES_SEQUENCESHARD),
EvCreateSequence,
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/tx/tx.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,7 @@ struct TTestTxConfig {
static constexpr ui64 UseLessId = 0xFFFFFFFFFFFFFFF;
};

struct TEvSubDomain {
namespace TEvSubDomain {
enum EEv {
EvConfigure = EventSpaceBegin(TKikimrEvents::ES_SUB_DOMAIN),
EvConfigureStatus,
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/viewer/viewer_describe.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
namespace NKikimr::NViewer {

using namespace NActors;
using NSchemeShard::TEvSchemeShard;
namespace TEvSchemeShard = NSchemeShard::TEvSchemeShard;
using TNavigate = NSchemeCache::TSchemeCacheNavigate;

class TJsonDescribe : public TViewerPipeClient {
Expand Down
2 changes: 1 addition & 1 deletion ydb/core/viewer/viewer_hotkeys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
namespace NKikimr::NViewer {

using namespace NActors;
using NSchemeShard::TEvSchemeShard;
namespace TEvSchemeShard = NSchemeShard::TEvSchemeShard;

class TJsonHotkeys : public TViewerPipeClient {
static const bool WithRetry = false;
Expand Down
Loading