Commit 48420dca authored by JinHai-CN's avatar JinHai-CN
Browse files

Merge remote-tracking branch 'github/0.5.1' into 0.5.1 


Former-commit-id: 7f5e5d1acfabe9238d68dddebbf45544a4269181
parents 604cf831 1ff95414

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ Please mark all change in change log and use the ticket from JIRA. 
## Bug

- \#134 - JFrog cache error

- \#161 - Search IVFSQHybrid crash on gpu

- \#169 - IVF_FLAT search out of memory



## Feature

- \#90 - The server start error messages could be improved to enhance user experience

core/src/db/engine/ExecutionEngineImpl.cpp

+6 −23
Original line number Diff line number Diff line
@@ -309,17 +309,6 @@ ExecutionEngineImpl::CopyToGpu(uint64_t device_id, bool hybrid) { 
        return Status::OK();

    }

#endif



    auto index = std::static_pointer_cast<VecIndex>(cache::GpuCacheMgr::GetInstance(device_id)->GetIndex(location_));

    bool already_in_cache = (index != nullptr);

    if (already_in_cache) {

        index_ = index;

    } else {

        if (index_ == nullptr) {

            ENGINE_LOG_ERROR << "ExecutionEngineImpl: index is null, failed to copy to gpu";

            return Status(DB_ERROR, "index is null");

        }



    try {

        index_ = index_->CopyToGpu(device_id);

        ENGINE_LOG_DEBUG << "CPU to GPU" << device_id;
@@ -327,12 +316,6 @@ ExecutionEngineImpl::CopyToGpu(uint64_t device_id, bool hybrid) { 
        ENGINE_LOG_ERROR << e.what();

        return Status(DB_ERROR, e.what());

    }

    }



    if (!already_in_cache) {

        GpuCache(device_id);

    }



    return Status::OK();

}