diff --git a/core/src/db/DBImpl.cpp b/core/src/db/DBImpl.cpp index 88689857ca93fd1cbe6de5145a3316288a4fd635..0f118e98dffd6f36e65a140cb787a4bf0a3fd32d 100644 --- a/core/src/db/DBImpl.cpp +++ b/core/src/db/DBImpl.cpp @@ -800,7 +800,7 @@ DBImpl::BackgroundCompaction(std::set 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_); diff --git a/core/src/db/meta/MetaConsts.h b/core/src/db/meta/MetaConsts.h index 0c77dc259945ebd8eb830d327444d00af098b22d..b85c69370774a61dd8928ea97684ec2d08f8cd58 100644 --- a/core/src/db/meta/MetaConsts.h +++ b/core/src/db/meta/MetaConsts.h @@ -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: diff --git a/core/src/db/meta/MySQLMetaImpl.cpp b/core/src/db/meta/MySQLMetaImpl.cpp index d4b5eee442f5ca5d48bcf58dd8191a4dbd45efe5..5072df9cad346a34fe1e1364eb5158b498af5976 100644 --- a/core/src/db/meta/MySQLMetaImpl.cpp +++ b/core/src/db/meta/MySQLMetaImpl.cpp @@ -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 { diff --git a/core/unittest/db/test_meta.cpp b/core/unittest/db/test_meta.cpp index b89c73c29675b2c359210fda126e140e5989fbcd..bb8641fac59185713263393b2585fba7a78234bb 100644 --- a/core/unittest/db/test_meta.cpp +++ b/core/unittest/db/test_meta.cpp @@ -141,7 +141,7 @@ TEST_F(MetaTest, ARCHIVE_TEST_DAYS) { status = impl.CreateTableFile(table_file); table_file.file_type_ = milvus::engine::meta::TableFileSchema::NEW; int day = rand_r(&seed) % (days_num * 2); - table_file.created_on_ = ts - day * milvus::engine::meta::D_SEC * milvus::engine::meta::US_PS - 10000; + table_file.created_on_ = ts - day * milvus::engine::meta::DAY * milvus::engine::meta::US_PS - 10000; status = impl.UpdateTableFile(table_file); files.push_back(table_file); days.push_back(day); diff --git a/core/unittest/db/test_meta_mysql.cpp b/core/unittest/db/test_meta_mysql.cpp index 9a52a01b7bad36eeaef1afdaa4ee1129b3dc2462..f77defe2f699c7fe261416b084f0160559e92650 100644 --- a/core/unittest/db/test_meta_mysql.cpp +++ b/core/unittest/db/test_meta_mysql.cpp @@ -145,7 +145,7 @@ TEST_F(MySqlMetaTest, ARCHIVE_TEST_DAYS) { status = impl.CreateTableFile(table_file); table_file.file_type_ = milvus::engine::meta::TableFileSchema::NEW; int day = rand_r(&seed) % (days_num * 2); - table_file.created_on_ = ts - day * milvus::engine::meta::D_SEC * milvus::engine::meta::US_PS - 10000; + table_file.created_on_ = ts - day * milvus::engine::meta::DAY * milvus::engine::meta::US_PS - 10000; status = impl.UpdateTableFile(table_file); files.push_back(table_file); days.push_back(day);