From 34872205f5629d6b4ed89b20d62dfa7e99fe6878 Mon Sep 17 00:00:00 2001
From: kailixu <klxu@taosdata.com>
Date: Wed, 22 May 2024 16:33:12 +0800
Subject: [PATCH] enh: refine error code

---
 source/client/src/clientHb.c |  1 +
 source/util/src/terror.c     | 20 ++++++++++----------
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/source/client/src/clientHb.c b/source/client/src/clientHb.c
index 7d30a19140..1b6cb8fd22 100644
--- a/source/client/src/clientHb.c
+++ b/source/client/src/clientHb.c
@@ -92,6 +92,7 @@ static int32_t hbUpdateUserAuthInfo(SAppHbMgr *pAppHbMgr, SUserAuthBatchRsp *bat
         }
         if (!pRsp) {
           releaseTscObj(pReq->connKey.tscRid);
+          taosHashCancelIterate(hbMgr->activeInfo, pReq);
           break;
         }
       }
diff --git a/source/util/src/terror.c b/source/util/src/terror.c
index e30bfea4b3..0f594af0e9 100644
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
@@ -501,16 +501,16 @@ TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_MACHINES_MISMATCH,      "Cluster machines mism
 TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_OPT_EXPIRE_TOO_LARGE,   "Expiration time of optional grant item is too large")
 TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_DUPLICATED_ACTIVE,      "The active code can't be activated repeatedly")
 TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_VIEW_LIMITED,           "Number of views has reached the licensed upper limit")
-TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_BASIC_EXPIRED,          "Expiration time of basic functions has reached the licensed upper limit")
-TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_STREAM_EXPIRED,         "Expiration time of streams has reached the licensed upper limit")
-TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_SUBSCRIPTION_EXPIRED,   "Expiration time of subscriptions has reached the licensed upper limit")
-TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_VIEW_EXPIRED,           "Expiration time of views has reached the licensed upper limit")
-TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_AUDIT_EXPIRED,          "Expiration time of audit has reached the licensed upper limit")
-TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_CSV_EXPIRED,            "Expiration time of CSV has reached the licensed upper limit")
-TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_MULTI_STORAGE_EXPIRED,  "Expiration time of multi-tier storage has reached the licensed upper limit")
-TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_OBJECT_STROAGE_EXPIRED, "Expiration time of object storage has reached the licensed upper limit")
-TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_DUAL_REPLICA_HA_EXPIRED,"Expiration time of dual-replica HA has reached the licensed upper limit")
-TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_DB_ENCRYPTION_EXPIRED,  "Expiration time of database encryption has reached the licensed upper limit")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_BASIC_EXPIRED,          "License expired for basic functions")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_STREAM_EXPIRED,         "License expired for stream function")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_SUBSCRIPTION_EXPIRED,   "License expired for subscription function")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_VIEW_EXPIRED,           "License expired for view function")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_AUDIT_EXPIRED,          "License expired for audit function")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_CSV_EXPIRED,            "License expired for CSV function")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_MULTI_STORAGE_EXPIRED,  "License expired for multi-tier storage function")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_OBJECT_STROAGE_EXPIRED, "License expired for object storage function")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_DUAL_REPLICA_HA_EXPIRED,"License expired for dual-replica HA function")
+TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_DB_ENCRYPTION_EXPIRED,  "License expired for database encryption function")
 
 
 // sync