From f2ad546666dc1e4b1ba8672f879828efbf467f0c Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Tue, 21 Jun 2022 18:37:47 +0800
Subject: [PATCH] fix: add configure for ttl unit

---
 include/common/tglobal.h                | 3 +++
 source/common/src/tglobal.c             | 7 +++++++
 source/dnode/mnode/impl/src/mndMain.c   | 2 +-
 source/dnode/mnode/impl/src/mndStb.c    | 2 +-
 source/dnode/vnode/src/meta/metaTable.c | 3 +--
 source/dnode/vnode/src/vnd/vnodeSvr.c   | 2 +-
 6 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/include/common/tglobal.h b/include/common/tglobal.h
index 8c03d3ff42..3f68bb4147 100644
--- a/include/common/tglobal.h
+++ b/include/common/tglobal.h
@@ -138,6 +138,9 @@ extern bool tsSmlDataFormat;
 extern int32_t tsTransPullupInterval;
 extern int32_t tsMqRebalanceInterval;
 
+// ttl unit
+extern int32_t tsTtlUnit;
+
 #define NEEDTO_COMPRESSS_MSG(size) (tsCompressMsgSize != -1 && (size) > tsCompressMsgSize)
 
 int32_t taosCreateLog(const char *logname, int32_t logFileNum, const char *cfgDir, const char **envCmd,
diff --git a/source/common/src/tglobal.c b/source/common/src/tglobal.c
index 269c92a670..cd7cae8471 100644
--- a/source/common/src/tglobal.c
+++ b/source/common/src/tglobal.c
@@ -188,6 +188,8 @@ bool tsStartUdfd = true;
 int32_t tsTransPullupInterval = 2;
 int32_t tsMqRebalanceInterval = 2;
 
+int32_t tsTtlUnit = 86400;
+
 void taosAddDataDir(int32_t index, char *v1, int32_t level, int32_t primary) {
   tstrncpy(tsDiskCfg[index].dir, v1, TSDB_FILENAME_LEN);
   tsDiskCfg[index].level = level;
@@ -468,6 +470,9 @@ static int32_t taosAddServerCfg(SConfig *pCfg) {
   if (cfgAddInt32(pCfg, "transPullupInterval", tsTransPullupInterval, 1, 10000, 1) != 0) return -1;
   if (cfgAddInt32(pCfg, "mqRebalanceInterval", tsMqRebalanceInterval, 1, 10000, 1) != 0) return -1;
 
+  if (cfgAddInt32(pCfg, "ttlUnit", tsTtlUnit, 1, 86400*365, 1) != 0) return -1;
+
+
   if (cfgAddBool(pCfg, "udf", tsStartUdfd, 0) != 0) return -1;
   return 0;
 }
@@ -620,6 +625,8 @@ static int32_t taosSetServerCfg(SConfig *pCfg) {
   tsTransPullupInterval = cfgGetItem(pCfg, "transPullupInterval")->i32;
   tsMqRebalanceInterval = cfgGetItem(pCfg, "mqRebalanceInterval")->i32;
 
+  tsTtlUnit = cfgGetItem(pCfg, "ttlUnit")->i32;
+
   tsStartUdfd = cfgGetItem(pCfg, "udf")->bval;
 
   if (tsQueryBufferSize >= 0) {
diff --git a/source/dnode/mnode/impl/src/mndMain.c b/source/dnode/mnode/impl/src/mndMain.c
index 7a5220d0b2..e0c3b8d2a1 100644
--- a/source/dnode/mnode/impl/src/mndMain.c
+++ b/source/dnode/mnode/impl/src/mndMain.c
@@ -95,7 +95,7 @@ static void *mndThreadFp(void *param) {
     taosMsleep(100);
     if (mndGetStop(pMnode)) break;
 
-    if (lastTime % (864000) == 1) {   // sleep 1 day for ttl
+    if (lastTime % (600) == 1) {
       mndTtlTimer(pMnode);
     }
 
diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c
index b5777183db..27c1e558e8 100644
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -805,7 +805,7 @@ static int32_t mndProcessTtl(SRpcMsg *pReq) {
     if(code != 0){
       mError("ttl time seed err. code:%d", code);
     }
-    mError("ttl time seed succ. time:%d", t);
+    mDebug("ttl time seed succ. time:%d", t);
     sdbRelease(pSdb, pVgroup);
   }
   return 0;
diff --git a/source/dnode/vnode/src/meta/metaTable.c b/source/dnode/vnode/src/meta/metaTable.c
index bf5d5912f9..2bbea593fa 100644
--- a/source/dnode/vnode/src/meta/metaTable.c
+++ b/source/dnode/vnode/src/meta/metaTable.c
@@ -400,8 +400,7 @@ static void metaBuildTtlIdxKey(STtlIdxKey *ttlKey, const SMetaEntry *pME){
 
   if (ttlDays <= 0) return;
 
-  ttlKey->dtime = ctime / 1000 + ttlDays * 24 * 60 * 60;
-//  ttlKey->dtime = ctime / 1000 + ttlDays;
+  ttlKey->dtime = ctime / 1000 + ttlDays * tsTtlUnit;
   ttlKey->uid = pME->uid;
 }
 
diff --git a/source/dnode/vnode/src/vnd/vnodeSvr.c b/source/dnode/vnode/src/vnd/vnodeSvr.c
index b5a2da091f..c5023185c8 100644
--- a/source/dnode/vnode/src/vnd/vnodeSvr.c
+++ b/source/dnode/vnode/src/vnd/vnodeSvr.c
@@ -309,7 +309,7 @@ static int32_t vnodeProcessDropTtlTbReq(SVnode *pVnode, int64_t version, void *p
   if (tbUids == NULL) return TSDB_CODE_OUT_OF_MEMORY;
 
   int32_t t = ntohl(*(int32_t *)pReq);
-  vError("rec ttl time:%d", t);
+  vDebug("rec ttl time:%d", t);
   int32_t ret = metaTtlDropTable(pVnode->pMeta, t, tbUids);
   if (ret != 0) {
     goto end;
-- 
GitLab