Commit 0c978426 authored by Xiaohai Xu's avatar Xiaohai Xu
Browse files

Merge remote-tracking branch 'upstream/master'

parents c08ef96d 694aea22

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ Please mark all change in change log and use the issue from GitHub 
-   \#1549 Fix server/wal config setting bug

-   \#1556 Index file not created after table and index created

-   \#1560 Search crashed with Super-high dimensional binary vector

-   \#1564 Too low recall for glove-200-angular, ivf_pq index

-   \#1574 Set all existing bitset in cache when applying deletes

-   \#1577 Row count incorrect if delete vectors then create index

core/src/index/knowhere/knowhere/index/vector_index/IndexIVF.cpp

+4 −4
Original line number Diff line number Diff line
@@ -118,12 +118,12 @@ IVF::Search(const DatasetPtr& dataset, const Config& config) { 


        //    std::stringstream ss_res_id, ss_res_dist;

        //    for (int i = 0; i < 10; ++i) {

        //        printf("%llu", res_ids[i]);

        //        printf("%llu", p_id[i]);

        //        printf("\n");

        //        printf("%.6f", res_dis[i]);

        //        printf("%.6f", p_dist[i]);

        //        printf("\n");

        //        ss_res_id << res_ids[i] << " ";

        //        ss_res_dist << res_dis[i] << " ";

        //        ss_res_id << p_id[i] << " ";

        //        ss_res_dist << p_dist[i] << " ";

        //    }

        //    std::cout << std::endl << "after search: " << std::endl;

        //    std::cout << ss_res_id.str() << std::endl;

core/src/scheduler/task/SearchTask.cpp

+2 −1
Original line number Diff line number Diff line
@@ -101,7 +101,8 @@ XSearchTask::XSearchTask(const std::shared_ptr<server::Context>& context, TableF 
    if (file_) {

        // distance -- value 0 means two vectors equal, ascending reduce, L2/HAMMING/JACCARD/TONIMOTO ...

        // similarity -- infinity value means two vectors equal, descending reduce, IP

        if (file_->metric_type_ == static_cast<int>(MetricType::IP)) {

        if (file_->metric_type_ == static_cast<int>(MetricType::IP) &&

            file_->engine_type_ != static_cast<int>(EngineType::FAISS_PQ)) {

            ascending_reduce = false;

        }