From b532a69c8bb12c0c43d038c8ca1808d35eeb2cb8 Mon Sep 17 00:00:00 2001 From: Cai Yudong Date: Wed, 20 May 2020 01:58:23 +0800 Subject: [PATCH] clean compile warning (#2380) Signed-off-by: yudong.cai --- .../default/DefaultVectorIndexFormat.cpp | 2 +- core/src/config/Config.cpp | 18 +++++++++--------- core/src/db/DBImpl.cpp | 2 +- core/src/db/engine/ExecutionEngineImpl.cpp | 2 +- core/src/db/merge/MergeAdaptiveStrategy.cpp | 4 ++-- core/src/db/merge/MergeTask.cpp | 4 ++-- core/src/db/meta/MySQLMetaImpl.cpp | 3 ++- core/src/db/meta/SqliteMetaImpl.cpp | 2 +- core/src/db/wal/WalBuffer.cpp | 2 +- core/src/metrics/SystemInfo.cpp | 10 ++++------ .../metrics/prometheus/PrometheusMetrics.cpp | 6 +++--- core/src/query/BinaryQuery.cpp | 10 ++++++---- core/src/scheduler/job/SearchJob.cpp | 2 +- core/src/scheduler/resource/Resource.cpp | 2 +- core/src/scheduler/selector/FaissFlatPass.cpp | 2 +- .../scheduler/selector/FaissIVFFlatPass.cpp | 2 +- core/src/scheduler/selector/FaissIVFPQPass.cpp | 2 +- .../scheduler/selector/FaissIVFSQ8HPass.cpp | 2 +- .../src/scheduler/selector/FaissIVFSQ8Pass.cpp | 2 +- core/src/scheduler/task/BuildIndexTask.cpp | 1 - core/src/scheduler/task/SearchTask.cpp | 8 ++++---- core/src/segment/Attr.cpp | 2 +- core/src/segment/SegmentWriter.cpp | 2 +- core/src/segment/Vectors.cpp | 2 +- core/src/server/delivery/RequestHandler.cpp | 1 + .../hybrid_request/InsertEntityRequest.cpp | 2 +- .../server/delivery/request/InsertRequest.cpp | 2 +- .../server/grpc_impl/GrpcRequestHandler.cpp | 15 +++++++++------ core/src/server/grpc_impl/GrpcRequestHandler.h | 4 ++-- core/src/server/init/CpuChecker.cpp | 2 -- .../web_impl/handler/WebRequestHandler.cpp | 9 +++++---- core/src/tracing/TracerUtil.cpp | 4 ++++ core/src/tracing/TracerUtil.h | 6 +++--- core/src/utils/CommonUtil.cpp | 6 +++--- core/src/utils/CommonUtil.h | 2 +- core/src/utils/LogUtil.cpp | 13 ++++++------- core/src/utils/ValidationUtil.cpp | 4 ++-- core/src/utils/ValidationUtil.h | 2 +- core/unittest/server/test_config.cpp | 4 ---- core/unittest/server/test_util.cpp | 4 ++-- 40 files changed, 88 insertions(+), 86 deletions(-) diff --git a/core/src/codecs/default/DefaultVectorIndexFormat.cpp b/core/src/codecs/default/DefaultVectorIndexFormat.cpp index 0deb5ac2..d543192d 100644 --- a/core/src/codecs/default/DefaultVectorIndexFormat.cpp +++ b/core/src/codecs/default/DefaultVectorIndexFormat.cpp @@ -47,7 +47,7 @@ DefaultVectorIndexFormat::read_internal(const storage::FSHandlerPtr& fs_ptr, con return nullptr; } - size_t rp = 0; + int64_t rp = 0; fs_ptr->reader_ptr_->seekg(0); int32_t current_type = 0; diff --git a/core/src/config/Config.cpp b/core/src/config/Config.cpp index e175b90e..211edb1f 100644 --- a/core/src/config/Config.cpp +++ b/core/src/config/Config.cpp @@ -398,19 +398,19 @@ Config::ValidateConfig() { STATUS_CHECK(GetLogsTraceEnable(trace_enable)); bool debug_enable; - STATUS_CHECK(GetLogsDebugEnable(trace_enable)); + STATUS_CHECK(GetLogsDebugEnable(debug_enable)); bool info_enable; - STATUS_CHECK(GetLogsInfoEnable(trace_enable)); + STATUS_CHECK(GetLogsInfoEnable(info_enable)); bool warning_enable; - STATUS_CHECK(GetLogsWarningEnable(trace_enable)); + STATUS_CHECK(GetLogsWarningEnable(warning_enable)); bool error_enable; - STATUS_CHECK(GetLogsErrorEnable(trace_enable)); + STATUS_CHECK(GetLogsErrorEnable(error_enable)); bool fatal_enable; - STATUS_CHECK(GetLogsFatalEnable(trace_enable)); + STATUS_CHECK(GetLogsFatalEnable(fatal_enable)); std::string logs_path; STATUS_CHECK(GetLogsPath(logs_path)); @@ -1252,9 +1252,9 @@ Config::CheckCacheConfigCpuCacheCapacity(const std::string& value) { return Status(SERVER_INVALID_ARGUMENT, msg); } - uint64_t total_mem = 0, free_mem = 0; + int64_t total_mem = 0, free_mem = 0; CommonUtil::GetSystemMemInfo(total_mem, free_mem); - if (static_cast(cpu_cache_capacity) >= total_mem) { + if (cpu_cache_capacity >= total_mem) { std::string msg = "Invalid cpu cache capacity: " + value + ". Possible reason: cache_config.cpu_cache_capacity exceeds system memory."; return Status(SERVER_INVALID_ARGUMENT, msg); @@ -1314,7 +1314,7 @@ Config::CheckCacheConfigInsertBufferSize(const std::string& value) { std::string str = GetConfigStr(CONFIG_CACHE, CONFIG_CACHE_CPU_CACHE_CAPACITY, "0"); int64_t cache_size = std::stoll(str) * GB; - uint64_t total_mem = 0, free_mem = 0; + int64_t total_mem = 0, free_mem = 0; CommonUtil::GetSystemMemInfo(total_mem, free_mem); if (buffer_size + cache_size >= total_mem) { std::string msg = "Invalid insert buffer size: " + value + @@ -1423,7 +1423,7 @@ Config::CheckGpuResourceConfigCacheCapacity(const std::string& value) { STATUS_CHECK(GetGpuResourceConfigBuildIndexResources(gpu_ids)); for (int64_t gpu_id : gpu_ids) { - size_t gpu_memory; + int64_t gpu_memory; if (!ValidationUtil::GetGpuMemory(gpu_id, gpu_memory).ok()) { std::string msg = "Fail to get GPU memory for GPU device: " + std::to_string(gpu_id); return Status(SERVER_UNEXPECTED_ERROR, msg); diff --git a/core/src/db/DBImpl.cpp b/core/src/db/DBImpl.cpp index 39d757c9..a5221307 100644 --- a/core/src/db/DBImpl.cpp +++ b/core/src/db/DBImpl.cpp @@ -2011,7 +2011,7 @@ DBImpl::MergeHybridFiles(const std::string& collection_id, meta::FilesHolder& fi // if index type isn't IDMAP, set file type to TO_INDEX if file size exceed index_file_size // else set file type to RAW, no need to build index if (!utils::IsRawIndexType(table_file.engine_type_)) { - table_file.file_type_ = (segment_writer_ptr->Size() >= table_file.index_file_size_) + table_file.file_type_ = (segment_writer_ptr->Size() >= (size_t)(table_file.index_file_size_)) ? meta::SegmentSchema::TO_INDEX : meta::SegmentSchema::RAW; } else { diff --git a/core/src/db/engine/ExecutionEngineImpl.cpp b/core/src/db/engine/ExecutionEngineImpl.cpp index 6220710d..0543bde2 100644 --- a/core/src/db/engine/ExecutionEngineImpl.cpp +++ b/core/src/db/engine/ExecutionEngineImpl.cpp @@ -1062,7 +1062,7 @@ ExecutionEngineImpl::ExecBinaryQuery(milvus::query::GeneralQueryPtr general_quer faiss::ConcurrentBitsetPtr list; list = index_->GetBlacklist(); // Do OR - for (uint64_t i = 0; i < vector_count_; ++i) { + for (int64_t i = 0; i < vector_count_; ++i) { if (list->test(i) || bitset->test(i)) { bitset->set(i); } diff --git a/core/src/db/merge/MergeAdaptiveStrategy.cpp b/core/src/db/merge/MergeAdaptiveStrategy.cpp index bf6626df..1859310c 100644 --- a/core/src/db/merge/MergeAdaptiveStrategy.cpp +++ b/core/src/db/merge/MergeAdaptiveStrategy.cpp @@ -32,7 +32,7 @@ MergeAdaptiveStrategy::RegroupFiles(meta::FilesHolder& files_holder, MergeFilesG meta::SegmentsSchema& files = files_holder.HoldFiles(); for (meta::SegmentsSchema::reverse_iterator iter = files.rbegin(); iter != files.rend(); ++iter) { meta::SegmentSchema& file = *iter; - if (file.index_file_size_ > 0 && file.file_size_ > file.index_file_size_) { + if (file.index_file_size_ > 0 && (int64_t)file.file_size_ > file.index_file_size_) { // file that no need to merge continue; } @@ -60,7 +60,7 @@ MergeAdaptiveStrategy::RegroupFiles(meta::FilesHolder& files_holder, MergeFilesG int64_t sum_size = 0; for (auto iter = sort_files.begin(); iter != sort_files.end();) { meta::SegmentSchema& file = *iter; - if (sum_size + file.file_size_ <= index_file_size) { + if (sum_size + (int64_t)(file.file_size_) <= index_file_size) { temp_group.push_back(file); sum_size += file.file_size_; iter = sort_files.erase(iter); diff --git a/core/src/db/merge/MergeTask.cpp b/core/src/db/merge/MergeTask.cpp index 11315959..df80d8ad 100644 --- a/core/src/db/merge/MergeTask.cpp +++ b/core/src/db/merge/MergeTask.cpp @@ -71,7 +71,7 @@ MergeTask::Execute() { auto file_schema = file; file_schema.file_type_ = meta::SegmentSchema::TO_DELETE; updated.push_back(file_schema); - auto size = segment_writer_ptr->Size(); + int64_t size = segment_writer_ptr->Size(); if (size >= file_schema.index_file_size_) { break; } @@ -104,7 +104,7 @@ MergeTask::Execute() { // if index type isn't IDMAP, set file type to TO_INDEX if file size exceed index_file_size // else set file type to RAW, no need to build index if (!utils::IsRawIndexType(collection_file.engine_type_)) { - collection_file.file_type_ = (segment_writer_ptr->Size() >= collection_file.index_file_size_) + collection_file.file_type_ = (segment_writer_ptr->Size() >= (size_t)(collection_file.index_file_size_)) ? meta::SegmentSchema::TO_INDEX : meta::SegmentSchema::RAW; } else { diff --git a/core/src/db/meta/MySQLMetaImpl.cpp b/core/src/db/meta/MySQLMetaImpl.cpp index a7bb6bf1..bb2ae20b 100644 --- a/core/src/db/meta/MySQLMetaImpl.cpp +++ b/core/src/db/meta/MySQLMetaImpl.cpp @@ -1845,7 +1845,7 @@ MySQLMetaImpl::FilesToMerge(const std::string& collection_id, FilesHolder& files for (auto& resRow : res) { SegmentSchema collection_file; collection_file.file_size_ = resRow["file_size"]; - if (collection_file.file_size_ >= collection_schema.index_file_size_) { + if ((int64_t)(collection_file.file_size_) >= collection_schema.index_file_size_) { continue; // skip large file } @@ -3001,6 +3001,7 @@ MySQLMetaImpl::DescribeHybridCollection(CollectionSchema& collection_schema, hyb Status MySQLMetaImpl::CreateHybridCollectionFile(milvus::engine::meta::SegmentSchema& file_schema) { + return Status::OK(); } } // namespace meta diff --git a/core/src/db/meta/SqliteMetaImpl.cpp b/core/src/db/meta/SqliteMetaImpl.cpp index d188522f..86a4bb38 100644 --- a/core/src/db/meta/SqliteMetaImpl.cpp +++ b/core/src/db/meta/SqliteMetaImpl.cpp @@ -1246,7 +1246,7 @@ SqliteMetaImpl::FilesToMerge(const std::string& collection_id, FilesHolder& file for (auto& file : selected) { SegmentSchema collection_file; collection_file.file_size_ = std::get<5>(file); - if (collection_file.file_size_ >= collection_schema.index_file_size_) { + if (collection_file.file_size_ >= (size_t)(collection_schema.index_file_size_)) { continue; // skip large file } diff --git a/core/src/db/wal/WalBuffer.cpp b/core/src/db/wal/WalBuffer.cpp index 9ec1335e..6458bc5f 100644 --- a/core/src/db/wal/WalBuffer.cpp +++ b/core/src/db/wal/WalBuffer.cpp @@ -614,7 +614,7 @@ bool MXLogBuffer::ResetWriteLsn(uint64_t lsn) { LOG_WAL_INFO_ << "reset write lsn " << lsn; - int32_t old_file_no = mxlog_buffer_writer_.file_no; + uint32_t old_file_no = mxlog_buffer_writer_.file_no; ParserLsn(lsn, mxlog_buffer_writer_.file_no, mxlog_buffer_writer_.buf_offset); if (old_file_no == mxlog_buffer_writer_.file_no) { LOG_WAL_DEBUG_ << "file No. is not changed"; diff --git a/core/src/metrics/SystemInfo.cpp b/core/src/metrics/SystemInfo.cpp index ced48b31..a96bdec6 100644 --- a/core/src/metrics/SystemInfo.cpp +++ b/core/src/metrics/SystemInfo.cpp @@ -170,7 +170,7 @@ SystemInfo::CPUCorePercent() { std::vector cur_total_time_array = getTotalCpuTime(cur_work_time_array); std::vector cpu_core_percent; - for (int i = 0; i < cur_total_time_array.size(); i++) { + for (size_t i = 0; i < cur_total_time_array.size(); i++) { double total_cpu_time = cur_total_time_array[i] - prev_total_time_array[i]; double cpu_work_time = cur_work_time_array[i] - prev_work_time_array[i]; cpu_core_percent.push_back((cpu_work_time / total_cpu_time) * 100); @@ -254,7 +254,7 @@ SystemInfo::GPUMemoryTotal() { #ifdef MILVUS_GPU_VERSION nvmlMemory_t nvmlMemory; - for (int i = 0; i < num_device_; ++i) { + for (uint32_t i = 0; i < num_device_; ++i) { nvmlDevice_t device; nvmlDeviceGetHandleByIndex(i, &device); nvmlDeviceGetMemoryInfo(device, &nvmlMemory); @@ -273,7 +273,7 @@ SystemInfo::GPUTemperature() { std::vector result; #ifdef MILVUS_GPU_VERSION - for (int i = 0; i < num_device_; i++) { + for (uint32_t i = 0; i < num_device_; i++) { nvmlDevice_t device; nvmlDeviceGetHandleByIndex(i, &device); unsigned int temp; @@ -342,7 +342,7 @@ SystemInfo::GPUMemoryUsed() { #ifdef MILVUS_GPU_VERSION nvmlMemory_t nvmlMemory; - for (int i = 0; i < num_device_; ++i) { + for (uint32_t i = 0; i < num_device_; ++i) { nvmlDevice_t device; nvmlDeviceGetHandleByIndex(i, &device); nvmlDeviceGetMemoryInfo(device, &nvmlMemory); @@ -355,8 +355,6 @@ SystemInfo::GPUMemoryUsed() { std::pair SystemInfo::Octets() { - pid_t pid = getpid(); - // const std::string filename = "/proc/"+std::to_string(pid)+"/net/netstat"; const std::string filename = "/proc/net/netstat"; std::ifstream file(filename); std::string lastline = ""; diff --git a/core/src/metrics/prometheus/PrometheusMetrics.cpp b/core/src/metrics/prometheus/PrometheusMetrics.cpp index 2fba6490..dda5e1fc 100644 --- a/core/src/metrics/prometheus/PrometheusMetrics.cpp +++ b/core/src/metrics/prometheus/PrometheusMetrics.cpp @@ -204,7 +204,7 @@ PrometheusMetrics::CPUCoreUsagePercentSet() { std::vector cpu_core_percent = server::SystemInfo::GetInstance().CPUCorePercent(); - for (int i = 0; i < cpu_core_percent.size(); ++i) { + for (size_t i = 0; i < cpu_core_percent.size(); ++i) { prometheus::Gauge& core_percent = CPU_.Add({{"CPU", std::to_string(i)}}); core_percent.Set(cpu_core_percent[i]); } @@ -218,7 +218,7 @@ PrometheusMetrics::GPUTemperature() { std::vector GPU_temperatures = server::SystemInfo::GetInstance().GPUTemperature(); - for (int i = 0; i < GPU_temperatures.size(); ++i) { + for (size_t i = 0; i < GPU_temperatures.size(); ++i) { prometheus::Gauge& gpu_temp = GPU_temperature_.Add({{"GPU", std::to_string(i)}}); gpu_temp.Set(GPU_temperatures[i]); } @@ -233,7 +233,7 @@ PrometheusMetrics::CPUTemperature() { std::vector CPU_temperatures = server::SystemInfo::GetInstance().CPUTemperature(); float avg_cpu_temp = 0; - for (int i = 0; i < CPU_temperatures.size(); ++i) { + for (size_t i = 0; i < CPU_temperatures.size(); ++i) { avg_cpu_temp += CPU_temperatures[i]; } avg_cpu_temp /= CPU_temperatures.size(); diff --git a/core/src/query/BinaryQuery.cpp b/core/src/query/BinaryQuery.cpp index 21d1cda9..d812cc6d 100644 --- a/core/src/query/BinaryQuery.cpp +++ b/core/src/query/BinaryQuery.cpp @@ -84,6 +84,8 @@ GenBinaryQuery(BooleanQueryPtr query, BinaryQueryPtr& binary_query) { binary_query->relation = QueryRelation::OR; return GenBinaryQuery(query, binary_query); } + default: + return Status::OK(); } } } @@ -94,15 +96,15 @@ GenBinaryQuery(BooleanQueryPtr query, BinaryQueryPtr& binary_query) { switch (bc->getOccur()) { case Occur::MUST: { binary_query->relation = QueryRelation::AND; - Status s = GenBinaryQuery(bc, binary_query); - return s; + return GenBinaryQuery(bc, binary_query); } case Occur::MUST_NOT: case Occur::SHOULD: { binary_query->relation = QueryRelation::OR; - Status s = GenBinaryQuery(bc, binary_query); - return s; + return GenBinaryQuery(bc, binary_query); } + default: + return Status::OK(); } } diff --git a/core/src/scheduler/job/SearchJob.cpp b/core/src/scheduler/job/SearchJob.cpp index 6f1e446a..78d22806 100644 --- a/core/src/scheduler/job/SearchJob.cpp +++ b/core/src/scheduler/job/SearchJob.cpp @@ -24,7 +24,7 @@ SearchJob::SearchJob(const std::shared_ptr& context, uint64_t t SearchJob::SearchJob(const std::shared_ptr& context, milvus::query::GeneralQueryPtr general_query, std::unordered_map& attr_type, const engine::VectorsData& vectors) - : Job(JobType::SEARCH), context_(context), general_query_(general_query), attr_type_(attr_type), vectors_(vectors) { + : Job(JobType::SEARCH), context_(context), vectors_(vectors), general_query_(general_query), attr_type_(attr_type) { } bool diff --git a/core/src/scheduler/resource/Resource.cpp b/core/src/scheduler/resource/Resource.cpp index d74a6ed5..ca338894 100644 --- a/core/src/scheduler/resource/Resource.cpp +++ b/core/src/scheduler/resource/Resource.cpp @@ -43,7 +43,7 @@ ToString(ResourceType type) { } Resource::Resource(std::string name, ResourceType type, uint64_t device_id, bool enable_executor) - : name_(std::move(name)), type_(type), device_id_(device_id), enable_executor_(enable_executor) { + : device_id_(device_id), name_(std::move(name)), type_(type), enable_executor_(enable_executor) { // register subscriber in tasktable task_table_.RegisterSubscriber([&] { if (subscriber_) { diff --git a/core/src/scheduler/selector/FaissFlatPass.cpp b/core/src/scheduler/selector/FaissFlatPass.cpp index 01b21b9a..243d8f35 100644 --- a/core/src/scheduler/selector/FaissFlatPass.cpp +++ b/core/src/scheduler/selector/FaissFlatPass.cpp @@ -56,7 +56,7 @@ FaissFlatPass::Run(const TaskPtr& task) { if (!gpu_enable_) { LOG_SERVER_DEBUG_ << LogOut("[%s][%d] FaissFlatPass: gpu disable, specify cpu to search!", "search", 0); res_ptr = ResMgrInst::GetInstance()->GetResource("cpu"); - } else if (search_job->nq() < threshold_) { + } else if (search_job->nq() < (uint64_t)threshold_) { LOG_SERVER_DEBUG_ << LogOut("[%s][%d] FaissFlatPass: nq < gpu_search_threshold, specify cpu to search!", "search", 0); res_ptr = ResMgrInst::GetInstance()->GetResource("cpu"); diff --git a/core/src/scheduler/selector/FaissIVFFlatPass.cpp b/core/src/scheduler/selector/FaissIVFFlatPass.cpp index 25ea7f0f..79885405 100644 --- a/core/src/scheduler/selector/FaissIVFFlatPass.cpp +++ b/core/src/scheduler/selector/FaissIVFFlatPass.cpp @@ -57,7 +57,7 @@ FaissIVFFlatPass::Run(const TaskPtr& task) { if (!gpu_enable_) { LOG_SERVER_DEBUG_ << LogOut("[%s][%d] FaissIVFFlatPass: gpu disable, specify cpu to search!", "search", 0); res_ptr = ResMgrInst::GetInstance()->GetResource("cpu"); - } else if (search_job->nq() < threshold_) { + } else if (search_job->nq() < (uint64_t)threshold_) { LOG_SERVER_DEBUG_ << LogOut("[%s][%d] FaissIVFFlatPass: nq < gpu_search_threshold, specify cpu to search!", "search", 0); res_ptr = ResMgrInst::GetInstance()->GetResource("cpu"); diff --git a/core/src/scheduler/selector/FaissIVFPQPass.cpp b/core/src/scheduler/selector/FaissIVFPQPass.cpp index 32acc0c4..21c45931 100644 --- a/core/src/scheduler/selector/FaissIVFPQPass.cpp +++ b/core/src/scheduler/selector/FaissIVFPQPass.cpp @@ -59,7 +59,7 @@ FaissIVFPQPass::Run(const TaskPtr& task) { if (!gpu_enable_) { LOG_SERVER_DEBUG_ << LogOut("[%s][%d] FaissIVFPQPass: gpu disable, specify cpu to search!", "search", 0); res_ptr = ResMgrInst::GetInstance()->GetResource("cpu"); - } else if (search_job->nq() < threshold_) { + } else if (search_job->nq() < (uint64_t)threshold_) { LOG_SERVER_DEBUG_ << LogOut("[%s][%d] FaissIVFPQPass: nq < gpu_search_threshold, specify cpu to search!", "search", 0); res_ptr = ResMgrInst::GetInstance()->GetResource("cpu"); diff --git a/core/src/scheduler/selector/FaissIVFSQ8HPass.cpp b/core/src/scheduler/selector/FaissIVFSQ8HPass.cpp index 7dc3546e..400509e6 100644 --- a/core/src/scheduler/selector/FaissIVFSQ8HPass.cpp +++ b/core/src/scheduler/selector/FaissIVFSQ8HPass.cpp @@ -57,7 +57,7 @@ FaissIVFSQ8HPass::Run(const TaskPtr& task) { LOG_SERVER_DEBUG_ << LogOut("[%s][%d] FaissIVFSQ8HPass: gpu disable, specify cpu to search!", "search", 0); res_ptr = ResMgrInst::GetInstance()->GetResource("cpu"); } - if (search_job->nq() < threshold_) { + if (search_job->nq() < (uint64_t)threshold_) { LOG_SERVER_DEBUG_ << LogOut("[%s][%d] FaissIVFSQ8HPass: nq < gpu_search_threshold, specify cpu to search!", "search", 0); res_ptr = ResMgrInst::GetInstance()->GetResource("cpu"); diff --git a/core/src/scheduler/selector/FaissIVFSQ8Pass.cpp b/core/src/scheduler/selector/FaissIVFSQ8Pass.cpp index c93adbfb..d71a10e2 100644 --- a/core/src/scheduler/selector/FaissIVFSQ8Pass.cpp +++ b/core/src/scheduler/selector/FaissIVFSQ8Pass.cpp @@ -57,7 +57,7 @@ FaissIVFSQ8Pass::Run(const TaskPtr& task) { if (!gpu_enable_) { LOG_SERVER_DEBUG_ << LogOut("[%s][%d] FaissIVFSQ8Pass: gpu disable, specify cpu to search!", "search", 0); res_ptr = ResMgrInst::GetInstance()->GetResource("cpu"); - } else if (search_job->nq() < threshold_) { + } else if (search_job->nq() < (uint64_t)threshold_) { LOG_SERVER_DEBUG_ << LogOut("[%s][%d] FaissIVFSQ8Pass: nq < gpu_search_threshold, specify cpu to search!", "search", 0); res_ptr = ResMgrInst::GetInstance()->GetResource("cpu"); diff --git a/core/src/scheduler/task/BuildIndexTask.cpp b/core/src/scheduler/task/BuildIndexTask.cpp index 491785b3..0b49f5e8 100644 --- a/core/src/scheduler/task/BuildIndexTask.cpp +++ b/core/src/scheduler/task/BuildIndexTask.cpp @@ -125,7 +125,6 @@ XBuildIndexTask::Execute() { } std::string location = file_->location_; - EngineType engine_type = (EngineType)file_->engine_type_; std::shared_ptr index; // step 1: create collection file diff --git a/core/src/scheduler/task/SearchTask.cpp b/core/src/scheduler/task/SearchTask.cpp index b1ee3f00..ef2c7732 100644 --- a/core/src/scheduler/task/SearchTask.cpp +++ b/core/src/scheduler/task/SearchTask.cpp @@ -316,8 +316,8 @@ XSearchTask::Execute() { return; } - double span = rc.RecordSection(hdr + ", do search"); - // search_job->AccumSearchCost(span); + // double span = rc.RecordSection(hdr + ", do search"); + // search_job->AccumSearchCost(span); // step 3: pick up topk result auto spec_k = file_->row_count_ < topk ? file_->row_count_ : topk; @@ -341,8 +341,8 @@ XSearchTask::Execute() { search_job->GetResultIds(), search_job->GetResultDistances()); } - span = rc.RecordSection(hdr + ", reduce topk"); - // search_job->AccumReduceCost(span); + // span = rc.RecordSection(hdr + ", reduce topk"); + // search_job->AccumReduceCost(span); } catch (std::exception& ex) { LOG_ENGINE_ERROR_ << LogOut("[%s][%ld] SearchTask encounter exception: %s", "search", 0, ex.what()); // search_job->IndexSearchDone(index_id_);//mark as done avoid dead lock, even search failed diff --git a/core/src/segment/Attr.cpp b/core/src/segment/Attr.cpp index 57869cbb..3c55c0e1 100644 --- a/core/src/segment/Attr.cpp +++ b/core/src/segment/Attr.cpp @@ -132,7 +132,7 @@ Attr::Erase(std::vector& offsets) { auto loop_size = uids_.size(); for (size_t i = 0; i < loop_size;) { - while (skip != offsets.cend() && i == *skip) { + while (skip != offsets.cend() && i == (size_t)(*skip)) { ++i; ++skip; } diff --git a/core/src/segment/SegmentWriter.cpp b/core/src/segment/SegmentWriter.cpp index fd491fdc..f66a00e3 100644 --- a/core/src/segment/SegmentWriter.cpp +++ b/core/src/segment/SegmentWriter.cpp @@ -289,7 +289,7 @@ SegmentWriter::Merge(const std::string& dir_to_merge, const std::string& name) { } SegmentPtr segment_to_merge; segment_reader_to_merge.GetSegment(segment_to_merge); - auto& uids = segment_to_merge->vectors_ptr_->GetUids(); + // auto& uids = segment_to_merge->vectors_ptr_->GetUids(); recorder.RecordSection("Loading segment"); diff --git a/core/src/segment/Vectors.cpp b/core/src/segment/Vectors.cpp index d34a10d1..e9410e87 100644 --- a/core/src/segment/Vectors.cpp +++ b/core/src/segment/Vectors.cpp @@ -87,7 +87,7 @@ Vectors::Erase(std::vector& offsets) { auto loop_size = uids_.size(); for (size_t i = 0; i < loop_size;) { - while (i == *skip && skip != offsets.cend()) { + while (i == (size_t)(*skip) && skip != offsets.cend()) { ++i; ++skip; } diff --git a/core/src/server/delivery/RequestHandler.cpp b/core/src/server/delivery/RequestHandler.cpp index ac3d2341..9086c66c 100644 --- a/core/src/server/delivery/RequestHandler.cpp +++ b/core/src/server/delivery/RequestHandler.cpp @@ -290,6 +290,7 @@ RequestHandler::DescribeHybridCollection(const std::shared_ptr& context Status RequestHandler::HasHybridCollection(const std::shared_ptr& context, std::string& collection_name, bool& has_collection) { + return Status::OK(); } Status diff --git a/core/src/server/delivery/hybrid_request/InsertEntityRequest.cpp b/core/src/server/delivery/hybrid_request/InsertEntityRequest.cpp index 4c619974..687a1d5b 100644 --- a/core/src/server/delivery/hybrid_request/InsertEntityRequest.cpp +++ b/core/src/server/delivery/hybrid_request/InsertEntityRequest.cpp @@ -132,7 +132,7 @@ InsertEntityRequest::OnExecute() { // TODO(yukun): check dimension and metric_type // step 5: insert entities - auto vec_count = static_cast(vector_datas_it->second.vector_count_); + // auto vec_count = static_cast(vector_datas_it->second.vector_count_); engine::Entity entity; entity.entity_count_ = row_num_; diff --git a/core/src/server/delivery/request/InsertRequest.cpp b/core/src/server/delivery/request/InsertRequest.cpp index 89d091ab..08cab941 100644 --- a/core/src/server/delivery/request/InsertRequest.cpp +++ b/core/src/server/delivery/request/InsertRequest.cpp @@ -68,7 +68,7 @@ InsertRequest::OnExecute() { fiu_do_on("InsertRequest.OnExecute.id_array_error", vectors_data_.id_array_.resize(vector_count + 1)); if (!vectors_data_.id_array_.empty()) { - if (vectors_data_.id_array_.size() != vector_count) { + if (vectors_data_.id_array_.size() != (size_t)vector_count) { std::string msg = "The size of vector ID array must be equal to the size of the vector."; LOG_SERVER_ERROR_ << LogOut("[%s][%ld] Invalid id array: %s", "insert", 0, msg.c_str()); return Status(SERVER_ILLEGAL_VECTOR_ID, msg); diff --git a/core/src/server/grpc_impl/GrpcRequestHandler.cpp b/core/src/server/grpc_impl/GrpcRequestHandler.cpp index 3c1d3122..580087ae 100644 --- a/core/src/server/grpc_impl/GrpcRequestHandler.cpp +++ b/core/src/server/grpc_impl/GrpcRequestHandler.cpp @@ -32,6 +32,8 @@ namespace milvus { namespace server { namespace grpc { +const char* EXTRA_PARAM_KEY = "params"; + ::milvus::grpc::ErrorCode ErrorMap(ErrorCode code) { static const std::map code_map = { @@ -897,7 +899,7 @@ GrpcRequestHandler::CreateHybridCollection(::grpc::ServerContext* context, const std::vector> field_types; std::vector> vector_dimensions; std::vector> field_params; - for (uint64_t i = 0; i < request->fields_size(); ++i) { + for (int i = 0; i < request->fields_size(); ++i) { if (request->fields(i).type().has_vector_param()) { auto vector_dimension = std::make_pair(request->fields(i).name(), request->fields(i).type().vector_param().dimension()); @@ -933,6 +935,7 @@ GrpcRequestHandler::DescribeHybridCollection(::grpc::ServerContext* context, LOG_SERVER_INFO_ << LogOut("Request [%s] %s begin.", GetContext(context)->RequestID().c_str(), __func__); CHECK_NULLPTR_RETURN(request); LOG_SERVER_INFO_ << LogOut("Request [%s] %s end.", GetContext(context)->RequestID().c_str(), __func__); + return ::grpc::Status::OK; } ::grpc::Status @@ -952,12 +955,12 @@ GrpcRequestHandler::InsertEntity(::grpc::ServerContext* context, const ::milvus: std::vector field_names; auto field_size = request->entities().field_names_size(); field_names.resize(field_size - 1); - for (uint64_t i = 0; i < field_size - 1; ++i) { + for (int i = 0; i < field_size - 1; ++i) { field_names[i] = request->entities().field_names(i); } auto vector_size = request->entities().result_values_size(); - for (uint64_t i = 0; i < vector_size; ++i) { + for (int i = 0; i < vector_size; ++i) { engine::VectorsData vectors; CopyRowRecords(request->entities().result_values(i).vector_value().value(), request->entity_id_array(), vectors); @@ -983,7 +986,7 @@ void DeSerialization(const ::milvus::grpc::GeneralQuery& general_query, query::BooleanQueryPtr& boolean_clause) { if (general_query.has_boolean_query()) { boolean_clause->SetOccur((query::Occur)general_query.boolean_query().occur()); - for (uint64_t i = 0; i < general_query.boolean_query().general_query_size(); ++i) { + for (int i = 0; i < general_query.boolean_query().general_query_size(); ++i) { if (general_query.boolean_query().general_query(i).has_boolean_query()) { query::BooleanQueryPtr query = std::make_shared(); DeSerialization(general_query.boolean_query().general_query(i), query); @@ -1006,7 +1009,7 @@ DeSerialization(const ::milvus::grpc::GeneralQuery& general_query, query::Boolea range_query->field_name = query.range_query().field_name(); range_query->boost = query.range_query().boost(); range_query->compare_expr.resize(query.range_query().operand_size()); - for (uint64_t j = 0; j < query.range_query().operand_size(); ++j) { + for (int j = 0; j < query.range_query().operand_size(); ++j) { range_query->compare_expr[j].compare_operator = query::CompareOperator(query.range_query().operand(j).operator_()); range_query->compare_expr[j].operand = query.range_query().operand(j).operand(); @@ -1070,7 +1073,7 @@ GrpcRequestHandler::HybridSearch(::grpc::ServerContext* context, const ::milvus: std::vector partition_list; partition_list.resize(request->partition_tag_array_size()); - for (uint64_t i = 0; i < request->partition_tag_array_size(); ++i) { + for (int i = 0; i < request->partition_tag_array_size(); ++i) { partition_list[i] = request->partition_tag_array(i); } diff --git a/core/src/server/grpc_impl/GrpcRequestHandler.h b/core/src/server/grpc_impl/GrpcRequestHandler.h index 20736db9..5f47a3d7 100644 --- a/core/src/server/grpc_impl/GrpcRequestHandler.h +++ b/core/src/server/grpc_impl/GrpcRequestHandler.h @@ -57,7 +57,7 @@ namespace grpc { ::milvus::grpc::ErrorCode ErrorMap(ErrorCode code); -static const char* EXTRA_PARAM_KEY = "params"; +extern const char* EXTRA_PARAM_KEY; class GrpcRequestHandler final : public ::milvus::grpc::MilvusService::Service, public GrpcInterceptorHookHandler { public: @@ -385,7 +385,7 @@ class GrpcRequestHandler final : public ::milvus::grpc::MilvusService::Service, // const ::milvus::grpc::HDeleteByIDParam* request, // ::milvus::grpc::Status* response) override; - GrpcRequestHandler& + void RegisterRequestHandler(const RequestHandler& handler) { request_handler_ = handler; } diff --git a/core/src/server/init/CpuChecker.cpp b/core/src/server/init/CpuChecker.cpp index 19fe176c..0f55059c 100644 --- a/core/src/server/init/CpuChecker.cpp +++ b/core/src/server/init/CpuChecker.cpp @@ -29,8 +29,6 @@ Status CpuChecker::CheckCpuInstructionSet() { std::vector instruction_sets; - auto& instruction_set_inst = faiss::InstructionSet::GetInstance(); - bool support_avx512 = faiss::support_avx512(); fiu_do_on("CpuChecker.CheckCpuInstructionSet.not_support_avx512", support_avx512 = false); if (support_avx512) { diff --git a/core/src/server/web_impl/handler/WebRequestHandler.cpp b/core/src/server/web_impl/handler/WebRequestHandler.cpp index 6dc31409..da96659e 100644 --- a/core/src/server/web_impl/handler/WebRequestHandler.cpp +++ b/core/src/server/web_impl/handler/WebRequestHandler.cpp @@ -487,7 +487,7 @@ WebRequestHandler::Search(const std::string& collection_name, const nlohmann::js auto step = result.id_list_.size() / result.row_num_; nlohmann::json search_result_json; - for (size_t i = 0; i < result.row_num_; i++) { + for (int64_t i = 0; i < result.row_num_; i++) { nlohmann::json raw_result_json; for (size_t j = 0; j < step; j++) { nlohmann::json one_result_json; @@ -541,6 +541,8 @@ WebRequestHandler::ProcessLeafQueryJson(const nlohmann::json& json, milvus::quer memcpy(term_query->field_value.data(), term_value.data(), term_size * sizeof(double)); break; } + default: + break; } leaf_query->term_query = term_query; @@ -731,7 +733,7 @@ WebRequestHandler::HybridSearch(const std::string& collection_name, const nlohma auto step = result.id_list_.size() / result.row_num_; nlohmann::json search_result_json; - for (size_t i = 0; i < result.row_num_; i++) { + for (int64_t i = 0; i < result.row_num_; i++) { nlohmann::json raw_result_json; for (size_t j = 0; j < step; j++) { nlohmann::json one_result_json; @@ -837,7 +839,6 @@ WebRequestHandler::GetDevices(DevicesDto::ObjectWrapper& devices_dto) { StatusDto::ObjectWrapper WebRequestHandler::GetAdvancedConfig(AdvancedConfigDto::ObjectWrapper& advanced_config) { - Config& config = Config::GetInstance(); std::string reply; std::string cache_cmd_prefix = "get_config " + std::string(CONFIG_CACHE) + "."; @@ -1387,7 +1388,7 @@ WebRequestHandler::ShowPartitions(const OString& collection_name, const OQueryPa partition_list_dto->count = partitions.size(); partition_list_dto->partitions = partition_list_dto->partitions->createShared(); - if (offset < partitions.size()) { + if (offset < (int64_t)(partitions.size())) { for (int64_t i = offset; i < page_size + offset; i++) { auto partition_dto = PartitionFieldsDto::createShared(); partition_dto->partition_tag = partitions.at(i).tag_.c_str(); diff --git a/core/src/tracing/TracerUtil.cpp b/core/src/tracing/TracerUtil.cpp index 7c33016d..cd4662c7 100644 --- a/core/src/tracing/TracerUtil.cpp +++ b/core/src/tracing/TracerUtil.cpp @@ -22,6 +22,10 @@ namespace milvus { namespace tracing { +const char* TRACER_LIBRARY_CONFIG_NAME = "tracer_library"; +const char* TRACER_CONFIGURATION_CONFIG_NAME = "tracer_configuration"; +const char* TRACE_CONTEXT_HEADER_CONFIG_NAME = "TraceContextHeaderName"; + const char* TracerUtil::tracer_context_header_name_; void diff --git a/core/src/tracing/TracerUtil.h b/core/src/tracing/TracerUtil.h index 4d7f5591..6d9279b9 100644 --- a/core/src/tracing/TracerUtil.h +++ b/core/src/tracing/TracerUtil.h @@ -16,9 +16,9 @@ namespace milvus { namespace tracing { -static const char* TRACER_LIBRARY_CONFIG_NAME = "tracer_library"; -static const char* TRACER_CONFIGURATION_CONFIG_NAME = "tracer_configuration"; -static const char* TRACE_CONTEXT_HEADER_CONFIG_NAME = "TraceContextHeaderName"; +extern const char* TRACER_LIBRARY_CONFIG_NAME; +extern const char* TRACER_CONFIGURATION_CONFIG_NAME; +extern const char* TRACE_CONTEXT_HEADER_CONFIG_NAME; class TracerUtil { public: diff --git a/core/src/utils/CommonUtil.cpp b/core/src/utils/CommonUtil.cpp index f79babbb..bb60bd24 100644 --- a/core/src/utils/CommonUtil.cpp +++ b/core/src/utils/CommonUtil.cpp @@ -44,7 +44,7 @@ namespace server { namespace fs = boost::filesystem; bool -CommonUtil::GetSystemMemInfo(uint64_t& total_mem, uint64_t& free_mem) { +CommonUtil::GetSystemMemInfo(int64_t& total_mem, int64_t& free_mem) { struct sysinfo info; int ret = sysinfo(&info); total_mem = info.totalram; @@ -180,9 +180,9 @@ CommonUtil::GetFileName(std::string filename) { std::string CommonUtil::GetExePath() { - const size_t buf_len = 1024; + const int64_t buf_len = 1024; char buf[buf_len]; - ssize_t cnt = readlink("/proc/self/exe", buf, buf_len); + int64_t cnt = readlink("/proc/self/exe", buf, buf_len); fiu_do_on("CommonUtil.GetExePath.readlink_fail", cnt = -1); if (cnt < 0 || cnt >= buf_len) { return ""; diff --git a/core/src/utils/CommonUtil.h b/core/src/utils/CommonUtil.h index 26d039b8..649957d2 100644 --- a/core/src/utils/CommonUtil.h +++ b/core/src/utils/CommonUtil.h @@ -22,7 +22,7 @@ namespace server { class CommonUtil { public: static bool - GetSystemMemInfo(uint64_t& total_mem, uint64_t& free_mem); + GetSystemMemInfo(int64_t& total_mem, int64_t& free_mem); static bool GetSystemAvailableThreads(int64_t& thread_count); diff --git a/core/src/utils/LogUtil.cpp b/core/src/utils/LogUtil.cpp index 8c9f486a..60eba407 100644 --- a/core/src/utils/LogUtil.cpp +++ b/core/src/utils/LogUtil.cpp @@ -54,14 +54,13 @@ RolloutHandler(const char* filename, std::size_t size, el::Level level) { position += 2; } } - int ret; std::string m(std::string(dir) + "/" + s); s = m; try { switch (level) { case el::Level::Debug: { s.append("." + std::to_string(++debug_idx)); - ret = rename(m.c_str(), s.c_str()); + rename(m.c_str(), s.c_str()); if (enable_log_delete && debug_idx - logs_delete_exceeds > 0) { std::string to_delete = m + "." + std::to_string(debug_idx - logs_delete_exceeds); // std::cout << "remote " << to_delete << std::endl; @@ -71,7 +70,7 @@ RolloutHandler(const char* filename, std::size_t size, el::Level level) { } case el::Level::Warning: { s.append("." + std::to_string(++warning_idx)); - ret = rename(m.c_str(), s.c_str()); + rename(m.c_str(), s.c_str()); if (enable_log_delete && warning_idx - logs_delete_exceeds > 0) { std::string to_delete = m + "." + std::to_string(warning_idx - logs_delete_exceeds); boost::filesystem::remove(to_delete); @@ -80,7 +79,7 @@ RolloutHandler(const char* filename, std::size_t size, el::Level level) { } case el::Level::Trace: { s.append("." + std::to_string(++trace_idx)); - ret = rename(m.c_str(), s.c_str()); + rename(m.c_str(), s.c_str()); if (enable_log_delete && trace_idx - logs_delete_exceeds > 0) { std::string to_delete = m + "." + std::to_string(trace_idx - logs_delete_exceeds); boost::filesystem::remove(to_delete); @@ -89,7 +88,7 @@ RolloutHandler(const char* filename, std::size_t size, el::Level level) { } case el::Level::Error: { s.append("." + std::to_string(++error_idx)); - ret = rename(m.c_str(), s.c_str()); + rename(m.c_str(), s.c_str()); if (enable_log_delete && error_idx - logs_delete_exceeds > 0) { std::string to_delete = m + "." + std::to_string(error_idx - logs_delete_exceeds); boost::filesystem::remove(to_delete); @@ -98,7 +97,7 @@ RolloutHandler(const char* filename, std::size_t size, el::Level level) { } case el::Level::Fatal: { s.append("." + std::to_string(++fatal_idx)); - ret = rename(m.c_str(), s.c_str()); + rename(m.c_str(), s.c_str()); if (enable_log_delete && fatal_idx - logs_delete_exceeds > 0) { std::string to_delete = m + "." + std::to_string(fatal_idx - logs_delete_exceeds); boost::filesystem::remove(to_delete); @@ -107,7 +106,7 @@ RolloutHandler(const char* filename, std::size_t size, el::Level level) { } default: { s.append("." + std::to_string(++global_idx)); - ret = rename(m.c_str(), s.c_str()); + rename(m.c_str(), s.c_str()); if (enable_log_delete && global_idx - logs_delete_exceeds > 0) { std::string to_delete = m + "." + std::to_string(global_idx - logs_delete_exceeds); boost::filesystem::remove(to_delete); diff --git a/core/src/utils/ValidationUtil.cpp b/core/src/utils/ValidationUtil.cpp index 42bba87d..71415714 100644 --- a/core/src/utils/ValidationUtil.cpp +++ b/core/src/utils/ValidationUtil.cpp @@ -216,7 +216,7 @@ ValidationUtil::ValidateIndexParams(const milvus::json& index_params, // special check for 'm' parameter std::vector resset; milvus::knowhere::IVFPQConfAdapter::GetValidMList(collection_schema.dimension_, resset); - int64_t m_value = index_params[index_params, knowhere::IndexParams::m]; + int64_t m_value = index_params[knowhere::IndexParams::m]; if (resset.empty()) { std::string msg = "Invalid collection dimension, unable to get reasonable values for 'm'"; LOG_SERVER_ERROR_ << msg; @@ -504,7 +504,7 @@ ValidationUtil::ValidateGpuIndex(int32_t gpu_index) { #ifdef MILVUS_GPU_VERSION Status -ValidationUtil::GetGpuMemory(int32_t gpu_index, size_t& memory) { +ValidationUtil::GetGpuMemory(int32_t gpu_index, int64_t& memory) { fiu_return_on("ValidationUtil.GetGpuMemory.return_error", Status(SERVER_UNEXPECTED_ERROR, "")); cudaDeviceProp deviceProp; diff --git a/core/src/utils/ValidationUtil.h b/core/src/utils/ValidationUtil.h index 3c4a17de..39dc98d5 100644 --- a/core/src/utils/ValidationUtil.h +++ b/core/src/utils/ValidationUtil.h @@ -72,7 +72,7 @@ class ValidationUtil { #ifdef MILVUS_GPU_VERSION static Status - GetGpuMemory(int32_t gpu_index, size_t& memory); + GetGpuMemory(int32_t gpu_index, int64_t& memory); #endif static Status diff --git a/core/unittest/server/test_config.cpp b/core/unittest/server/test_config.cpp index 99cc110b..698f329d 100644 --- a/core/unittest/server/test_config.cpp +++ b/core/unittest/server/test_config.cpp @@ -52,10 +52,6 @@ TEST_F(ConfigTest, CONFIG_TEST) { milvus::server::ConfigNode& root_config = config_mgr->GetRootNode(); milvus::server::ConfigNode& server_config = root_config.GetChild("server_config"); - milvus::server::ConfigNode& db_config = root_config.GetChild("db_config"); - milvus::server::ConfigNode& metric_config = root_config.GetChild("metric_config"); - milvus::server::ConfigNode& cache_config = root_config.GetChild("cache_config"); - milvus::server::ConfigNode& wal_config = root_config.GetChild("wal_config"); milvus::server::ConfigNode invalid_config = root_config.GetChild("invalid_config"); const auto& im_config_mgr = *static_cast(config_mgr); diff --git a/core/unittest/server/test_util.cpp b/core/unittest/server/test_util.cpp index 485de6b0..ed3ebcab 100644 --- a/core/unittest/server/test_util.cpp +++ b/core/unittest/server/test_util.cpp @@ -65,7 +65,7 @@ TEST(UtilTest, SIGNAL_TEST) { } TEST(UtilTest, COMMON_TEST) { - uint64_t total_mem = 0, free_mem = 0; + int64_t total_mem = 0, free_mem = 0; milvus::server::CommonUtil::GetSystemMemInfo(total_mem, free_mem); ASSERT_GT(total_mem, 0); ASSERT_GT(free_mem, 0); @@ -685,7 +685,7 @@ TEST(ValidationUtilTest, VALIDATE_GPU_TEST) { ASSERT_NE(milvus::server::ValidationUtil::ValidateGpuIndex(0).code(), milvus::SERVER_SUCCESS); fiu_disable("ValidationUtil.ValidateGpuIndex.get_device_count_fail"); - size_t memory = 0; + int64_t memory = 0; ASSERT_EQ(milvus::server::ValidationUtil::GetGpuMemory(0, memory).code(), milvus::SERVER_SUCCESS); ASSERT_NE(milvus::server::ValidationUtil::GetGpuMemory(100, memory).code(), milvus::SERVER_SUCCESS); } -- GitLab