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

Merge pull request #19977 from taosdata/fix/TS-2638 

fix:[TS638]diable tsdbReader open in streamScanOperator
This commit is contained in:
Haojun Liao 2023-02-20 14:25:31 +08:00 committed by GitHub
parent 47dcb99f02 a74f7895e4
commit ae95c97b78
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/client/src/clientSml.c
View File

@ -1273,7 +1273,7 @@ static int32_t smlInsertData(SSmlHandle *info) {
} }
static void smlPrintStatisticInfo(SSmlHandle *info) { static void smlPrintStatisticInfo(SSmlHandle *info) {
uError( uDebug(
"SML:0x%" PRIx64 "SML:0x%" PRIx64
" smlInsertLines result, code:%d,lineNum:%d,stable num:%d,ctable num:%d,create stable num:%d,alter stable tag num:%d,alter stable col num:%d \ " smlInsertLines result, code:%d,lineNum:%d,stable num:%d,ctable num:%d,create stable num:%d,alter stable tag num:%d,alter stable col num:%d \
parse cost:%" PRId64 ",schema cost:%" PRId64 ",bind cost:%" PRId64 ",rpc cost:%" PRId64 ",total cost:%" PRId64 parse cost:%" PRId64 ",schema cost:%" PRId64 ",bind cost:%" PRId64 ",rpc cost:%" PRId64 ",total cost:%" PRId64

15
source/libs/executor/src/scanoperator.c
View File

@ -2304,13 +2304,14 @@ SOperatorInfo* createStreamScanOperatorInfo(SReadHandle* pHandle, STableScanPhys
if (pHandle->initTableReader) { if (pHandle->initTableReader) {
pTSInfo->scanMode = TABLE_SCAN__TABLE_ORDER; pTSInfo->scanMode = TABLE_SCAN__TABLE_ORDER;
pTSInfo->base.dataReader = NULL; pTSInfo->base.dataReader = NULL;
code = tsdbReaderOpen(pHandle->vnode, &pTSInfo->base.cond, pList, num, pTSInfo->pResBlock, pTaskInfo->streamInfo.lastStatus.uid = -1;
&pTSInfo->base.dataReader, NULL); // code = tsdbReaderOpen(pHandle->vnode, &pTSInfo->base.cond, pList, num, pTSInfo->pResBlock,
if (code != 0) { // &pTSInfo->base.dataReader, NULL);
terrno = code; // if (code != 0) {
destroyTableScanOperatorInfo(pTableScanOp); // terrno = code;
goto _error; // destroyTableScanOperatorInfo(pTableScanOp);
} // goto _error;
// }
} }
if (pHandle->initTqReader) { if (pHandle->initTqReader) {