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

fix(query): retry when column dropped in latest schema

This commit is contained in:
kailixu 2024-08-13 18:55:48 +08:00
parent 8fa1684a38
commit 413a57f4cb
2 changed files with 6 additions and 2 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,7 +463,9 @@ 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);
ASSERT(tcol); if (tcol == NULL) {
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,

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

@ -309,7 +309,9 @@ 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);
ASSERT(tcol); if (tcol == NULL) {
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,