diff --git a/include/common/tmsg.h b/include/common/tmsg.h index 4a02c762b5..bcf47bdd06 100644 --- a/include/common/tmsg.h +++ b/include/common/tmsg.h @@ -2233,7 +2233,7 @@ typedef struct { char user[TSDB_USER_LEN]; char filterTb[TSDB_TABLE_NAME_LEN]; // for ins_columns int64_t showId; - int64_t compactId1; // for compact + int64_t compactId; // for compact bool withFull; // for show users full } SRetrieveTableReq; diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c index 19b34b66ff..458badc764 100644 --- a/source/common/src/tmsg.c +++ b/source/common/src/tmsg.c @@ -5732,7 +5732,7 @@ int32_t tSerializeSRetrieveTableReq(void *buf, int32_t bufLen, SRetrieveTableReq TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->tb)); TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->filterTb)); TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->user)); - TAOS_CHECK_EXIT(tEncodeI64(&encoder, pReq->compactId1)); + TAOS_CHECK_EXIT(tEncodeI64(&encoder, pReq->compactId)); TAOS_CHECK_EXIT(tEncodeI8(&encoder, pReq->withFull)); tEndEncode(&encoder); @@ -5760,9 +5760,9 @@ int32_t tDeserializeSRetrieveTableReq(void *buf, int32_t bufLen, SRetrieveTableR TAOS_CHECK_EXIT(tDecodeCStrTo(&decoder, pReq->filterTb)); TAOS_CHECK_EXIT(tDecodeCStrTo(&decoder, pReq->user)); if (!tDecodeIsEnd(&decoder)) { - TAOS_CHECK_EXIT(tDecodeI64(&decoder, &pReq->compactId1)); + TAOS_CHECK_EXIT(tDecodeI64(&decoder, &pReq->compactId)); } else { - pReq->compactId1 = -1; + pReq->compactId = -1; } if (!tDecodeIsEnd(&decoder)) { TAOS_CHECK_EXIT(tDecodeI8(&decoder, (int8_t *)&pReq->withFull)); diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c index 41dd117807..0837686d49 100644 --- a/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c +++ b/source/dnode/mgmt/mgmt_dnode/src/dmHandle.c @@ -526,7 +526,7 @@ int32_t dmProcessRetrieve(SDnodeMgmt *pMgmt, SRpcMsg *pMsg) { if (tDeserializeSRetrieveTableReq(pMsg->pCont, pMsg->contLen, &retrieveReq) != 0) { return TSDB_CODE_INVALID_MSG; } - dInfo("retrieve table:%s, user:%s, compactId:%" PRId64, retrieveReq.tb, retrieveReq.user, retrieveReq.compactId1); + dInfo("retrieve table:%s, user:%s, compactId:%" PRId64, retrieveReq.tb, retrieveReq.user, retrieveReq.compactId); #if 0 if (strcmp(retrieveReq.user, TSDB_DEFAULT_USER) != 0) { code = TSDB_CODE_MND_NO_RIGHTS; diff --git a/source/dnode/mnode/impl/src/mndShow.c b/source/dnode/mnode/impl/src/mndShow.c index 082ea5fc24..0c2d6f0596 100644 --- a/source/dnode/mnode/impl/src/mndShow.c +++ b/source/dnode/mnode/impl/src/mndShow.c @@ -234,7 +234,8 @@ static int32_t mndProcessRetrieveSysTableReq(SRpcMsg *pReq) { SRetrieveTableReq retrieveReq = {0}; TAOS_CHECK_RETURN(tDeserializeSRetrieveTableReq(pReq->pCont, pReq->contLen, &retrieveReq)); - mDebug("process to retrieve systable req db:%s, tb:%s, compactId:%" PRId64, retrieveReq.db, retrieveReq.tb, retrieveReq.compactId1); + mDebug("process to retrieve systable req db:%s, tb:%s, compactId:%" PRId64, retrieveReq.db, retrieveReq.tb, + retrieveReq.compactId); if (retrieveReq.showId == 0) { STableMetaRsp *pMeta = taosHashGet(pMnode->infosMeta, retrieveReq.tb, strlen(retrieveReq.tb));