From be4e47e9a708f0571375dabe0809b0aeb23200c6 Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Tue, 25 Jul 2023 16:15:33 +0800
Subject: [PATCH] fix:add macro ASSERT_NOT_CORE to control ASSERT not core in
 release version

---
 source/client/src/clientTmq.c              | 4 ++--
 source/common/src/tmsg.c                   | 3 +++
 source/dnode/mnode/impl/src/mndSubscribe.c | 2 +-
 source/dnode/vnode/src/tq/tqUtil.c         | 1 +
 source/util/CMakeLists.txt                 | 7 +++++++
 source/util/src/tlog.c                     | 4 ++++
 6 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/source/client/src/clientTmq.c b/source/client/src/clientTmq.c
index 8fb6911f81..3576df434b 100644
--- a/source/client/src/clientTmq.c
+++ b/source/client/src/clientTmq.c
@@ -1860,8 +1860,8 @@ static int32_t tmqHandleNoPollRsp(tmq_t* tmq, SMqRspWrapper* rspWrapper, bool* p
 static void updateVgInfo(SMqClientVg* pVg, STqOffsetVal* reqOffset, STqOffsetVal* rspOffset, int64_t sver, int64_t ever, int64_t consumerId){
   if (!pVg->seekUpdated) {
     tscDebug("consumer:0x%" PRIx64" local offset is update, since seekupdate not set", consumerId);
-    if(reqOffset->type != 0) pVg->offsetInfo.beginOffset = *reqOffset;
-    if(rspOffset->type != 0) pVg->offsetInfo.endOffset = *rspOffset;
+    pVg->offsetInfo.beginOffset = *reqOffset;
+    pVg->offsetInfo.endOffset = *rspOffset;
   } else {
     tscDebug("consumer:0x%" PRIx64" local offset is NOT update, since seekupdate is set", consumerId);
   }
diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c
index 8051f4d0bd..643313f3f7 100644
--- a/source/common/src/tmsg.c
+++ b/source/common/src/tmsg.c
@@ -7207,6 +7207,9 @@ bool tOffsetEqual(const STqOffsetVal *pLeft, const STqOffsetVal *pRight) {
       return pLeft->uid == pRight->uid && pLeft->ts == pRight->ts;
     } else if (pLeft->type == TMQ_OFFSET__SNAPSHOT_META) {
       return pLeft->uid == pRight->uid;
+    } else {
+      uError("offset type:%d", pLeft->type);
+      ASSERT(0);
     }
   }
   return false;
diff --git a/source/dnode/mnode/impl/src/mndSubscribe.c b/source/dnode/mnode/impl/src/mndSubscribe.c
index f51a61eda3..0fa9efd427 100644
--- a/source/dnode/mnode/impl/src/mndSubscribe.c
+++ b/source/dnode/mnode/impl/src/mndSubscribe.c
@@ -1168,7 +1168,7 @@ static int32_t buildResult(SSDataBlock *pBlock, int32_t* numOfRows, int64_t cons
     pColInfo = taosArrayGet(pBlock->pDataBlock, cols++);
     colDataSetVal(pColInfo, *numOfRows, (const char *)consumerIdHex, consumerId == -1);
     
-    mDebug("mnd show subscriptions: topic %s, consumer:0x%" PRIx64 " cgroup %s vgid %d", varDataVal(topic),
+    mInfo("mnd show subscriptions: topic %s, consumer:0x%" PRIx64 " cgroup %s vgid %d", varDataVal(topic),
            consumerId, varDataVal(cgroup), pVgEp->vgId);
 
     // offset
diff --git a/source/dnode/vnode/src/tq/tqUtil.c b/source/dnode/vnode/src/tq/tqUtil.c
index 4320995306..91a98ba3b0 100644
--- a/source/dnode/vnode/src/tq/tqUtil.c
+++ b/source/dnode/vnode/src/tq/tqUtil.c
@@ -348,6 +348,7 @@ int32_t tqExtractDataForMq(STQ* pTq, STqHandle* pHandle, const SMqPollReq* pRequ
     // the offset value can not be monotonious increase??
     offset = reqOffset;
   } else {
+    uError("req offset type is 0");
     return TSDB_CODE_TMQ_INVALID_MSG;
   }
 
diff --git a/source/util/CMakeLists.txt b/source/util/CMakeLists.txt
index 6c9aff046c..9c2ed190c1 100644
--- a/source/util/CMakeLists.txt
+++ b/source/util/CMakeLists.txt
@@ -5,6 +5,13 @@ if (DEFINED GRANT_CFG_INCLUDE_DIR)
   add_definitions(-DGRANTS_CFG)
 endif()
 
+IF (${ASSERT_NOT_CORE})
+    ADD_DEFINITIONS(-DASSERT_NOT_CORE)
+    MESSAGE(STATUS "disable assert core")
+ELSE ()
+    MESSAGE(STATUS "enable assert core")
+ENDIF (${ASSERT_NOT_CORE})
+
 target_include_directories(
     util
     PUBLIC "${TD_SOURCE_DIR}/include/util"
diff --git a/source/util/src/tlog.c b/source/util/src/tlog.c
index c07bafa1ea..de7ad848ed 100644
--- a/source/util/src/tlog.c
+++ b/source/util/src/tlog.c
@@ -76,7 +76,11 @@ static int32_t  tsDaylightActive; /* Currently in daylight saving time. */
 
 bool    tsLogEmbedded = 0;
 bool    tsAsyncLog = true;
+#ifdef ASSERT_NOT_CORE
+bool    tsAssert = false;
+#else
 bool    tsAssert = true;
+#endif
 int32_t tsNumOfLogLines = 10000000;
 int32_t tsLogKeepDays = 0;
 LogFp   tsLogFp = NULL;
-- 
GitLab