From a3dc026c0de75f32d2db1af21c95212b05274466 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Thu, 5 Dec 2024 10:33:51 +0800
Subject: [PATCH] feat: db auto compact

---
 include/util/tdef.h                      |  4 +--
 source/dnode/mnode/impl/src/mndCompact.c | 41 ++++++++++++++----------
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/include/util/tdef.h b/include/util/tdef.h
index 68a8b281ec..4c1b263755 100644
--- a/include/util/tdef.h
+++ b/include/util/tdef.h
@@ -507,8 +507,8 @@ typedef enum ELogicConditionType {
 #define TSDB_DEFAULT_TABLE_TTL          0
 
 #define TSDB_DEFAULT_COMPACT_INTERVAL    0
-#define TSDB_MIN_COMPACT_INTERVAL       10  // unit minute
-#define TSDB_MAX_COMPACT_INTERVAL       TSDB_MAX_KEEP // unit minute
+#define TSDB_MIN_COMPACT_INTERVAL        10             // unit minute
+#define TSDB_MAX_COMPACT_INTERVAL        TSDB_MAX_KEEP  // unit minute
 #define TSDB_DEFAULT_COMPACT_START_TIME  0
 #define TSDB_DEFAULT_COMPACT_END_TIME    0
 #define TSDB_MIN_COMPACT_TIME_OFFSET     0
diff --git a/source/dnode/mnode/impl/src/mndCompact.c b/source/dnode/mnode/impl/src/mndCompact.c
index 47ed48bb05..cbc584eb1e 100644
--- a/source/dnode/mnode/impl/src/mndCompact.c
+++ b/source/dnode/mnode/impl/src/mndCompact.c
@@ -942,57 +942,64 @@ static int32_t mndCompactDispatch(SRpcMsg *pReq) {
   int32_t code = 0;
   SMnode *pMnode = pReq->info.node;
   SSdb   *pSdb = pMnode->pSdb;
-  int64_t now = taosGetTimestampMs();
-  int64_t nowSec = now / 60000;
+  int64_t curMs = taosGetTimestampMs();
+  int64_t curMin = curMs / 60000LL;
 
   void   *pIter = NULL;
   SDbObj *pDb = NULL;
   while ((pIter = sdbFetch(pSdb, SDB_DB, pIter, (void **)&pDb))) {
     if ((pDb->cfg.compactInterval == 0) || (pDb->cfg.compactStartTime >= pDb->cfg.compactEndTime)) {
+      mDebug("db:%p,%s, compact interval is %dm or start time:%dm >= end time:%dm, skip", pDb, pDb->name,
+             pDb->cfg.compactInterval, pDb->cfg.compactStartTime, pDb->cfg.compactEndTime);
       sdbRelease(pSdb, pDb);
       continue;
     }
 
-    if (pDb->compactStartTime == nowSec) {
-      assert(0);
+    int64_t remainder = ((curMin + (int64_t)pDb->cfg.compactTimeOffset * 60LL) % pDb->cfg.compactInterval);
+    if (remainder != 0) {
+      mDebug("db:%p,%s, current time:%" PRIi64 "m is not divisible by compact interval:%dm, offset:%" PRIi8
+             "h, remainder:%" PRIi64 "m, skip",
+             pDb, pDb->name, curMin, pDb->cfg.compactInterval, pDb->cfg.compactTimeOffset, remainder);
       sdbRelease(pSdb, pDb);
       continue;
     }
 
-    if (((nowSec + pDb->cfg.compactTimeOffset) % pDb->cfg.compactInterval) != 0) {
+    if ((pDb->compactStartTime / 60000LL) == curMin) {
+      mDebug("db:%p:%s, compact has already been dispatched at %" PRIi64 "m(%" PRIi64 "ms), skip", pDb, pDb->name,
+             curMin, pDb->compactStartTime);
       sdbRelease(pSdb, pDb);
       continue;
     }
 
-    STimeWindow tw = {.skey = convertTimePrecision(now - (int64_t)pDb->cfg.compactStartTime * 60000,
+    STimeWindow tw = {.skey = convertTimePrecision(curMs + (int64_t)pDb->cfg.compactStartTime * 60000LL,
                                                    TSDB_TIME_PRECISION_MILLI, pDb->cfg.precision),
-                      .ekey = convertTimePrecision(now - (int64_t)pDb->cfg.compactEndTime * 60000,
+                      .ekey = convertTimePrecision(curMs + (int64_t)pDb->cfg.compactEndTime * 60000LL,
                                                    TSDB_TIME_PRECISION_MILLI, pDb->cfg.precision)};
 
     if ((code = mndCompactDb(pMnode, pReq, pDb, tw, NULL)) == 0) {
-      pDb->compactStartTime = nowSec;
-      mInfo("db:%s, dispatch auto compact with range:[%" PRIi64 ",%" PRIi64
-            "], interval:%d, start:%d, end:%d, offset:%" PRIi8,
-            pDb->name, tw.skey, tw.ekey, pDb->cfg.compactInterval, pDb->cfg.compactStartTime, pDb->cfg.compactEndTime,
-            pDb->cfg.compactTimeOffset);
+      mInfo("db:%p,%s, succeed to dispatch compact with range:[%" PRIi64 ",%" PRIi64
+            "], interval:%dm, start:%dm, end:%dm, offset:%" PRIi8 "h",
+            pDb, pDb->name, tw.skey, tw.ekey, pDb->cfg.compactInterval, pDb->cfg.compactStartTime,
+            pDb->cfg.compactEndTime, pDb->cfg.compactTimeOffset);
     } else {
-      mWarn("db:%s, failed to dispatch auto compact with range:[%" PRIi64 ",%" PRIi64
-            "], interval:%d, start:%d, end:%d, offset:%" PRIi8 ", since %s",
-            pDb->name, tw.skey, tw.ekey, pDb->cfg.compactInterval, pDb->cfg.compactStartTime, pDb->cfg.compactEndTime,
-            pDb->cfg.compactTimeOffset, tstrerror(code));
+      mWarn("db:%p,%s, failed to dispatch compact with range:[%" PRIi64 ",%" PRIi64
+            "], interval:%dm, start:%dm, end:%dm, offset:%" PRIi8 "h, since %s",
+            pDb, pDb->name, tw.skey, tw.ekey, pDb->cfg.compactInterval, pDb->cfg.compactStartTime,
+            pDb->cfg.compactEndTime, pDb->cfg.compactTimeOffset, tstrerror(code));
     }
 
     TAOS_UNUSED(mndCompactDispatchAudit(pMnode, pReq, pDb, &tw));
 
     sdbRelease(pSdb, pDb);
   }
-
   return 0;
 }
 
 static int32_t mndProcessCompactTimer(SRpcMsg *pReq) {
+#ifdef TD_ENTERPRISE
   mTrace("start to process compact timer");
   mndCompactPullup(pReq->info.node);
   TAOS_UNUSED(mndCompactDispatch(pReq));
+#endif
   return 0;
 }