Unverified Commit 561e2f5f authored by Zhiru Zhu's avatar Zhiru Zhu
Browse files

update



Signed-off-by: default avatarZhiru Zhu <zzhu@fandm.edu>
parent 4825f072
Loading
Loading
Loading
Loading
+9 −4
Original line number Diff line number Diff line
@@ -266,14 +266,19 @@ XSearchTask::Execute() {

            // step 3: pick up topk result
            auto spec_k = file_->row_count_ < topk ? file_->row_count_ : topk;
            if (spec_k == 0) {
                ENGINE_LOG_WARNING << "Searching in an empty file. file location = " << file_->location_;
            }

            {
                std::unique_lock<std::mutex> lock(search_job->mutex());

                if (search_job->GetResultIds().front() == -1 && search_job->GetResultIds().size() > spec_k) {
                if (search_job->GetResultIds().size() > spec_k) {
                    if (search_job->GetResultIds().front() == -1) {
                        // initialized results set
                    search_job->GetResultIds().resize(spec_k);
                    search_job->GetResultDistances().resize(spec_k);
                        search_job->GetResultIds().resize(spec_k * nq);
                        search_job->GetResultDistances().resize(spec_k * nq);
                    }
                }

                XSearchTask::MergeTopkToResultSet(output_ids, output_distance, spec_k, nq, topk, ascending_reduce,