git-hulk commented on code in PR #2347:
URL: https://github.com/apache/kvrocks/pull/2347#discussion_r1623201562
##########
src/server/namespace.cc:
##########
@@ -51,36 +51,47 @@ bool Namespace::IsAllowModify() const {
return config->HasConfigFile() || config->repl_namespace_enabled;
}
+Status Namespace::loadFromDB(std::map<std::string, std::string>* db_tokens)
const {
+ std::string value;
+ auto s = storage_->Get(rocksdb::ReadOptions(), cf_, kNamespaceDBKey, &value);
+ if (!s.ok()) {
+ if (s.IsNotFound()) return Status::OK();
+ return {Status::NotOK, s.ToString()};
+ }
+
+ jsoncons::json j = jsoncons::json::parse(value);
+ for (const auto& iter : j.object_range()) {
+ db_tokens->insert({iter.key(), iter.value().as_string()});
+ }
+ return Status::OK();
+}
+
Status Namespace::LoadAndRewrite() {
auto config = storage_->GetConfig();
// Namespace is NOT allowed in the cluster mode, so we don't need to rewrite
here.
if (config->cluster_enabled) return Status::OK();
- // Load from the configuration file first
- tokens_ = config->load_tokens;
+ std::map<std::string, std::string> db_tokens;
+ auto s = loadFromDB(&db_tokens);
Review Comment:
Yes, it will be merged only if it doesn’t exist in the config file.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
