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

enh: code optimization

This commit is contained in:
kailixu 2024-08-14 13:57:33 +08:00
parent fe07324d72
commit cec7643ea8
3 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/dnode/vnode/src/tsdb/tsdbDataFileRW.c
View File

@ -463,9 +463,7 @@ int32_t tsdbDataFileReadBlockDataByColumn(SDataFileReader *reader, const SBrinRe
if (cid < blockCol.cid) { if (cid < blockCol.cid) {
const STColumn *tcol = tTSchemaSearchColumn(pTSchema, cid); const STColumn *tcol = tTSchemaSearchColumn(pTSchema, cid);
if (tcol == NULL) { TSDB_CHECK_NULL(tcol, code,lino,_exit,TSDB_CODE_TDB_INVALID_TABLE_SCHEMA_VER);
TAOS_CHECK_GOTO(TSDB_CODE_TDB_INVALID_TABLE_SCHEMA_VER, &lino, _exit);
}
SBlockCol none = { SBlockCol none = {
.cid = cid, .cid = cid,
.type = tcol->type, .type = tcol->type,

5
source/dnode/vnode/src/tsdb/tsdbMergeTree.c
View File

@ -1004,10 +1004,7 @@ int32_t tMergeTreeOpen2(SMergeTree *pMTree, SMergeTreeConf *pConf, SSttDataInfoF
pSttDataInfo->numOfRows += numOfRows; pSttDataInfo->numOfRows += numOfRows;
} }
} else { } else {
if(terrno != TSDB_CODE_SUCCESS) { TAOS_CHECK_GOTO(terrno, NULL, _end);
code = terrno;
goto _end;
}
if (!pMTree->ignoreEarlierTs) { if (!pMTree->ignoreEarlierTs) {
pMTree->ignoreEarlierTs = pIter->ignoreEarlierTs; pMTree->ignoreEarlierTs = pIter->ignoreEarlierTs;
} }

4
source/dnode/vnode/src/tsdb/tsdbSttFileRW.c
View File

@ -309,9 +309,7 @@ int32_t tsdbSttFileReadBlockDataByColumn(SSttFileReader *reader, const SSttBlk *
if (cid < blockCol.cid) { if (cid < blockCol.cid) {
const STColumn *tcol = tTSchemaSearchColumn(pTSchema, cid); const STColumn *tcol = tTSchemaSearchColumn(pTSchema, cid);
if (tcol == NULL) { TSDB_CHECK_NULL(tcol, code,lino,_exit,TSDB_CODE_TDB_INVALID_TABLE_SCHEMA_VER);
TAOS_CHECK_GOTO(TSDB_CODE_TDB_INVALID_TABLE_SCHEMA_VER, &lino, _exit);
}
SBlockCol none = { SBlockCol none = {
.cid = cid, .cid = cid,
.type = tcol->type, .type = tcol->type,