未验证 提交 718b8923 编写于 作者: S shenglian-zhou 提交者: GitHub

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

fix: tsdb can mixed block even output capacity is greater than block rows
...@@ -1395,7 +1395,7 @@ static int32_t handleDataMergeIfNeeded(STsdbReadHandle* pTsdbReadHandle, SBlock* ...@@ -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) {
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册