Commit c018bf0a authored by Yukikaze-CZR's avatar Yukikaze-CZR
Browse files

Merge remote-tracking branch 'upstream/0.6.0' into 0.6.0

parents 3b29e8df dc23981f

CHANGELOG.md

+1 −0
Original line number Diff line number Diff line
@@ -48,6 +48,7 @@ Please mark all change in change log and use the ticket from JIRA. 
- \#631 - FAISS isn't compiled with O3 option

- \#636 - [CPU] Create index PQ should be failed if table metric type set Inner Product

- \#649 - Typo "partiton" should be "partition"

- \#654 - Random crash when frequently insert vector one by one



## Feature

- \#12 - Pure CPU version for Milvus

core/src/db/DBImpl.cpp

+2 −2
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ constexpr uint64_t METRIC_ACTION_INTERVAL = 1; 
constexpr uint64_t COMPACT_ACTION_INTERVAL = 1;

constexpr uint64_t INDEX_ACTION_INTERVAL = 1;



static const Status SHUTDOWN_ERROR = Status(DB_ERROR, "Milsvus server is shutdown!");

static const Status SHUTDOWN_ERROR = Status(DB_ERROR, "Milvus server is shutdown!");



void

TraverseFiles(const meta::DatePartionedTableFilesSchema& date_files, meta::TableFilesSchema& files_array) {
@@ -800,7 +800,7 @@ DBImpl::BackgroundCompaction(std::set<std::string> table_ids) { 
    {

        uint64_t ttl = 10 * meta::SECOND;  // default: file will be hard-deleted few seconds after soft-deleted

        if (options_.mode_ == DBOptions::MODE::CLUSTER_WRITABLE) {

            ttl = meta::H_SEC;

            ttl = meta::HOUR;

        }



        meta_ptr_->CleanUpFilesWithTTL(ttl, &ongoing_files_checker_);

core/src/db/insert/MemManagerImpl.cpp

+2 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ MemManagerImpl::EraseMemVector(const std::string& table_id) { 
size_t

MemManagerImpl::GetCurrentMutableMem() {

    size_t total_mem = 0;

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

    for (auto& kv : mem_id_map_) {

        auto memTable = kv.second;

        total_mem += memTable->GetCurrentMem();
@@ -126,6 +127,7 @@ MemManagerImpl::GetCurrentMutableMem() { 
size_t

MemManagerImpl::GetCurrentImmutableMem() {

    size_t total_mem = 0;

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

    for (auto& mem_table : immu_mem_list_) {

        total_mem += mem_table->GetCurrentMem();

    }

core/src/db/meta/MetaConsts.h

+4 −4
Original line number Diff line number Diff line
@@ -27,10 +27,10 @@ const size_t US_PS = 1000 * MS_PS; 
const size_t NS_PS = 1000 * US_PS;



const size_t SECOND = 1UL;

const size_t M_SEC = 60 * SECOND;

const size_t H_SEC = 60 * M_SEC;

const size_t D_SEC = 24 * H_SEC;

const size_t W_SEC = 7 * D_SEC;

const size_t MINUTE = 60 * SECOND;

const size_t HOUR = 60 * MINUTE;

const size_t DAY = 24 * HOUR;

const size_t WEEK = 7 * DAY;



// This value is to ignore small raw files when building index.

// The reason is:

core/src/db/meta/MySQLMetaImpl.cpp

+1 −1
Original line number Diff line number Diff line
@@ -1664,7 +1664,7 @@ MySQLMetaImpl::Archive() { 
        auto& criteria = kv.first;

        auto& limit = kv.second;

        if (criteria == engine::ARCHIVE_CONF_DAYS) {

            size_t usecs = limit * D_SEC * US_PS;

            size_t usecs = limit * DAY * US_PS;

            int64_t now = utils::GetMicroSecTimeStamp();



            try {