From 5ede67f578d6d5094d515c1c61ff71939fff5580 Mon Sep 17 00:00:00 2001
From: wangjiaming0909 <604227650@qq.com>
Date: Thu, 9 May 2024 17:55:17 +0800
Subject: [PATCH] modify tsma invalid interval msg

---
 source/libs/catalog/src/ctgCache.c | 14 ++++++++------
 source/util/src/terror.c           |  2 +-
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/source/libs/catalog/src/ctgCache.c b/source/libs/catalog/src/ctgCache.c
index 2be746929f..7d392346ad 100644
--- a/source/libs/catalog/src/ctgCache.c
+++ b/source/libs/catalog/src/ctgCache.c
@@ -3444,17 +3444,18 @@ static SCtgCacheOperation* createDropAllTbTsmaCtgCacheOp(SCatalog* pCtg, const S
 
 int32_t ctgDropTSMAForTbEnqueue(SCatalog *pCtg, SName *pName, bool syncOp) {
   ctgDebug("drop tsma meta for tb: %s.%s", pName->dbname, pName->tname);
-  int32_t code = 0;
-  SCtgDBCache* pDbCache = NULL;
-  SCtgCacheOperation* pOp = NULL;
-  char dbFName[TSDB_DB_FNAME_LEN];
+  int32_t             code = 0;
+  SCtgDBCache        *pDbCache = NULL;
+  SCtgCacheOperation *pOp = NULL;
+  char                dbFName[TSDB_DB_FNAME_LEN];
+  SCtgTSMACache      *pCtgCache = NULL;
   tNameGetFullDbName(pName, dbFName);
   CTG_ERR_JRET(ctgGetDBCache(pCtg, dbFName, &pDbCache));
   if (NULL == pDbCache || !pDbCache->tsmaCache) {
     goto _return;
   }
 
-  SCtgTSMACache *pCtgCache = taosHashGet(pDbCache->tsmaCache, pName->tname, strlen(pName->tname));
+  pCtgCache = taosHashAcquire(pDbCache->tsmaCache, pName->tname, strlen(pName->tname));
   if (!pCtgCache) goto _return;
 
   CTG_LOCK(CTG_READ, &pCtgCache->tsmaLock);
@@ -3471,10 +3472,11 @@ int32_t ctgDropTSMAForTbEnqueue(SCatalog *pCtg, SName *pName, bool syncOp) {
   }
   CTG_UNLOCK(CTG_READ, &pCtgCache->tsmaLock);
   CTG_ERR_JRET(ctgEnqueue(pCtg, pOp));
-
+  taosHashRelease(pDbCache->tsmaCache, pCtgCache);
   return TSDB_CODE_SUCCESS;
 
 _return:
+  if (pCtgCache) taosHashRelease(pDbCache->tsmaCache, pCtgCache);
   if (pOp) {
     taosMemoryFree(pOp->data);
     taosMemoryFree(pOp);
diff --git a/source/util/src/terror.c b/source/util/src/terror.c
index 3ef656b2b4..add01b3188 100644
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
@@ -719,7 +719,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_INVALID_STAT,              "Invalid tsma state"
 TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_INVALID_PTR,               "Invalid tsma pointer")
 TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_INVALID_PARA,              "Invalid tsma parameters")
 TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_INVALID_TB,                "Invalid table to create tsma, only stable or normal table allowed")
-TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_INVALID_INTERVAL,          "Invalid tsma interval, 1ms ~ 1h is allowed")
+TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_INVALID_INTERVAL,          "Invalid tsma interval, 1m ~ 1h is allowed")
 TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_INVALID_FUNC_PARAM,        "Invalid tsma func param, only one non-tag column allowed")
 TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_UNSUPPORTED_FUNC,          "Tsma func not supported")
 TAOS_DEFINE_ERROR(TSDB_CODE_TSMA_MUST_BE_DROPPED,           "Tsma must be dropped first")