Skip to content

chore(feat): support namespace in Pub/Sub commands #2825

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

Open
wants to merge 2 commits into
base: unstable
Choose a base branch
from
Open

chore(feat): support namespace in Pub/Sub commands #2825

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
54d66c3
Support namespace in Pub/Sub commands
dakshmehta007 Mar 11, 2025
bcef036
Merge branch 'unstable' into support-namespace-in-pubsub
dakshmehta007 Mar 11, 2025
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
36 changes: 21 additions & 15 deletions src/server/redis_connection.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,19 +192,21 @@ bool Connection::CanMigrate() const {
}

void Connection::SubscribeChannel(const std::string &channel) {
std::string ns_channel = ComposeNamespaceKey(ns_, channel, srv_->storage->IsSlotIdEncoded());
for (const auto &chan : subscribe_channels_) {
if (channel == chan) return;
if (ns_channel == chan) return;
}

subscribe_channels_.emplace_back(channel);
owner_->srv->SubscribeChannel(channel, this);
subscribe_channels_.emplace_back(ns_channel);
owner_->srv->SubscribeChannel(ns_channel, this);
}

void Connection::UnsubscribeChannel(const std::string &channel) {
std::string ns_channel = ComposeNamespaceKey(ns_, channel, srv_->storage->IsSlotIdEncoded());
for (auto iter = subscribe_channels_.begin(); iter != subscribe_channels_.end(); iter++) {
if (*iter == channel) {
if (*iter == ns_channel) {
subscribe_channels_.erase(iter);
owner_->srv->UnsubscribeChannel(channel, this);
owner_->srv->UnsubscribeChannel(ns_channel, this);
return;
}
}
Expand All @@ -230,18 +232,20 @@ void Connection::UnsubscribeAll(const UnsubscribeCallback &reply) {
int Connection::SubscriptionsCount() { return static_cast<int>(subscribe_channels_.size()); }

void Connection::PSubscribeChannel(const std::string &pattern) {
std::string ns_pattern = ComposeNamespaceKey(ns_, pattern, srv_->storage->IsSlotIdEncoded());
for (const auto &p : subscribe_patterns_) {
if (pattern == p) return;
if (ns_pattern == p) return;
}
subscribe_patterns_.emplace_back(pattern);
owner_->srv->PSubscribeChannel(pattern, this);
subscribe_patterns_.emplace_back(ns_pattern);
owner_->srv->PSubscribeChannel(ns_pattern, this);
}

void Connection::PUnsubscribeChannel(const std::string &pattern) {
std::string ns_pattern = ComposeNamespaceKey(ns_, pattern, srv_->storage->IsSlotIdEncoded());
for (auto iter = subscribe_patterns_.begin(); iter != subscribe_patterns_.end(); iter++) {
if (*iter == pattern) {
if (*iter == ns_pattern) {
subscribe_patterns_.erase(iter);
owner_->srv->PUnsubscribeChannel(pattern, this);
owner_->srv->PUnsubscribeChannel(ns_pattern, this);
return;
}
}
Expand All @@ -267,19 +271,21 @@ void Connection::PUnsubscribeAll(const UnsubscribeCallback &reply) {
int Connection::PSubscriptionsCount() { return static_cast<int>(subscribe_patterns_.size()); }

void Connection::SSubscribeChannel(const std::string &channel, uint16_t slot) {
std::string ns_channel = ComposeNamespaceKey(ns_, channel, srv_->storage->IsSlotIdEncoded());
for (const auto &chan : subscribe_shard_channels_) {
if (channel == chan) return;
if (ns_channel == chan) return;
}

subscribe_shard_channels_.emplace_back(channel);
owner_->srv->SSubscribeChannel(channel, this, slot);
subscribe_shard_channels_.emplace_back(ns_channel);
owner_->srv->SSubscribeChannel(ns_channel, this, slot);
}

void Connection::SUnsubscribeChannel(const std::string &channel, uint16_t slot) {
std::string ns_channel = ComposeNamespaceKey(ns_, channel, srv_->storage->IsSlotIdEncoded());
for (auto iter = subscribe_shard_channels_.begin(); iter != subscribe_shard_channels_.end(); iter++) {
if (*iter == channel) {
if (*iter == ns_channel) {
subscribe_shard_channels_.erase(iter);
owner_->srv->SUnsubscribeChannel(channel, this, slot);
owner_->srv->SUnsubscribeChannel(ns_channel, this, slot);
return;
}
}
Expand Down
Loading