Skip to content

Make test actorsystem actor id globally unique #1087 #1081

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

Merged
robdrynkin merged 1 commit into from
Jan 17, 2024
Merged

Make test actorsystem actor id globally unique #1087 #1081

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
8 changes: 4 additions & 4 deletions ydb/core/util/testactorsys.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,12 +102,12 @@ class TTestActorSystem {

struct TMailboxInfo {
TMailboxHeader Header{TMailboxType::Simple};
ui64 ActorLocalId = 1;
};

const ui32 MaxNodeId;
std::map<TInstant, std::deque<TScheduleItem>> ScheduleQ;
TInstant Clock = TInstant::Zero();
ui64 ActorLocalId = 1;
std::unordered_map<TMailboxId, TMailboxInfo, THash<std::tuple<ui32, ui32, ui32>>> Mailboxes;
TProgramShouldContinue ProgramShouldContinue;
TAppData AppData;
Expand Down Expand Up @@ -473,11 +473,11 @@ class TTestActorSystem {
// register actor in mailbox
const auto& it = Mailboxes.try_emplace(TMailboxId(nodeId, poolId, mboxId)).first;
TMailboxInfo& mbox = it->second;
mbox.Header.AttachActor(mbox.ActorLocalId, actor);
mbox.Header.AttachActor(ActorLocalId, actor);

// generate actor id
const TActorId actorId(nodeId, poolId, mbox.ActorLocalId, mboxId);
++mbox.ActorLocalId;
const TActorId actorId(nodeId, poolId, ActorLocalId, mboxId);
++ActorLocalId;
if (OwnLogPriority >= NActors::NLog::EPrio::Info) {
*LogStream << "[TestActorSystem] Register actor \"" << name << "\" with id " << actorId.ToString() << Endl;
RegisterActorName(actorId, name);
Expand Down