Commit 648a535e authored by jinhai's avatar jinhai
Browse files

Merge branch 'branch-0.5.0' into 'branch-0.5.0' 

refine code

See merge request megasearch/milvus!664

Former-commit-id: 14f7251c60915540ba667d31e4274dee60b36f5a
parents 9ddee796 58865b21

cpp/src/db/meta/MetaConsts.h

+0 −5
Original line number Diff line number Diff line
@@ -21,11 +21,6 @@ namespace milvus { 
namespace engine {

namespace meta {



const size_t K = 1024UL;

const size_t M = K * K;

const size_t G = K * M;

const size_t T = K * G;



const size_t S_PS = 1UL;

const size_t MS_PS = 1000 * S_PS;

const size_t US_PS = 1000 * MS_PS;

cpp/src/scheduler/ResourceMgr.cpp

+11 −9
Original line number Diff line number Diff line
@@ -79,9 +79,7 @@ ResourceMgr::Add(ResourcePtr&& resource) { 
            gpu_resources_.emplace_back(ResourceWPtr(resource));

            break;

        }

        default: {

            break;

        }

        default: { break; }

    }

    resources_.emplace_back(resource);
@@ -200,13 +198,19 @@ bool 
ResourceMgr::check_resource_valid() {

    {

        // TODO: check one disk-resource, one cpu-resource, zero or more gpu-resource;

        if (GetDiskResources().size() != 1) return false;

        if (GetCpuResources().size() != 1) return false;

        if (GetDiskResources().size() != 1) {

            return false;

        }

        if (GetCpuResources().size() != 1) {

            return false;

        }

    }



    {

        // TODO: one compute-resource at least;

        if (GetNumOfComputeResource() < 1) return false;

        if (GetNumOfComputeResource() < 1) {

            return false;

        }

    }



    {
@@ -237,9 +241,7 @@ void 
ResourceMgr::event_process() {

    while (running_) {

        std::unique_lock<std::mutex> lock(event_mutex_);

        event_cv_.wait(lock, [this] {

            return !queue_.empty();

        });

        event_cv_.wait(lock, [this] { return !queue_.empty(); });



        auto event = queue_.front();

        queue_.pop();

cpp/src/scheduler/task/SearchTask.cpp

+4 −8
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "utils/Log.h"

#include "utils/TimeRecorder.h"



#include <algorithm>

#include <string>

#include <thread>

#include <utility>
@@ -230,13 +231,8 @@ XSearchTask::Execute() { 
}



Status

XSearchTask::TopkResult(const std::vector<long> &input_ids,

                        const std::vector<float> &input_distance,

                        uint64_t input_k,

                        uint64_t nq,

                        uint64_t topk,

                        bool ascending,

                        scheduler::ResultSet &result) {

XSearchTask::TopkResult(const std::vector<int64_t>& input_ids, const std::vector<float>& input_distance,

                        uint64_t input_k, uint64_t nq, uint64_t topk, bool ascending, scheduler::ResultSet& result) {

    scheduler::ResultSet result_buf;



    if (result.empty()) {

cpp/src/scheduler/task/SearchTask.h

+2 −7
Original line number Diff line number Diff line
@@ -39,13 +39,8 @@ class XSearchTask : public Task { 


 public:

    static Status

    TopkResult(const std::vector<long> &input_ids,

               const std::vector<float> &input_distance,

               uint64_t input_k,

               uint64_t nq,

               uint64_t topk,

               bool ascending,

               scheduler::ResultSet &result);

    TopkResult(const std::vector<int64_t>& input_ids, const std::vector<float>& input_distance, uint64_t input_k,

               uint64_t nq, uint64_t topk, bool ascending, scheduler::ResultSet& result);



 public:

    TableFileSchemaPtr file_;

cpp/unittest/db/test_db.cpp

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include "db/utils.h"

#include "db/DB.h"

#include "db/DBImpl.h"

#include "db/Constants.h"

#include "db/meta/MetaConsts.h"

#include "db/DBFactory.h"

#include "cache/CpuCacheMgr.h"
@@ -190,7 +191,7 @@ TEST_F(DBTest, DB_TEST) { 


            START_TIMER;

            stat = db_->Query(TABLE_NAME, k, qb, 10, qxb.data(), results);

            ss << "Search " << j << " With Size " << count / ms::engine::meta::M << " M";

            ss << "Search " << j << " With Size " << count / ms::engine::M << " M";

            STOP_TIMER(ss.str());



            ASSERT_TRUE(stat.ok());
@@ -439,7 +440,7 @@ TEST_F(DBTest2, ARHIVE_DISK_CHECK) { 


    db_->Size(size);

    LOG(DEBUG) << "size=" << size;

    ASSERT_LE(size, 1 * ms::engine::meta::G);

    ASSERT_LE(size, 1 * ms::engine::G);

}



TEST_F(DBTest2, DELETE_TEST) {