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

fix merge error

This commit is contained in:
yihaoDeng 2024-11-20 08:30:11 +08:00
parent e91b6f592a
commit 3ef53505b8
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
source/libs/executor/src/sysscanoperator.c
View File

@ -691,10 +691,10 @@ static SSDataBlock* sysTableScanUserCols(SOperatorInfo* pOperator) {
pAPI->metaFn.pauseTableMetaCursor(pInfo->pCur); pAPI->metaFn.pauseTableMetaCursor(pInfo->pCur);
break; break;
} }
} else {
code = sysTableUserColsFillOneTableCols(pInfo, dbname, &numOfRows, pDataBlock, tableName, schemaRow, typeName);
QUERY_CHECK_CODE(code, lino, _end);
} }
// if pInfo->pRes->info.rows == 0, also need to add the meta to pDataBlock
code = sysTableUserColsFillOneTableCols(pInfo, dbname, &numOfRows, pDataBlock, tableName, schemaRow, typeName);
QUERY_CHECK_CODE(code, lino, _end);
} }
if (numOfRows > 0) { if (numOfRows > 0) {
@ -853,18 +853,20 @@ static SSDataBlock* sysTableScanUserTags(SOperatorInfo* pOperator) {
pAPI->metaReaderFn.clearReader(&smrSuperTable); pAPI->metaReaderFn.clearReader(&smrSuperTable);
break; break;
} }
} else { }
code = sysTableUserTagsFillOneTableTags(pInfo, &smrSuperTable, &pInfo->pCur->mr, dbname, tableName, &numOfRows,
dataBlock); // if pInfo->pRes->info.rows == 0, also need to add the meta to pDataBlock
if (code != TSDB_CODE_SUCCESS) { code = sysTableUserTagsFillOneTableTags(pInfo, &smrSuperTable, &pInfo->pCur->mr, dbname, tableName, &numOfRows,
qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code)); dataBlock);
pAPI->metaReaderFn.clearReader(&smrSuperTable);
pAPI->metaFn.closeTableMetaCursor(pInfo->pCur); if (code != TSDB_CODE_SUCCESS) {
pInfo->pCur = NULL; qError("%s failed at line %d since %s", __func__, __LINE__, tstrerror(code));
blockDataDestroy(dataBlock); pAPI->metaReaderFn.clearReader(&smrSuperTable);
dataBlock = NULL; pAPI->metaFn.closeTableMetaCursor(pInfo->pCur);
T_LONG_JMP(pTaskInfo->env, terrno); pInfo->pCur = NULL;
} blockDataDestroy(dataBlock);
dataBlock = NULL;
T_LONG_JMP(pTaskInfo->env, terrno);
} }
pAPI->metaReaderFn.clearReader(&smrSuperTable); pAPI->metaReaderFn.clearReader(&smrSuperTable);
} }