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

enh: use tsdbSnapRangeArrayDestroy

This commit is contained in:
Benguang Zhao 2023-09-13 09:16:08 +08:00
parent c1b2eedd3c
commit f99795d027
2 changed files with 7 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1037,15 +1037,6 @@ _out:
return code; return code;
} }
int32_t tsdbFSDestroyRefRangedSnapshot(TSnapRangeArray **fsrArr) {
if (fsrArr[0]) {
TARRAY2_DESTROY(fsrArr[0], tsdbTSnapRangeClear);
taosMemoryFreeClear(fsrArr[0]);
fsrArr[0] = NULL;
}
return 0;
}
const char *gFSBgTaskName[] = {NULL, "MERGE", "RETENTION", "COMPACT"}; const char *gFSBgTaskName[] = {NULL, "MERGE", "RETENTION", "COMPACT"};
static int32_t tsdbFSRunBgTask(void *arg) { static int32_t tsdbFSRunBgTask(void *arg) {

12
source/dnode/vnode/src/tsdb/tsdbSnapshot.c
View File

@ -432,7 +432,7 @@ _exit:
if (code) { if (code) {
tsdbError("vgId:%d %s failed at line %d since %s, sver:%" PRId64 " ever:%" PRId64 " type:%d", TD_VID(tsdb->pVnode), tsdbError("vgId:%d %s failed at line %d since %s, sver:%" PRId64 " ever:%" PRId64 " type:%d", TD_VID(tsdb->pVnode),
__func__, lino, tstrerror(code), sver, ever, type); __func__, lino, tstrerror(code), sver, ever, type);
tsdbFSDestroyRefRangedSnapshot(&reader[0]->fsrArr); tsdbSnapRangeArrayDestroy(&reader[0]->fsrArr);
taosMemoryFree(reader[0]); taosMemoryFree(reader[0]);
reader[0] = NULL; reader[0] = NULL;
} else { } else {
@ -460,7 +460,7 @@ int32_t tsdbSnapReaderClose(STsdbSnapReader** reader) {
TARRAY2_DESTROY(reader[0]->sttReaderArr, tsdbSttFileReaderClose); TARRAY2_DESTROY(reader[0]->sttReaderArr, tsdbSttFileReaderClose);
tsdbDataFileReaderClose(&reader[0]->dataReader); tsdbDataFileReaderClose(&reader[0]->dataReader);
tsdbFSDestroyRefRangedSnapshot(&reader[0]->fsrArr); tsdbSnapRangeArrayDestroy(&reader[0]->fsrArr);
tDestroyTSchema(reader[0]->skmTb->pTSchema); tDestroyTSchema(reader[0]->skmTb->pTSchema);
for (int32_t i = 0; i < ARRAY_SIZE(reader[0]->aBuf); ++i) { for (int32_t i = 0; i < ARRAY_SIZE(reader[0]->aBuf); ++i) {
@ -1300,9 +1300,11 @@ _err:
} }
void tsdbSnapRangeArrayDestroy(TSnapRangeArray** ppSnap) { void tsdbSnapRangeArrayDestroy(TSnapRangeArray** ppSnap) {
TARRAY2_DESTROY(ppSnap[0], tsdbTSnapRangeClear); if (ppSnap && ppSnap[0]) {
taosMemoryFree(ppSnap[0]); TARRAY2_DESTROY(ppSnap[0], tsdbTSnapRangeClear);
ppSnap[0] = NULL; taosMemoryFree(ppSnap[0]);
ppSnap[0] = NULL;
}
} }
static int32_t tsdbSnapInfoDataLenCalc(TSnapRangeArray* pSnap) { static int32_t tsdbSnapInfoDataLenCalc(TSnapRangeArray* pSnap) {