Commit 9c7bc119 authored by 蔡宇东's avatar 蔡宇东
Browse files

MS-574 rename ServerConfig to Config 


Former-commit-id: 66d8e45f64ee010cac31f872cd5e4aa64635d274
parent fc21fe81

cpp/src/cache/CpuCacheMgr.cpp

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 




#include "CpuCacheMgr.h"

#include "server/ServerConfig.h"

#include "server/Config.h"

#include "utils/Log.h"



namespace zilliz {
@@ -29,7 +29,7 @@ namespace { 
}



CpuCacheMgr::CpuCacheMgr() {

    server::ServerConfig& config = server::ServerConfig::GetInstance();

    server::Config& config = server::Config::GetInstance();

    int64_t cap = config.GetCacheConfigCpuMemCapacity() * unit;

    cache_ = std::make_shared<Cache<DataObjPtr>>(cap, 1UL<<32);

cpp/src/cache/GpuCacheMgr.cpp

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#include <sstream>

#include "utils/Log.h"

#include "GpuCacheMgr.h"

#include "server/ServerConfig.h"

#include "server/Config.h"



namespace zilliz {

namespace milvus {
@@ -33,7 +33,7 @@ namespace { 
}



GpuCacheMgr::GpuCacheMgr() {

    server::ServerConfig& config = server::ServerConfig::GetInstance();

    server::Config& config = server::Config::GetInstance();



    int32_t cap = config.GetCacheConfigGpuMemCapacity() * G_BYTE;

    cache_ = std::make_shared<Cache<DataObjPtr>>(cap, 1UL<<32);

cpp/src/db/engine/ExecutionEngineImpl.cpp

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ 
#include "src/wrapper/vec_index.h"

#include "src/wrapper/vec_impl.h"

#include "knowhere/common/Exception.h"

#include "server/Config.h"



#include <stdexcept>
@@ -334,7 +335,7 @@ Status ExecutionEngineImpl::GpuCache(uint64_t gpu_id) { 
// TODO(linxj): remove.

Status ExecutionEngineImpl::Init() {

    using namespace zilliz::milvus::server;

    ServerConfig &config = ServerConfig::GetInstance();

    server::Config &config = server::Config::GetInstance();

    gpu_num_ = config.GetDBConfigBuildIndexGPU();



    return Status::OK();

cpp/src/metrics/MetricBase.h

+0 −6
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ 
#pragma once



#include "utils/Error.h"

#include "server/ServerConfig.h"

#include "SystemInfo.h"



namespace zilliz {
@@ -83,11 +82,6 @@ class MetricsBase{ 
    virtual void CPUTemperature() {};

};













}

}

}
 
 No newline at end of file

cpp/src/metrics/Metrics.cpp

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
// under the License.



#include "Metrics.h"

#include "server/ServerConfig.h"

#include "server/Config.h"

#include "PrometheusMetrics.h"
@@ -32,7 +32,7 @@ Metrics::GetInstance() { 


MetricsBase &

Metrics::CreateMetricsCollector() {

    ServerConfig &config = ServerConfig::GetInstance();

    Config &config = Config::GetInstance();

    std::string collector_type_str = config.GetMetricConfigCollector();



    if (collector_type_str == "prometheus") {