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

Merge pull request #27181 from taosdata/fix/TD-31408 

fix issue
This commit is contained in:
Haojun Liao 2024-08-13 22:51:58 +08:00 committed by GitHub
parent 8fa1684a38 bc11c1bd02
commit e92031b723
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
source/libs/executor/src/scanoperator.c
View File

@ -553,6 +553,11 @@ static void doSetNullValue(SSDataBlock* pBlock, const SExprInfo* pExpr, int32_t
}
}
static void freeTableCachedValObj(STableCachedVal* pVal) {
taosMemoryFree((void*)pVal->pName);
taosMemoryFree(pVal->pTags);
}
int32_t addTagPseudoColumnData(SReadHandle* pHandle, const SExprInfo* pExpr, int32_t numOfExpr, SSDataBlock* pBlock,
int32_t rows, SExecTaskInfo* pTask, STableMetaCacheInfo* pCache) {
int32_t code = TSDB_CODE_SUCCESS;
@ -638,6 +643,7 @@ int32_t addTagPseudoColumnData(SReadHandle* pHandle, const SExprInfo* pExpr, int
sizeof(STableCachedVal), freeCachedMetaItem, NULL, TAOS_LRU_PRIORITY_LOW, NULL);
if (insertRet != TAOS_LRU_STATUS_OK) {
qError("failed to put meta into lru cache, code:%d, %s", insertRet, idStr);
taosMemoryFreeClear(pVal);
}
} else {
pCache->cacheHit += 1;
@ -713,7 +719,7 @@ int32_t addTagPseudoColumnData(SReadHandle* pHandle, const SExprInfo* pExpr, int
_end:
if (insertRet != TAOS_LRU_STATUS_OK) {
freeTableCachedVal(&val);
freeTableCachedValObj(&val);
}
if (freeReader) {
pHandle->api.metaReaderFn.clearReader(&mr);