diff --git a/include/util/taoserror.h b/include/util/taoserror.h index 6ab06d06a3..06e6b8d041 100644 --- a/include/util/taoserror.h +++ b/include/util/taoserror.h @@ -427,6 +427,9 @@ int32_t* taosGetErrno(); #define TSDB_CODE_MND_VIEW_ALREADY_EXIST TAOS_DEF_ERROR_CODE(0, 0x04A0) #define TSDB_CODE_MND_VIEW_NOT_EXIST TAOS_DEF_ERROR_CODE(0, 0x04A1) +//mnode-compact +#define TSDB_CODE_MND_INVALID_COMPACT_ID TAOS_DEF_ERROR_CODE(0, 0x04B1) + // vnode // #define TSDB_CODE_VND_ACTION_IN_PROGRESS TAOS_DEF_ERROR_CODE(0, 0x0500) // 2.x diff --git a/source/dnode/mnode/impl/src/mndCompact.c b/source/dnode/mnode/impl/src/mndCompact.c index 44b0d1c0d2..c8903fe0a1 100644 --- a/source/dnode/mnode/impl/src/mndCompact.c +++ b/source/dnode/mnode/impl/src/mndCompact.c @@ -436,6 +436,7 @@ int32_t mndProcessKillCompactReq(SRpcMsg *pReq){ int32_t code = -1; SCompactObj *pCompact = mndAcquireCompact(pMnode, killCompactReq.compactId); if(pCompact == NULL){ + terrno = TSDB_CODE_MND_INVALID_COMPACT_ID; tFreeSKillCompactReq(&killCompactReq); return -1; } diff --git a/source/dnode/mnode/impl/src/mndCompactDetail.c b/source/dnode/mnode/impl/src/mndCompactDetail.c index ea3296de7c..a1c0e95c20 100644 --- a/source/dnode/mnode/impl/src/mndCompactDetail.c +++ b/source/dnode/mnode/impl/src/mndCompactDetail.c @@ -24,7 +24,7 @@ int32_t mndInitCompactDetail(SMnode *pMnode) { SSdbTable table = { .sdbType = SDB_COMPACT_DETAIL, - .keyType = SDB_KEY_INT32, + .keyType = SDB_KEY_INT64, .encodeFp = (SdbEncodeFp)mndCompactDetailActionEncode, .decodeFp = (SdbDecodeFp)mndCompactDetailActionDecode, .insertFp = (SdbInsertFp)mndCompactDetailActionInsert, @@ -285,8 +285,8 @@ int32_t mndAddCompactDetailToTran(SMnode *pMnode, STrans *pTrans, SCompactObj* p compactDetail.newNumberFileset = -1; compactDetail.newFinished = -1; - mInfo("compact:%d, add compact detail to trans, vgId:%d, dnodeId:%d", - pCompact->compactId, pVgroup->vgId, pVgid->dnodeId); + mInfo("compact:%d, add compact detail to trans, index:%d, vgId:%d, dnodeId:%d", + compactDetail.compactId, compactDetail.compactDetailId, compactDetail.vgId, compactDetail.dnodeId); SSdbRaw *pVgRaw = mndCompactDetailActionEncode(&compactDetail); if (pVgRaw == NULL) return -1; diff --git a/source/util/src/terror.c b/source/util/src/terror.c index a869af7d5d..dc5f44cf43 100644 --- a/source/util/src/terror.c +++ b/source/util/src/terror.c @@ -324,6 +324,8 @@ TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_SMA_OPTION, "Invalid sma index opt TAOS_DEFINE_ERROR(TSDB_CODE_MND_VIEW_ALREADY_EXIST, "view already exists in db") TAOS_DEFINE_ERROR(TSDB_CODE_MND_VIEW_NOT_EXIST, "view not exists in db") +//mnode-compact +TAOS_DEFINE_ERROR(TSDB_CODE_MND_INVALID_COMPACT_ID, "Invalid compact id") // dnode TAOS_DEFINE_ERROR(TSDB_CODE_DNODE_OFFLINE, "Dnode is offline")