Unverified Commit 7d0a3ae0 authored by Jin Hai's avatar Jin Hai Committed by GitHub
Browse files

Merge pull request #604 from Yukikaze-CZR/0.6.0 

Increase code coverage rate #485
parents bf1f07ec 05bfaa19

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#440 - Server cannot startup with gpu_resource_config.enable=false in GPU version

- \#458 - Index data is not compatible between 0.5 and 0.6

- \#465 - Server hang caused by searching with nsg index

- \#485 - Increase code coverage rate

- \#486 - gpu no usage during index building

- \#497 - CPU-version search performance decreased

- \#504 - The code coverage rate of core/src/scheduler/optimizer is too low

core/src/db/engine/ExecutionEngineImpl.cpp

+2 −0
Original line number Diff line number Diff line
@@ -112,10 +112,12 @@ ExecutionEngineImpl::CreatetVecIndex(EngineType type) { 
            index = GetVecIndexFactory(IndexType::NSG_MIX);

            break;

        }

#ifdef CUSTOMIZATION

        case EngineType::FAISS_IVFSQ8H: {

            index = GetVecIndexFactory(IndexType::FAISS_IVFSQ8_HYBRID);

            break;

        }

#endif

        case EngineType::FAISS_PQ: {

#ifdef MILVUS_CPU_VERSION

            index = GetVecIndexFactory(IndexType::FAISS_IVFPQ_CPU);

core/unittest/db/test_engine.cpp

+27 −1
Original line number Diff line number Diff line
@@ -59,6 +59,29 @@ TEST_F(EngineTest, FACTORY_TEST) { 


        ASSERT_TRUE(engine_ptr != nullptr);

    }



    {

        auto engine_ptr = milvus::engine::EngineFactory::Build(

                512, "/tmp/milvus_index_1", milvus::engine::EngineType::FAISS_PQ, milvus::engine::MetricType::IP, 1024);



        ASSERT_TRUE(engine_ptr != nullptr);

    }



    {

        auto engine_ptr = milvus::engine::EngineFactory::Build(

                512, "/tmp/milvus_index_1", milvus::engine::EngineType::SPTAG_KDT,

                milvus::engine::MetricType::L2, 1024);



        ASSERT_TRUE(engine_ptr != nullptr);

    }



    {

        auto engine_ptr = milvus::engine::EngineFactory::Build(

                512, "/tmp/milvus_index_1", milvus::engine::EngineType::SPTAG_KDT,

                milvus::engine::MetricType::L2, 1024);



        ASSERT_TRUE(engine_ptr != nullptr);

    }

}



TEST_F(EngineTest, ENGINE_IMPL_TEST) {
@@ -69,7 +92,7 @@ TEST_F(EngineTest, ENGINE_IMPL_TEST) { 


    std::vector<float> data;

    std::vector<int64_t> ids;

    const int row_count = 10000;

    const int row_count = 500;

    data.reserve(row_count * dimension);

    ids.reserve(row_count);

    for (int64_t i = 0; i < row_count; i++) {
@@ -95,5 +118,8 @@ TEST_F(EngineTest, ENGINE_IMPL_TEST) { 
    // ASSERT_TRUE(status.ok());



    auto engine_build = engine_ptr->BuildIndex("/tmp/milvus_index_2", milvus::engine::EngineType::FAISS_IVFSQ8);

    engine_build = engine_ptr->BuildIndex("/tmp/milvus_index_3", milvus::engine::EngineType::FAISS_PQ);

    engine_build = engine_ptr->BuildIndex("/tmp/milvus_index_4", milvus::engine::EngineType::SPTAG_KDT);

    engine_build = engine_ptr->BuildIndex("/tmp/milvus_index_5", milvus::engine::EngineType::SPTAG_BKT);

    // ASSERT_TRUE(status.ok());

}