thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-29 05:00:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove root path before adding to watches

Browse Source
This commit is contained in:
hustnn 2020-09-16 16:32:37 +08:00
parent 76e0147bf4
commit 3a59a7d5b6
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Common/ZooKeeper/ZooKeeperImpl.cpp
View File

@ -422,6 +422,18 @@ void ZooKeeperRequest::write(WriteBuffer & out) const
} }
static void removeRootPath(String & path, const String & root_path)
{
if (root_path.empty())
return;
if (path.size() <= root_path.size())
throw Exception("Received path is not longer than root_path", Error::ZDATAINCONSISTENCY);
path = path.substr(root_path.size());
}
struct ZooKeeperResponse : virtual Response struct ZooKeeperResponse : virtual Response
{ {
virtual ~ZooKeeperResponse() override = default; virtual ~ZooKeeperResponse() override = default;
@ -1292,8 +1304,11 @@ void ZooKeeper::receiveEvent()
if (add_watch) if (add_watch)
{ {
/// The key of wathces should exclude the root_path
String req_path = request_info.request->getPath();
removeRootPath(req_path, root_path);
std::lock_guard lock(watches_mutex); std::lock_guard lock(watches_mutex);
watches[request_info.request->getPath()].emplace_back(std::move(request_info.watch)); watches[req_path].emplace_back(std::move(request_info.watch));
} }
} }