From 67b993a80641dfb6f880eff165c0d72a8e1e2020 Mon Sep 17 00:00:00 2001
From: Lizhou Gao <lizgao@gmail.com>
Date: Sat, 30 Nov 2019 17:36:44 +0800
Subject: [PATCH] use better names for timing MACROs #556

---
 core/src/db/DBImpl.cpp               | 4 ++--
 core/src/db/meta/MetaConsts.h        | 8 ++++----
 core/src/db/meta/MySQLMetaImpl.cpp   | 2 +-
 core/src/db/meta/SqliteMetaImpl.cpp  | 2 +-
 core/unittest/db/test_meta.cpp       | 2 +-
 core/unittest/db/test_meta_mysql.cpp | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/core/src/db/DBImpl.cpp b/core/src/db/DBImpl.cpp
index 52cf1e66..5196c721 100644
--- a/core/src/db/DBImpl.cpp
+++ b/core/src/db/DBImpl.cpp
@@ -709,9 +709,9 @@ DBImpl::BackgroundCompaction(std::set<std::string> table_ids) {
 
     meta_ptr_->Archive();
 
-    int ttl = 5 * meta::M_SEC;  // default: file will be deleted after 5 minutes
+    int ttl = 5 * meta::MINUTE;  // default: file will be deleted after 5 minutes
     if (options_.mode_ == DBOptions::MODE::CLUSTER_WRITABLE) {
-        ttl = meta::D_SEC;
+        ttl = meta::DAY;
     }
     meta_ptr_->CleanUpFilesWithTTL(ttl);
 
diff --git a/core/src/db/meta/MetaConsts.h b/core/src/db/meta/MetaConsts.h
index 4e40ff77..73b25b0b 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;
 
 }  // namespace meta
 }  // namespace engine
diff --git a/core/src/db/meta/MySQLMetaImpl.cpp b/core/src/db/meta/MySQLMetaImpl.cpp
index c7a05452..d5a9bf6d 100644
--- a/core/src/db/meta/MySQLMetaImpl.cpp
+++ b/core/src/db/meta/MySQLMetaImpl.cpp
@@ -1395,7 +1395,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/src/db/meta/SqliteMetaImpl.cpp b/core/src/db/meta/SqliteMetaImpl.cpp
index 4123858b..34a3b6b6 100644
--- a/core/src/db/meta/SqliteMetaImpl.cpp
+++ b/core/src/db/meta/SqliteMetaImpl.cpp
@@ -949,7 +949,7 @@ SqliteMetaImpl::Archive() {
         auto &criteria = kv.first;
         auto &limit = kv.second;
         if (criteria == engine::ARCHIVE_CONF_DAYS) {
-            int64_t usecs = limit * D_SEC * US_PS;
+            int64_t usecs = limit * DAY * US_PS;
             int64_t now = utils::GetMicroSecTimeStamp();
             try {
                 //multi-threads call sqlite update may get exception('bad logic', etc), so we add a lock here
diff --git a/core/unittest/db/test_meta.cpp b/core/unittest/db/test_meta.cpp
index e2a9c980..09e3d7b0 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 835ea424..023d1f42 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);
-- 
GitLab