Remove fetch related methods from DiscoveryClient

src/brpc/policy/discovery_naming_service.h

@@ -41,14 +41,6 @@ struct DiscoveryRegisterParam {
     bool IsValid() const;
 };
 
-struct DiscoveryFetchsParam {
-    std::string appid;
-    std::string env;
-    std::string status;
-
-    bool IsValid() const;
-};
-
 // ONE DiscoveryClient corresponds to ONE service instance.
 // If your program has multiple service instances to register,
 // you need multiple DiscoveryClient.
@@ -59,7 +51,6 @@ public:
     ~DiscoveryClient();
 
     int Register(const DiscoveryRegisterParam& req);
-    int Fetchs(const DiscoveryFetchsParam& req, std::vector<ServerNode>* servers) const;
 
 private:
     static void* PeriodicRenew(void* arg);

src/bvar/detail/sampler.cpp

@@ -117,8 +117,10 @@ private:
     pthread_t _tid;
 };
 
+#ifndef UNIT_TEST
 static PassiveStatus<double>* s_cumulated_time_bvar = NULL;
 static bvar::PerSecond<bvar::PassiveStatus<double> >* s_sampling_thread_usage_bvar = NULL;
+#endif
 
 void SamplerCollector::run() {
 #ifndef UNIT_TEST

test/brpc_naming_service_unittest.cpp

@@ -47,9 +47,6 @@ DECLARE_string(discovery_env);
 DECLARE_int32(discovery_renew_interval_s);
 
 // Defined in discovery_naming_service.cpp
-int ParseFetchsResult(const butil::IOBuf& buf,
-                      const char* service_name,
-                      std::vector<brpc::ServerNode>* servers);
 int ParseNodesResult(const butil::IOBuf& buf, std::string* server_addr);
 
 } // policy
@@ -534,21 +531,6 @@ static std::string s_nodes_result = R"({
 })";
 
 
-TEST(NamingServiceTest, discovery_parse_function) {
-    std::vector<brpc::ServerNode> servers;
-    brpc::policy::DiscoveryNamingService dcns;
-    butil::IOBuf buf;
-    buf.append(s_fetchs_result);
-    ASSERT_EQ(0, brpc::policy::ParseFetchsResult(buf, "admin.test", &servers));
-    ASSERT_EQ((size_t)1, servers.size());
-    ASSERT_EQ(servers[0].tag, "{\"weight\":\"10\",\"cluster\":\"\"}");
-    buf.clear();
-    buf.append(s_nodes_result);
-    std::string server;
-    ASSERT_EQ(0, brpc::policy::ParseNodesResult(buf, &server));
-    ASSERT_EQ("127.0.0.1:8635", server);
-}
-
 class DiscoveryNamingServiceImpl : public test::DiscoveryNamingService {
 public:
     DiscoveryNamingServiceImpl()