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

fix:[TS-5776]error in create table time

This commit is contained in:
wangmm0220 2025-02-18 15:21:51 +08:00
parent 9dcac195cb
commit 07e4265dde
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/dnode/vnode/src/meta/metaQuery.c
View File

@ -457,7 +457,7 @@ int64_t metaGetTableCreateTime(SMeta *pMeta, tb_uid_t uid, int lock) {
int nData = 0; int nData = 0;
int64_t version = 0; int64_t version = 0;
SDecoder dc = {0}; SDecoder dc = {0};
int64_t createTime = 0; int64_t createTime = INT64_MAX;
if (lock) { if (lock) {
metaRLock(pMeta); metaRLock(pMeta);
} }

1
source/dnode/vnode/src/tq/tqRead.c
View File

@ -1102,7 +1102,6 @@ int32_t tqRetrieveTaosxBlock(STqReader* pReader, SMqDataRsp* pRsp, SArray* block
int64_t uid = pSubmitTbData->uid; int64_t uid = pSubmitTbData->uid;
pReader->lastBlkUid = uid; pReader->lastBlkUid = uid;
int64_t createTime = 0;
tDeleteSchemaWrapper(pReader->pSchemaWrapper); tDeleteSchemaWrapper(pReader->pSchemaWrapper);
pReader->pSchemaWrapper = metaGetTableSchema(pReader->pVnodeMeta, uid, sversion, 1); pReader->pSchemaWrapper = metaGetTableSchema(pReader->pVnodeMeta, uid, sversion, 1);
if (pReader->pSchemaWrapper == NULL) { if (pReader->pSchemaWrapper == NULL) {

10
source/dnode/vnode/src/tq/tqScan.c
View File

@ -418,15 +418,17 @@ static void preProcessSubmitMsg(STqHandle* pHandle, const SMqPollReq* pRequest,
continue; continue;
} }
int64_t createTime = 0; int64_t createTime = INT64_MAX;
int64_t *cTime = (int64_t*)taosHashGet(pHandle->tableCreateTimeHash, &uid, LONG_BYTES); int64_t *cTime = (int64_t*)taosHashGet(pHandle->tableCreateTimeHash, &uid, LONG_BYTES);
if (cTime != NULL){ if (cTime != NULL){
createTime = *cTime; createTime = *cTime;
} else{ } else{
createTime = metaGetTableCreateTime(pReader->pVnodeMeta, uid, 1); createTime = metaGetTableCreateTime(pReader->pVnodeMeta, uid, 1);
int32_t code = taosHashPut(pHandle->tableCreateTimeHash, &uid, LONG_BYTES, &createTime, LONG_BYTES); if (createTime != INT64_MAX){
if (code != 0){ int32_t code = taosHashPut(pHandle->tableCreateTimeHash, &uid, LONG_BYTES, &createTime, LONG_BYTES);
tqError("failed to add table create time to hash,code:%d, uid:%"PRId64, code, uid); if (code != 0){
tqError("failed to add table create time to hash,code:%d, uid:%"PRId64, code, uid);
}
} }
} }
if (pHandle->fetchMeta == WITH_DATA || pSubmitTbData->ctimeMs > createTime){ if (pHandle->fetchMeta == WITH_DATA || pSubmitTbData->ctimeMs > createTime){