From 753ea3ab889684e2f994c424821b8f7923f55534 Mon Sep 17 00:00:00 2001
From: Alexey Milovidov <milovidov@clickhouse.com>
Date: Sat, 28 Oct 2023 20:04:10 +0200
Subject: [PATCH] Fix unit test

---
 src/Common/ZooKeeper/ZooKeeper.h      | 1 +
 src/Coordination/RaftServerConfig.cpp | 8 ++++++--
 src/Databases/TablesLoader.h          | 2 ++
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/Common/ZooKeeper/ZooKeeper.h b/src/Common/ZooKeeper/ZooKeeper.h
index c41d1d8dbab..15cbd8b2f89 100644
--- a/src/Common/ZooKeeper/ZooKeeper.h
+++ b/src/Common/ZooKeeper/ZooKeeper.h
@@ -548,6 +548,7 @@ public:
     void setZooKeeperLog(std::shared_ptr<DB::ZooKeeperLog> zk_log_);
 
     UInt32 getSessionUptime() const { return static_cast<UInt32>(session_uptime.elapsedSeconds()); }
+
     bool hasReachedDeadline() const { return impl->hasReachedDeadline(); }
 
     void setServerCompletelyStarted();
diff --git a/src/Coordination/RaftServerConfig.cpp b/src/Coordination/RaftServerConfig.cpp
index 929eeeb640e..bafc177b736 100644
--- a/src/Coordination/RaftServerConfig.cpp
+++ b/src/Coordination/RaftServerConfig.cpp
@@ -26,12 +26,16 @@ std::optional<RaftServerConfig> RaftServerConfig::parse(std::string_view server)
     if (!with_id_endpoint && !with_server_type && !with_priority)
         return std::nullopt;
 
-    const std::string_view id_str = parts[0];
+    std::string_view id_str = parts[0];
     if (!id_str.starts_with("server."))
         return std::nullopt;
 
+    id_str = id_str.substr(7);
+    if (auto eq_pos = id_str.find('='); std::string_view::npos != eq_pos)
+        id_str = id_str.substr(0, eq_pos);
+
     Int32 id;
-    if (!tryParse(id, std::next(id_str.begin(), 7)))
+    if (!tryParse(id, id_str))
         return std::nullopt;
     if (id <= 0)
         return std::nullopt;
diff --git a/src/Databases/TablesLoader.h b/src/Databases/TablesLoader.h
index eb07351bd7f..31702db0345 100644
--- a/src/Databases/TablesLoader.h
+++ b/src/Databases/TablesLoader.h
@@ -1,4 +1,5 @@
 #pragma once
+
 #include <map>
 #include <mutex>
 #include <unordered_map>
@@ -12,6 +13,7 @@
 #include <Common/Stopwatch.h>
 #include <Common/ThreadPool.h>
 
+
 namespace Poco
 {
     class Logger; // NOLINT(cppcoreguidelines-virtual-class-destructor)