From edabeb3a98bb4ef6d4fbae517ef398b70eb32e77 Mon Sep 17 00:00:00 2001 From: kailixu Date: Fri, 21 Jun 2024 11:22:32 +0800 Subject: [PATCH] fix: compatibility for msg and error code --- include/common/tmsgdef.h | 2 -- include/util/taoserror.h | 4 ++-- source/dnode/mnode/impl/src/mndStb.c | 8 ++++---- source/util/src/terror.c | 3 +-- source/util/test/errorCodeTable.ini | 3 +-- 5 files changed, 8 insertions(+), 12 deletions(-) diff --git a/include/common/tmsgdef.h b/include/common/tmsgdef.h index 12f053f7e5..b59dae379a 100644 --- a/include/common/tmsgdef.h +++ b/include/common/tmsgdef.h @@ -343,7 +343,6 @@ TD_DEF_MSG_TYPE(TDMT_STREAM_CREATE, "stream-create", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_STREAM_DROP, "stream-drop", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_STREAM_RETRIEVE_TRIGGER, "stream-retri-trigger", NULL, NULL) - TD_DEF_MSG_TYPE(TDMT_STREAM_MAX_MSG, "stream-max", NULL, NULL) TD_CLOSE_MSG_SEG(TDMT_END_STREAM_MSG) @@ -392,7 +391,6 @@ TD_DEF_MSG_TYPE(TDMT_VND_STREAM_TASK_RESET, "vnode-stream-reset", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_STREAM_TASK_CHECK, "vnode-stream-task-check", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_STREAM_UNUSED, "vnd-stream-unused", NULL, NULL) - TD_DEF_MSG_TYPE(TDMT_VND_GET_STREAM_PROGRESS, "vnd-stream-progress", NULL, NULL) TD_DEF_MSG_TYPE(TDMT_VND_STREAM_MAX_MSG, "vnd-stream-max", NULL, NULL) TD_CLOSE_MSG_SEG(TDMT_END_VND_STREAM_MSG) diff --git a/include/util/taoserror.h b/include/util/taoserror.h index 6b27557c8e..37326ce209 100644 --- a/include/util/taoserror.h +++ b/include/util/taoserror.h @@ -294,7 +294,7 @@ int32_t taosGetErrSize(); // #define TSDB_CODE_MND_INVALID_STABLE_NAME TAOS_DEF_ERROR_CODE(0, 0x036D) // 2.x #define TSDB_CODE_MND_INVALID_STB_OPTION TAOS_DEF_ERROR_CODE(0, 0x036E) #define TSDB_CODE_MND_INVALID_ROW_BYTES TAOS_DEF_ERROR_CODE(0, 0x036F) -#define TSDB_CODE_MND_FIELD_VALUE_OVERFLOW TAOS_DEF_ERROR_CODE(0, 0x0370) +// #define TSDB_CODE_MND_FIELD_VALUE_OVERFLOW TAOS_DEF_ERROR_CODE(0, 0x0370) // used // mnode-func @@ -516,7 +516,7 @@ int32_t taosGetErrSize(); #define TSDB_CODE_VND_DIR_ALREADY_EXIST TAOS_DEF_ERROR_CODE(0, 0x0534) #define TSDB_CODE_VND_META_DATA_UNSAFE_DELETE TAOS_DEF_ERROR_CODE(0, 0x0535) #define TSDB_CODE_VND_COLUMN_COMPRESS_ALREADY_EXIST TAOS_DEF_ERROR_CODE(0, 0x0536) -#define TSDB_CODE_VND_ARB_NOT_SYNCED TAOS_DEF_ERROR_CODE(0, 0x0536) // internal +#define TSDB_CODE_VND_ARB_NOT_SYNCED TAOS_DEF_ERROR_CODE(0, 0x0537) // internal // tsdb #define TSDB_CODE_TDB_INVALID_TABLE_ID TAOS_DEF_ERROR_CODE(0, 0x0600) diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c index 8abcd1e9c8..73542bbb1e 100644 --- a/source/dnode/mnode/impl/src/mndStb.c +++ b/source/dnode/mnode/impl/src/mndStb.c @@ -884,7 +884,7 @@ int32_t mndBuildStbFromReq(SMnode *pMnode, SStbObj *pDst, SMCreateStbReq *pCreat } if (pDst->nextColId < 0 || pDst->nextColId >= 0x7fff - pDst->numOfColumns - pDst->numOfTags) { - terrno = TSDB_CODE_MND_FIELD_VALUE_OVERFLOW; + terrno = TSDB_CODE_OUT_OF_RANGE; return -1; } @@ -1148,7 +1148,7 @@ static int32_t mndBuildStbFromAlter(SStbObj *pStb, SStbObj *pDst, SMCreateStbReq } if (pDst->nextColId < 0 || pDst->nextColId >= 0x7fff - pDst->numOfColumns - pDst->numOfTags) { - terrno = TSDB_CODE_MND_FIELD_VALUE_OVERFLOW; + terrno = TSDB_CODE_OUT_OF_RANGE; return -1; } @@ -1414,7 +1414,7 @@ static int32_t mndAddSuperTableTag(const SStbObj *pOld, SStbObj *pNew, SArray *p } if (pNew->nextColId < 0 || pNew->nextColId >= 0x7fff - ntags) { - terrno = TSDB_CODE_MND_FIELD_VALUE_OVERFLOW; + terrno = TSDB_CODE_OUT_OF_RANGE; return -1; } @@ -1806,7 +1806,7 @@ static int32_t mndAddSuperTableColumn(const SStbObj *pOld, SStbObj *pNew, SArray } if (pNew->nextColId < 0 || pNew->nextColId >= 0x7fff - ncols) { - terrno = TSDB_CODE_MND_FIELD_VALUE_OVERFLOW; + terrno = TSDB_CODE_OUT_OF_RANGE; return -1; } diff --git a/source/util/src/terror.c b/source/util/src/terror.c index 2007e527e5..80de20f5f5 100644 --- a/source/util/src/terror.c +++ b/source/util/src/terror.c @@ -220,7 +220,7 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_COLUMN_ALREADY_EXIST, "Column already exists TAOS_DEFINE_ERROR(TSDB_CODE_MND_COLUMN_NOT_EXIST, "Column does not exist") TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_STB_OPTION, "Invalid stable options") TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_ROW_BYTES, "Invalid row bytes") -TAOS_DEFINE_ERROR(TSDB_CODE_MND_FIELD_VALUE_OVERFLOW, "out of range and overflow") +// TAOS_DEFINE_ERROR(TSDB_CODE_MND_FIELD_VALUE_OVERFLOW, "out of range and overflow") // unused TAOS_DEFINE_ERROR(TSDB_CODE_MND_COLUMN_COMPRESS_ALREADY_EXIST, "Same with old param") @@ -506,7 +506,6 @@ TAOS_DEFINE_ERROR(TSDB_CODE_GRANT_OBJECT_STROAGE_EXPIRED, "License expired for o 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 TAOS_DEFINE_ERROR(TSDB_CODE_SYN_TIMEOUT, "Sync timeout") TAOS_DEFINE_ERROR(TSDB_CODE_SYN_MISMATCHED_SIGNATURE, "Sync signature mismatch") diff --git a/source/util/test/errorCodeTable.ini b/source/util/test/errorCodeTable.ini index f53141167e..33c9d77c5e 100644 --- a/source/util/test/errorCodeTable.ini +++ b/source/util/test/errorCodeTable.ini @@ -152,7 +152,6 @@ TSDB_CODE_MND_COLUMN_ALREADY_EXIST = 0x8000036B TSDB_CODE_MND_COLUMN_NOT_EXIST = 0x8000036C TSDB_CODE_MND_INVALID_STB_OPTION = 0x8000036E TSDB_CODE_MND_INVALID_ROW_BYTES = 0x8000036F -TSDB_CODE_MND_FIELD_VALUE_OVERFLOW = 0x80000370 TSDB_CODE_MND_COLUMN_COMPRESS_ALREADY_EXIST = 0x800003F8 TSDB_CODE_MND_INVALID_FUNC_NAME = 0x80000370 TSDB_CODE_MND_INVALID_FUNC_CODE = 0x80000372 @@ -297,7 +296,7 @@ TSDB_CODE_VND_NOT_CATCH_UP = 0x80000532 TSDB_CODE_VND_ALREADY_IS_VOTER = 0x80000533 TSDB_CODE_VND_DIR_ALREADY_EXIST = 0x80000534 TSDB_CODE_VND_META_DATA_UNSAFE_DELETE = 0x80000535 -TSDB_CODE_VND_ARB_NOT_SYNCED = 0x80000536 +TSDB_CODE_VND_ARB_NOT_SYNCED = 0x80000537 TSDB_CODE_VND_COLUMN_COMPRESS_ALREADY_EXIST = 0x80000536 TSDB_CODE_TDB_INVALID_TABLE_ID = 0x80000600 TSDB_CODE_TDB_INVALID_TABLE_TYPE = 0x80000601