From 5ebe3e267230c23faef770d407968b13ac5ac4da Mon Sep 17 00:00:00 2001
From: xsren <285808407@qq.com>
Date: Thu, 22 Aug 2024 13:41:16 +0800
Subject: [PATCH] use internal error code

---
 include/util/taoserror.h           | 2 +-
 source/dnode/vnode/src/tq/tqRead.c | 2 +-
 source/dnode/vnode/src/tq/tqUtil.c | 4 ++--
 source/util/src/terror.c           | 1 +
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/include/util/taoserror.h b/include/util/taoserror.h
index 7ce628a7bc..7eb69bcc78 100644
--- a/include/util/taoserror.h
+++ b/include/util/taoserror.h
@@ -701,6 +701,7 @@ int32_t  taosGetErrSize();
 #define TSDB_CODE_TQ_GROUP_NOT_SET              TAOS_DEF_ERROR_CODE(0, 0x0A0B)
 #define TSDB_CODE_TQ_TABLE_SCHEMA_NOT_FOUND     TAOS_DEF_ERROR_CODE(0, 0x0A0C)
 #define TSDB_CODE_TQ_NO_COMMITTED_OFFSET        TAOS_DEF_ERROR_CODE(0, 0x0A0D)
+#define TSDB_CODE_TQ_INTERNAL_ERROR             TAOS_DEF_ERROR_CODE(0, 0x0A0E)
 
 // wal
 // #define TSDB_CODE_WAL_APP_ERROR              TAOS_DEF_ERROR_CODE(0, 0x1000) // 2.x
@@ -965,7 +966,6 @@ int32_t  taosGetErrSize();
 #define TSDB_CODE_STREAM_INVALID_STATETRANS      TAOS_DEF_ERROR_CODE(0, 0x4103)
 #define TSDB_CODE_STREAM_TASK_IVLD_STATUS        TAOS_DEF_ERROR_CODE(0, 0x4104)
 #define TSDB_CODE_STREAM_NOT_LEADER              TAOS_DEF_ERROR_CODE(0, 0x4105)
-
 #define TSDB_CODE_STREAM_INTERNAL_ERROR          TAOS_DEF_ERROR_CODE(0, 0x4106)
 
 // TDLite
diff --git a/source/dnode/vnode/src/tq/tqRead.c b/source/dnode/vnode/src/tq/tqRead.c
index 902680f76a..db29028102 100644
--- a/source/dnode/vnode/src/tq/tqRead.c
+++ b/source/dnode/vnode/src/tq/tqRead.c
@@ -679,7 +679,7 @@ int32_t tqRetrieveDataBlock(STqReader* pReader, SSDataBlock** pRes, const char*
     if(pReader->cachedSchemaVer != pReader->pSchemaWrapper->version) {
       tqError("vgId:%d, schema version mismatch, suid:%" PRId64 ", uid:%" PRId64 ", version:%d, cached version:%d",
               vgId, suid, uid, sversion, pReader->pSchemaWrapper->version);
-      return TSDB_CODE_TQ_TABLE_SCHEMA_NOT_FOUND;
+      return TSDB_CODE_TQ_INTERNAL_ERROR;
     }
     if (blockDataGetNumOfCols(pBlock) == 0) {
       code = buildResSDataBlock(pReader->pResBlock, pReader->pSchemaWrapper, pReader->pColIdList);
diff --git a/source/dnode/vnode/src/tq/tqUtil.c b/source/dnode/vnode/src/tq/tqUtil.c
index 30457efc23..510dd0cc88 100644
--- a/source/dnode/vnode/src/tq/tqUtil.c
+++ b/source/dnode/vnode/src/tq/tqUtil.c
@@ -248,7 +248,7 @@ static int32_t extractDataAndRspForDbStbSubscribe(STQ* pTq, STqHandle* pHandle,
       if(savedEpoch > pRequest->epoch) {
         tqError("tmq poll: consumer:0x%" PRIx64 " (epoch %d) iter log, savedEpoch error, vgId:%d offset %" PRId64,
                 pRequest->consumerId, pRequest->epoch, vgId, fetchVer);
-        code = TSDB_CODE_TMQ_CONSUMER_ERROR;
+        code = TSDB_CODE_TQ_INTERNAL_ERROR;
         goto END;
       }
 
@@ -259,7 +259,7 @@ static int32_t extractDataAndRspForDbStbSubscribe(STQ* pTq, STqHandle* pHandle,
           if(totalRows != 0) {
             tqError("tmq poll: consumer:0x%" PRIx64 " (epoch %d) iter log, totalRows error, vgId:%d offset %" PRId64,
                     pRequest->consumerId, pRequest->epoch, vgId, fetchVer);
-            code = code == 0 ? TSDB_CODE_TMQ_CONSUMER_ERROR : code;
+            code = code == 0 ? TSDB_CODE_TQ_INTERNAL_ERROR : code;
           }
           goto END;
         }
diff --git a/source/util/src/terror.c b/source/util/src/terror.c
index a58baf5883..76afb7a4f4 100644
--- a/source/util/src/terror.c
+++ b/source/util/src/terror.c
@@ -557,6 +557,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_TQ_META_KEY_DUP_IN_TXN,       "TQ met key dup in txn
 TAOS_DEFINE_ERROR(TSDB_CODE_TQ_GROUP_NOT_SET,             "TQ group not exist")
 TAOS_DEFINE_ERROR(TSDB_CODE_TQ_TABLE_SCHEMA_NOT_FOUND,    "TQ table schema not found")
 TAOS_DEFINE_ERROR(TSDB_CODE_TQ_NO_COMMITTED_OFFSET,       "TQ no committed offset")
+TAOS_DEFINE_ERROR(TSDB_CODE_TQ_INTERNAL_ERROR,            "TQ internal error")
 
 // wal
 TAOS_DEFINE_ERROR(TSDB_CODE_WAL_FILE_CORRUPTED,           "WAL file is corrupted")