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

use check exit instead of goto

This commit is contained in:
Minglei Jin 2024-12-11 14:36:35 +08:00
parent acfd94c123
commit 71d27a369b
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/dnode/vnode/src/tsdb/tsdbCache.c
View File

@ -2501,7 +2501,7 @@ static int32_t tsdbCacheGetBatchFromMem(STsdb *pTsdb, tb_uid_t uid, SArray *pLas
if (!IS_LAST_KEY(((SLastKey *)TARRAY_DATA(keyArray))[jCol])) { if (!IS_LAST_KEY(((SLastKey *)TARRAY_DATA(keyArray))[jCol])) {
if (cmp_res < 0 || (cmp_res == 0 && !COL_VAL_IS_NONE(pColVal))) { if (cmp_res < 0 || (cmp_res == 0 && !COL_VAL_IS_NONE(pColVal))) {
SLastCol lastCol = {.rowKey = rowKey.key, .colVal = *pColVal, .dirty = 1, .cacheStatus = TSDB_LAST_CACHE_VALID}; SLastCol lastCol = {.rowKey = rowKey.key, .colVal = *pColVal, .dirty = 1, .cacheStatus = TSDB_LAST_CACHE_VALID};
TAOS_CHECK_GOTO(tsdbCacheReallocSLastCol(&lastCol, NULL), &lino, _exit); TAOS_CHECK_EXIT(tsdbCacheReallocSLastCol(&lastCol, NULL));
tsdbCacheFreeSLastColItem(pTargetCol); tsdbCacheFreeSLastColItem(pTargetCol);
taosArraySet(pLastArray, jCol, &lastCol); taosArraySet(pLastArray, jCol, &lastCol);
@ -2511,7 +2511,7 @@ static int32_t tsdbCacheGetBatchFromMem(STsdb *pTsdb, tb_uid_t uid, SArray *pLas
if (cmp_res <= 0) { if (cmp_res <= 0) {
SLastCol lastCol = { SLastCol lastCol = {
.rowKey = rowKey.key, .colVal = *pColVal, .dirty = 1, .cacheStatus = TSDB_LAST_CACHE_VALID}; .rowKey = rowKey.key, .colVal = *pColVal, .dirty = 1, .cacheStatus = TSDB_LAST_CACHE_VALID};
TAOS_CHECK_GOTO(tsdbCacheReallocSLastCol(&lastCol, NULL), &lino, _exit); TAOS_CHECK_EXIT(tsdbCacheReallocSLastCol(&lastCol, NULL));
tsdbCacheFreeSLastColItem(pTargetCol); tsdbCacheFreeSLastColItem(pTargetCol);
taosArraySet(pLastArray, jCol, &lastCol); taosArraySet(pLastArray, jCol, &lastCol);
@ -2546,7 +2546,7 @@ static int32_t tsdbCacheGetBatchFromMem(STsdb *pTsdb, tb_uid_t uid, SArray *pLas
sversion = TSDBROW_SVERSION(pRow); sversion = TSDBROW_SVERSION(pRow);
if (sversion != -1) { if (sversion != -1) {
TAOS_CHECK_GOTO(updateTSchema(sversion, pr, uid), &lino, _exit); TAOS_CHECK_EXIT(updateTSchema(sversion, pr, uid));
pTSchema = pr->pCurrSchema; pTSchema = pr->pCurrSchema;
} }
@ -2569,7 +2569,7 @@ static int32_t tsdbCacheGetBatchFromMem(STsdb *pTsdb, tb_uid_t uid, SArray *pLas
if (cmp_res <= 0) { if (cmp_res <= 0) {
SLastCol lastCol = { SLastCol lastCol = {
.rowKey = tsdbRowKey.key, .colVal = *pColVal, .dirty = 1, .cacheStatus = TSDB_LAST_CACHE_VALID}; .rowKey = tsdbRowKey.key, .colVal = *pColVal, .dirty = 1, .cacheStatus = TSDB_LAST_CACHE_VALID};
TAOS_CHECK_GOTO(tsdbCacheReallocSLastCol(&lastCol, NULL), &lino, _exit); TAOS_CHECK_EXIT(tsdbCacheReallocSLastCol(&lastCol, NULL));
tsdbCacheFreeSLastColItem(pTargetCol); tsdbCacheFreeSLastColItem(pTargetCol);
taosArraySet(pLastArray, *pjCol, &lastCol); taosArraySet(pLastArray, *pjCol, &lastCol);
@ -2610,7 +2610,6 @@ int32_t tsdbCacheGetBatch(STsdb *pTsdb, tb_uid_t uid, SArray *pLastArray, SCache
TAOS_CHECK_EXIT(terrno); TAOS_CHECK_EXIT(terrno);
} }
// SLastKey key = {.lflag = ltype, .uid = uid, .cid = cid};
TAOS_CHECK_EXIT(tsdbCacheGetBatchFromLru(pTsdb, uid, pLastArray, pr, ltype, keyArray)); TAOS_CHECK_EXIT(tsdbCacheGetBatchFromLru(pTsdb, uid, pLastArray, pr, ltype, keyArray));
if (tsUpdateCacheBatch) { if (tsUpdateCacheBatch) {