Commit 086efd62 authored by 蔡宇东's avatar 蔡宇东 Committed by JinHai-CN
Browse files

clean compile warning (#2380) 



Signed-off-by: default avataryudong.cai <yudong.cai@zilliz.com>
parent 014a0e86

core/src/codecs/default/DefaultVectorIndexFormat.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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;

core/src/config/Config.cpp

+9 −9
Original line number Diff line number Diff line
@@ -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<uint64_t>(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);

core/src/db/DBImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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 {

core/src/db/engine/ExecutionEngineImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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);

                }

core/src/db/merge/MergeAdaptiveStrategy.cpp

+2 −2
Original line number Diff line number Diff line
@@ -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);