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

Merge pull request #13249 from taosdata/szhou/feature/sma 

fix: tsdb can mixed block even output capacity is greater than block rows
This commit is contained in:
shenglian-zhou 2022-05-30 21:57:50 +08:00 committed by GitHub
parent b996e5bde1 32135e442f
commit 718b892328
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/dnode/vnode/src/tsdb/tsdbRead.c
View File

@ -1395,7 +1395,7 @@ static int32_t handleDataMergeIfNeeded(STsdbReadHandle* pTsdbReadHandle, SBlock*
} }
if (pTsdbReadHandle->outputCapacity >= binfo.rows) { if (pTsdbReadHandle->outputCapacity >= binfo.rows) {
ASSERT(cur->blockCompleted); ASSERT(cur->blockCompleted || cur->mixBlock);
} }
if (cur->rows == binfo.rows) { if (cur->rows == binfo.rows) {