xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix/trans-improve-rename-field-name

This commit is contained in:
dmchen 2024-11-11 09:09:33 +08:00
parent 6bda1a9b6b
commit 81c066eccd
4 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common/tmsg.h
View File

@ -2233,7 +2233,7 @@ typedef struct {
char user[TSDB_USER_LEN]; char user[TSDB_USER_LEN];
char filterTb[TSDB_TABLE_NAME_LEN]; // for ins_columns char filterTb[TSDB_TABLE_NAME_LEN]; // for ins_columns
int64_t showId; int64_t showId;
int64_t compactId1; // for compact int64_t compactId; // for compact
bool withFull; // for show users full bool withFull; // for show users full
} SRetrieveTableReq; } SRetrieveTableReq;

6
source/common/src/tmsg.c
View File

@ -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->tb));
TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->filterTb)); TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->filterTb));
TAOS_CHECK_EXIT(tEncodeCStr(&encoder, pReq->user)); 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)); TAOS_CHECK_EXIT(tEncodeI8(&encoder, pReq->withFull));
tEndEncode(&encoder); 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->filterTb));
TAOS_CHECK_EXIT(tDecodeCStrTo(&decoder, pReq->user)); TAOS_CHECK_EXIT(tDecodeCStrTo(&decoder, pReq->user));
if (!tDecodeIsEnd(&decoder)) { if (!tDecodeIsEnd(&decoder)) {
TAOS_CHECK_EXIT(tDecodeI64(&decoder, &pReq->compactId1)); TAOS_CHECK_EXIT(tDecodeI64(&decoder, &pReq->compactId));
} else { } else {
pReq->compactId1 = -1; pReq->compactId = -1;
} }
if (!tDecodeIsEnd(&decoder)) { if (!tDecodeIsEnd(&decoder)) {
TAOS_CHECK_EXIT(tDecodeI8(&decoder, (int8_t *)&pReq->withFull)); TAOS_CHECK_EXIT(tDecodeI8(&decoder, (int8_t *)&pReq->withFull));

2
source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
View File

@ -526,7 +526,7 @@ int32_t dmProcessRetrieve(SDnodeMgmt *pMgmt, SRpcMsg *pMsg) {
if (tDeserializeSRetrieveTableReq(pMsg->pCont, pMsg->contLen, &retrieveReq) != 0) { if (tDeserializeSRetrieveTableReq(pMsg->pCont, pMsg->contLen, &retrieveReq) != 0) {
return TSDB_CODE_INVALID_MSG; 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 0
if (strcmp(retrieveReq.user, TSDB_DEFAULT_USER) != 0) { if (strcmp(retrieveReq.user, TSDB_DEFAULT_USER) != 0) {
code = TSDB_CODE_MND_NO_RIGHTS; code = TSDB_CODE_MND_NO_RIGHTS;

3
source/dnode/mnode/impl/src/mndShow.c
View File

@ -234,7 +234,8 @@ static int32_t mndProcessRetrieveSysTableReq(SRpcMsg *pReq) {
SRetrieveTableReq retrieveReq = {0}; SRetrieveTableReq retrieveReq = {0};
TAOS_CHECK_RETURN(tDeserializeSRetrieveTableReq(pReq->pCont, pReq->contLen, &retrieveReq)); 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) { if (retrieveReq.showId == 0) {
STableMetaRsp *pMeta = taosHashGet(pMnode->infosMeta, retrieveReq.tb, strlen(retrieveReq.tb)); STableMetaRsp *pMeta = taosHashGet(pMnode->infosMeta, retrieveReq.tb, strlen(retrieveReq.tb));