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

Merge pull request #15508 from taosdata/fix/TD-17925 

refact: tsdbCache/cleanup, remove tsRowFromTsdbRow
This commit is contained in:
Minglei Jin 2022-07-28 16:15:52 +08:00 committed by GitHub
parent d6193655f5 34b0208f14
commit 9d0a32f14c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,11 +46,6 @@ void tsdbCloseCache(SLRUCache *pCache) {
} }
} }
/* static void getTableCacheKeyS(tb_uid_t uid, const char *cacheType, char *key, int *len) { */
/* snprintf(key, 30, "%" PRIi64 "%s", uid, cacheType); */
/* *len = strlen(key); */
/* } */
static void getTableCacheKey(tb_uid_t uid, int cacheType, char *key, int *len) { static void getTableCacheKey(tb_uid_t uid, int cacheType, char *key, int *len) {
if (cacheType == 0) { // last_row if (cacheType == 0) { // last_row
*(uint64_t *)key = (uint64_t)uid; *(uint64_t *)key = (uint64_t)uid;
@ -649,44 +644,44 @@ _err:
return code; return code;
} }
static int32_t tsRowFromTsdbRow(STSchema *pTSchema, TSDBROW *pRow, STSRow **ppRow) { /* static int32_t tsRowFromTsdbRow(STSchema *pTSchema, TSDBROW *pRow, STSRow **ppRow) { */
int32_t code = 0; /* int32_t code = 0; */
SColVal *pColVal = &(SColVal){0}; /* SColVal *pColVal = &(SColVal){0}; */
if (pRow->type == 0) { /* if (pRow->type == 0) { */
*ppRow = tdRowDup(pRow->pTSRow); /* *ppRow = tdRowDup(pRow->pTSRow); */
} else { /* } else { */
SArray *pArray = taosArrayInit(pTSchema->numOfCols, sizeof(SColVal)); /* SArray *pArray = taosArrayInit(pTSchema->numOfCols, sizeof(SColVal)); */
if (pArray == NULL) { /* if (pArray == NULL) { */
code = TSDB_CODE_OUT_OF_MEMORY; /* code = TSDB_CODE_OUT_OF_MEMORY; */
goto _exit; /* goto _exit; */
} /* } */
TSDBKEY key = TSDBROW_KEY(pRow); /* TSDBKEY key = TSDBROW_KEY(pRow); */
STColumn *pTColumn = &pTSchema->columns[0]; /* STColumn *pTColumn = &pTSchema->columns[0]; */
*pColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.ts = key.ts}); /* *pColVal = COL_VAL_VALUE(pTColumn->colId, pTColumn->type, (SValue){.ts = key.ts}); */
if (taosArrayPush(pArray, pColVal) == NULL) { /* if (taosArrayPush(pArray, pColVal) == NULL) { */
code = TSDB_CODE_OUT_OF_MEMORY; /* code = TSDB_CODE_OUT_OF_MEMORY; */
goto _exit; /* goto _exit; */
} /* } */
for (int16_t iCol = 1; iCol < pTSchema->numOfCols; iCol++) { /* for (int16_t iCol = 1; iCol < pTSchema->numOfCols; iCol++) { */
tsdbRowGetColVal(pRow, pTSchema, iCol, pColVal); /* tsdbRowGetColVal(pRow, pTSchema, iCol, pColVal); */
if (taosArrayPush(pArray, pColVal) == NULL) { /* if (taosArrayPush(pArray, pColVal) == NULL) { */
code = TSDB_CODE_OUT_OF_MEMORY; /* code = TSDB_CODE_OUT_OF_MEMORY; */
goto _exit; /* goto _exit; */
} /* } */
} /* } */
code = tdSTSRowNew(pArray, pTSchema, ppRow); /* code = tdSTSRowNew(pArray, pTSchema, ppRow); */
if (code) goto _exit; /* if (code) goto _exit; */
} /* } */
_exit: /* _exit: */
return code; /* return code; */
} /* } */
static bool tsdbKeyDeleted(TSDBKEY *key, SArray *pSkyline, int64_t *iSkyline) { static bool tsdbKeyDeleted(TSDBKEY *key, SArray *pSkyline, int64_t *iSkyline) {
bool deleted = false; bool deleted = false;